diff --git a/hack/cluster-monitoring/self-hosted-deploy b/hack/cluster-monitoring/self-hosted-deploy
index a25f7ed3..7cbce37d 100755
--- a/hack/cluster-monitoring/self-hosted-deploy
+++ b/hack/cluster-monitoring/self-hosted-deploy
@@ -2,5 +2,5 @@
 
 hack/cluster-monitoring/deploy
 
-kubectl --namespace=kube-system apply -f manifests/k8s/self-hosted
+kubectl apply -f manifests/k8s/self-hosted
 
diff --git a/hack/cluster-monitoring/self-hosted-teardown b/hack/cluster-monitoring/self-hosted-teardown
index 05fd625a..f9d7da9f 100755
--- a/hack/cluster-monitoring/self-hosted-teardown
+++ b/hack/cluster-monitoring/self-hosted-teardown
@@ -2,5 +2,5 @@
 
 hack/cluster-monitoring/teardown
 
-kubectl --namespace=kube-system delete -f manifests/k8s/self-hosted
+kubectl delete -f manifests/k8s/self-hosted
 
diff --git a/manifests/k8s/self-hosted/kube-controller-manager.yaml b/manifests/k8s/self-hosted/kube-controller-manager.yaml
index 2f22a6f2..a2983101 100644
--- a/manifests/k8s/self-hosted/kube-controller-manager.yaml
+++ b/manifests/k8s/self-hosted/kube-controller-manager.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: kube-system
   name: kube-controller-manager-prometheus-discovery
   labels:
     k8s-app: kube-controller-manager
diff --git a/manifests/k8s/self-hosted/kube-dns.yaml b/manifests/k8s/self-hosted/kube-dns.yaml
index 36d9a0ad..e0327714 100644
--- a/manifests/k8s/self-hosted/kube-dns.yaml
+++ b/manifests/k8s/self-hosted/kube-dns.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: kube-system
   name: kube-dns-prometheus-discovery
   labels:
     k8s-app: kube-dns
diff --git a/manifests/k8s/self-hosted/kube-scheduler.yaml b/manifests/k8s/self-hosted/kube-scheduler.yaml
index 331998fe..0fe05dd7 100644
--- a/manifests/k8s/self-hosted/kube-scheduler.yaml
+++ b/manifests/k8s/self-hosted/kube-scheduler.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: kube-system
   name: kube-scheduler-prometheus-discovery
   labels:
     k8s-app: kube-scheduler