diff --git a/hack/cluster-monitoring/deploy b/hack/cluster-monitoring/deploy
index 2d0d50ad326fd25bebabd3d39a9878974c29ee62..c565d442ddc6a2676641039525f231be74ac1020 100755
--- a/hack/cluster-monitoring/deploy
+++ b/hack/cluster-monitoring/deploy
@@ -23,7 +23,8 @@ until kctl get prometheus > /dev/null 2>&1; do sleep 1; printf "."; done
 until kctl get alertmanager > /dev/null 2>&1; do sleep 1; printf "."; done
 echo "done!"
 
-kctl apply -f manifests/exporters
+kctl apply -f manifests/node-exporter
+kctl apply -f manifests/kube-state-metrics
 kctl apply -f manifests/grafana/grafana-credentials.yaml
 kctl apply -f manifests/grafana
 kctl apply -f manifests/prometheus/
diff --git a/hack/cluster-monitoring/teardown b/hack/cluster-monitoring/teardown
index e5e0d9a68bb4a0baff68408f6531137f76523aa7..9fcc451391f440debc54665a65116b7bffdf2f1d 100755
--- a/hack/cluster-monitoring/teardown
+++ b/hack/cluster-monitoring/teardown
@@ -12,7 +12,8 @@ kctl() {
     kubectl --namespace "$NAMESPACE" "$@"
 }
 
-kctl delete -f manifests/exporters
+kctl delete -f manifests/node-exporter
+kctl delete -f manifests/kube-state-metrics
 kctl delete -f manifests/grafana
 kctl delete -f manifests/prometheus
 kctl delete -f manifests/alertmanager
diff --git a/manifests/exporters/kube-state-metrics-cluster-role-binding.yaml b/manifests/kube-state-metrics/kube-state-metrics-cluster-role-binding.yaml
similarity index 100%
rename from manifests/exporters/kube-state-metrics-cluster-role-binding.yaml
rename to manifests/kube-state-metrics/kube-state-metrics-cluster-role-binding.yaml
diff --git a/manifests/exporters/kube-state-metrics-cluster-role.yaml b/manifests/kube-state-metrics/kube-state-metrics-cluster-role.yaml
similarity index 100%
rename from manifests/exporters/kube-state-metrics-cluster-role.yaml
rename to manifests/kube-state-metrics/kube-state-metrics-cluster-role.yaml
diff --git a/manifests/exporters/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics/kube-state-metrics-deployment.yaml
similarity index 100%
rename from manifests/exporters/kube-state-metrics-deployment.yaml
rename to manifests/kube-state-metrics/kube-state-metrics-deployment.yaml
diff --git a/manifests/exporters/kube-state-metrics-service-account.yaml b/manifests/kube-state-metrics/kube-state-metrics-service-account.yaml
similarity index 100%
rename from manifests/exporters/kube-state-metrics-service-account.yaml
rename to manifests/kube-state-metrics/kube-state-metrics-service-account.yaml
diff --git a/manifests/exporters/kube-state-metrics-service.yaml b/manifests/kube-state-metrics/kube-state-metrics-service.yaml
similarity index 100%
rename from manifests/exporters/kube-state-metrics-service.yaml
rename to manifests/kube-state-metrics/kube-state-metrics-service.yaml
diff --git a/manifests/exporters/node-exporter-daemonset.yaml b/manifests/node-exporter/node-exporter-daemonset.yaml
similarity index 100%
rename from manifests/exporters/node-exporter-daemonset.yaml
rename to manifests/node-exporter/node-exporter-daemonset.yaml
diff --git a/manifests/exporters/node-exporter-service.yaml b/manifests/node-exporter/node-exporter-service.yaml
similarity index 100%
rename from manifests/exporters/node-exporter-service.yaml
rename to manifests/node-exporter/node-exporter-service.yaml