diff --git a/hack/cluster-monitoring/self-hosted-deploy b/hack/cluster-monitoring/self-hosted-deploy
index a25f7ed355325772c676034e3fc9a9003a0344dc..7cbce37d5304346fe71dd8d69be17b9debeeb0ee 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 05fd625a9bb4f88c630bef0922343203677e4620..f9d7da9f7cb805344eedc997cb73b0fc0e5143cc 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 2f22a6f2d7834b07a2e30a0d477824626ae116ee..a2983101ab87a56a1aad5a3e72304b8ae544b23f 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 36d9a0ad988a7d2ae9f9ba79cda9d484569112a0..e032771489b144e695aefe9a4b1b26dd39bdc91d 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 331998feba4558a00bda3ec3e08ed2c3e2b58509..0fe05dd74a339f4d152e3b15cf7035322f42e975 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