diff --git a/README.md b/README.md
index 820bbb8574ff778030155b6070969baad03fc9cb..db4f554dbe502e9874742a9095438d48c8a1030c 100644
--- a/README.md
+++ b/README.md
@@ -135,4 +135,4 @@ monitoring    etcd-k8s                                       172.17.4.51:2379
 ```
 
 ## Other Documentation
-[Install Docs for a cluster created with KOPS on AWS](docs/KOPSonAWS.md)
\ No newline at end of file
+[Install Docs for a cluster created with KOPS on AWS](docs/KOPSonAWS.md)
diff --git a/hack/cluster-monitoring/deploy b/hack/cluster-monitoring/deploy
index c3e2667f4f9a5ea1192c6fbf711dab0dbbe7e20d..9ad91eb0ed85afbfc8f65f23bef4125257eea9cf 100755
--- a/hack/cluster-monitoring/deploy
+++ b/hack/cluster-monitoring/deploy
@@ -27,7 +27,7 @@ kctl apply -f manifests/exporters
 kctl apply -f manifests/grafana
 
 kctl apply -f manifests/prometheus/prometheus-k8s-rules.yaml
-kctl apply -f manifests/prometheus/prometheus-k8s-svc.yaml
+kctl apply -f manifests/prometheus/prometheus-k8s-service.yaml
 
 kctl apply -f manifests/alertmanager/alertmanager-config.yaml
 kctl apply -f manifests/alertmanager/alertmanager-service.yaml
@@ -35,7 +35,7 @@ kctl apply -f manifests/alertmanager/alertmanager-service.yaml
 # `kubectl apply` is currently not working for third party resources so we are
 # using `kubectl create` here for the time being.
 # (https://github.com/kubernetes/kubernetes/issues/29542)
-kctl create -f manifests/prometheus/prometheus-k8s-servicemonitor.yaml
+kctl create -f manifests/prometheus/prometheus-k8s-servicemonitors.yaml
 kctl create -f manifests/prometheus/prometheus-k8s.yaml
 kctl create -f manifests/alertmanager/alertmanager.yaml
 
diff --git a/hack/scripts/generate-configmaps.sh b/hack/scripts/generate-configmaps.sh
index aa38878b7791da5871de3ae134ce26f0d09c176a..02ba18e956395ae2a666e18a32626aeb95c36762 100755
--- a/hack/scripts/generate-configmaps.sh
+++ b/hack/scripts/generate-configmaps.sh
@@ -4,5 +4,5 @@
 kubectl create configmap --dry-run=true prometheus-k8s-rules --from-file=assets/prometheus/rules/ -oyaml > manifests/prometheus/prometheus-k8s-rules.yaml
 
 # Generate Dashboard ConfigMap
-kubectl create configmap --dry-run=true grafana-dashboards --from-file=assets/grafana/ -oyaml > manifests/grafana/grafana-cm.yaml
+kubectl create configmap --dry-run=true grafana-dashboards --from-file=assets/grafana/ -oyaml > manifests/grafana/grafana-dashboards.yaml
 
diff --git a/manifests/exporters/kube-state-metrics-depl.yaml b/manifests/exporters/kube-state-metrics-deployment.yaml
similarity index 100%
rename from manifests/exporters/kube-state-metrics-depl.yaml
rename to manifests/exporters/kube-state-metrics-deployment.yaml
diff --git a/manifests/exporters/kube-state-metrics-svc.yaml b/manifests/exporters/kube-state-metrics-service.yaml
similarity index 100%
rename from manifests/exporters/kube-state-metrics-svc.yaml
rename to manifests/exporters/kube-state-metrics-service.yaml
diff --git a/manifests/exporters/node-exporter-ds.yaml b/manifests/exporters/node-exporter-daemonset.yaml
similarity index 100%
rename from manifests/exporters/node-exporter-ds.yaml
rename to manifests/exporters/node-exporter-daemonset.yaml
diff --git a/manifests/exporters/node-exporter-svc.yaml b/manifests/exporters/node-exporter-service.yaml
similarity index 100%
rename from manifests/exporters/node-exporter-svc.yaml
rename to manifests/exporters/node-exporter-service.yaml
diff --git a/manifests/grafana/grafana-cm.yaml b/manifests/grafana/grafana-dashboards.yaml
similarity index 100%
rename from manifests/grafana/grafana-cm.yaml
rename to manifests/grafana/grafana-dashboards.yaml
diff --git a/manifests/grafana/grafana-depl.yaml b/manifests/grafana/grafana-deployment.yaml
similarity index 100%
rename from manifests/grafana/grafana-depl.yaml
rename to manifests/grafana/grafana-deployment.yaml
diff --git a/manifests/grafana/grafana-svc.yaml b/manifests/grafana/grafana-service.yaml
similarity index 100%
rename from manifests/grafana/grafana-svc.yaml
rename to manifests/grafana/grafana-service.yaml
diff --git a/manifests/prometheus-operator.yaml b/manifests/prometheus-operator.yaml
index 78bc11d7884b3b1cff9fb0e8e8ffacaee307f6f8..6c8030ebae39c69ab2807fb9a07ba7873d26fe71 100644
--- a/manifests/prometheus-operator.yaml
+++ b/manifests/prometheus-operator.yaml
@@ -16,7 +16,7 @@ spec:
          image: quay.io/coreos/prometheus-operator:v0.6.0
          args:
            - "--kubelet-object=kube-system/kubelet"
-           - "--config-reloader-image=quay.io/coreos/configmap-reload:latest"
+           - "--config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1"
          resources:
            requests:
              cpu: 100m
diff --git a/manifests/prometheus/prometheus-k8s-svc.yaml b/manifests/prometheus/prometheus-k8s-service.yaml
similarity index 100%
rename from manifests/prometheus/prometheus-k8s-svc.yaml
rename to manifests/prometheus/prometheus-k8s-service.yaml
diff --git a/manifests/prometheus/prometheus-k8s-servicemonitor.yaml b/manifests/prometheus/prometheus-k8s-servicemonitors.yaml
similarity index 100%
rename from manifests/prometheus/prometheus-k8s-servicemonitor.yaml
rename to manifests/prometheus/prometheus-k8s-servicemonitors.yaml
diff --git a/manifests/prometheus/prometheus-k8s.yaml b/manifests/prometheus/prometheus-k8s.yaml
index a593f04100e5f762fb237bc4f1a7e1f9f58012cf..9054ea5868dbe938faeca867548ad8dda6a8ee11 100644
--- a/manifests/prometheus/prometheus-k8s.yaml
+++ b/manifests/prometheus/prometheus-k8s.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     prometheus: k8s
 spec:
+  replicas: 2
   version: v1.5.2
   serviceMonitorSelector:
     matchExpression: