diff --git a/cluster/gce/addons/podsecuritypolicies/event-exporter-binding.yaml b/cluster/addons/fluentd-gcp/podsecuritypolicies/event-exporter-psp-binding.yaml
similarity index 100%
rename from cluster/gce/addons/podsecuritypolicies/event-exporter-binding.yaml
rename to cluster/addons/fluentd-gcp/podsecuritypolicies/event-exporter-psp-binding.yaml
diff --git a/cluster/gce/addons/podsecuritypolicies/event-exporter-role.yaml b/cluster/addons/fluentd-gcp/podsecuritypolicies/event-exporter-psp-role.yaml
similarity index 100%
rename from cluster/gce/addons/podsecuritypolicies/event-exporter-role.yaml
rename to cluster/addons/fluentd-gcp/podsecuritypolicies/event-exporter-psp-role.yaml
diff --git a/cluster/gce/addons/podsecuritypolicies/event-exporter.yaml b/cluster/addons/fluentd-gcp/podsecuritypolicies/event-exporter-psp.yaml
similarity index 100%
rename from cluster/gce/addons/podsecuritypolicies/event-exporter.yaml
rename to cluster/addons/fluentd-gcp/podsecuritypolicies/event-exporter-psp.yaml
diff --git a/cluster/gce/addons/podsecuritypolicies/fluentd-gcp-binding.yaml b/cluster/addons/fluentd-gcp/podsecuritypolicies/fluentd-gcp-psp-binding.yaml
similarity index 100%
rename from cluster/gce/addons/podsecuritypolicies/fluentd-gcp-binding.yaml
rename to cluster/addons/fluentd-gcp/podsecuritypolicies/fluentd-gcp-psp-binding.yaml
diff --git a/cluster/gce/addons/podsecuritypolicies/fluentd-gcp-role.yaml b/cluster/addons/fluentd-gcp/podsecuritypolicies/fluentd-gcp-psp-role.yaml
similarity index 100%
rename from cluster/gce/addons/podsecuritypolicies/fluentd-gcp-role.yaml
rename to cluster/addons/fluentd-gcp/podsecuritypolicies/fluentd-gcp-psp-role.yaml
diff --git a/cluster/gce/addons/podsecuritypolicies/fluentd-gcp.yaml b/cluster/addons/fluentd-gcp/podsecuritypolicies/fluentd-gcp-psp.yaml
similarity index 100%
rename from cluster/gce/addons/podsecuritypolicies/fluentd-gcp.yaml
rename to cluster/addons/fluentd-gcp/podsecuritypolicies/fluentd-gcp-psp.yaml
diff --git a/cluster/gce/addons/podsecuritypolicies/metadata-proxy-binding.yaml b/cluster/addons/metadata-proxy/gce/podsecuritypolicies/metadata-proxy-psp-binding.yaml
similarity index 100%
rename from cluster/gce/addons/podsecuritypolicies/metadata-proxy-binding.yaml
rename to cluster/addons/metadata-proxy/gce/podsecuritypolicies/metadata-proxy-psp-binding.yaml
diff --git a/cluster/gce/addons/podsecuritypolicies/npd-binding.yaml b/cluster/addons/node-problem-detector/podsecuritypolicies/npd-psp-binding.yaml
similarity index 100%
rename from cluster/gce/addons/podsecuritypolicies/npd-binding.yaml
rename to cluster/addons/node-problem-detector/podsecuritypolicies/npd-psp-binding.yaml