diff --git a/hack/cluster-monitoring/minikube-deploy b/hack/cluster-monitoring/minikube-deploy
new file mode 100755
index 0000000000000000000000000000000000000000..ab7e72e4172ac5dc4477db4549e9d4261b5db631
--- /dev/null
+++ b/hack/cluster-monitoring/minikube-deploy
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+hack/cluster-monitoring/deploy
+
+awk 'FNR==1{print "---"}1' manifests/k8s/minikube/*.yaml | sed s/MINIKUBE_IP/`minikube ip`/g | kubectl --namespace=kube-system apply -f - 
+
diff --git a/hack/cluster-monitoring/minikube-teardown b/hack/cluster-monitoring/minikube-teardown
new file mode 100755
index 0000000000000000000000000000000000000000..3a4c986ed06f08edf4bd845c5223f90f4168ea43
--- /dev/null
+++ b/hack/cluster-monitoring/minikube-teardown
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+hack/cluster-monitoring/teardown
+
+kubectl --namespace=kube-system delete -f manifests/k8s/minikube
+
diff --git a/hack/cluster-monitoring/self-hosted-deploy b/hack/cluster-monitoring/self-hosted-deploy
new file mode 100755
index 0000000000000000000000000000000000000000..a25f7ed355325772c676034e3fc9a9003a0344dc
--- /dev/null
+++ b/hack/cluster-monitoring/self-hosted-deploy
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+hack/cluster-monitoring/deploy
+
+kubectl --namespace=kube-system apply -f manifests/k8s/self-hosted
+
diff --git a/hack/cluster-monitoring/self-hosted-teardown b/hack/cluster-monitoring/self-hosted-teardown
new file mode 100755
index 0000000000000000000000000000000000000000..05fd625a9bb4f88c630bef0922343203677e4620
--- /dev/null
+++ b/hack/cluster-monitoring/self-hosted-teardown
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+hack/cluster-monitoring/teardown
+
+kubectl --namespace=kube-system delete -f manifests/k8s/self-hosted
+
diff --git a/manifests/k8s/minikube/kube-controller-manager.yaml b/manifests/k8s/minikube/kube-controller-manager.yaml
index bca65e405bce2e11b1b782df3adc9de685761489..135dd24cd7d512c19482c6b57d6f8d36c1084412 100644
--- a/manifests/k8s/minikube/kube-controller-manager.yaml
+++ b/manifests/k8s/minikube/kube-controller-manager.yaml
@@ -21,7 +21,7 @@ metadata:
     k8s-app: kube-controller-manager
 subsets:
 - addresses:
-  - ip: 192.168.99.100
+  - ip: MINIKUBE_IP
   ports:
   - name: http-metrics
     port: 10252
diff --git a/manifests/k8s/minikube/kube-scheduler.yaml b/manifests/k8s/minikube/kube-scheduler.yaml
index 983e5581369e1dd79be086df632f72940e6f0fa7..b3b51f387d145af38dadb8b363221267f1740715 100644
--- a/manifests/k8s/minikube/kube-scheduler.yaml
+++ b/manifests/k8s/minikube/kube-scheduler.yaml
@@ -21,7 +21,7 @@ metadata:
     k8s-app: kube-scheduler
 subsets:
 - addresses:
-  - ip: 192.168.99.100
+  - ip: MINIKUBE_IP
   ports:
   - name: http-metrics
     port: 10251