diff --git a/config/monitoring/alertmanager/kustomization.yaml b/config/monitoring/alertmanager/kustomization.yaml
index 11006373..424e38b7 100644
--- a/config/monitoring/alertmanager/kustomization.yaml
+++ b/config/monitoring/alertmanager/kustomization.yaml
@@ -5,6 +5,7 @@ labels:
   - includeSelectors: true
     pairs:
       app.kubernetes.io/component: aerospike-alertmanager
+      app: aerospike-monitoring-stack-alertmanager
 
 resources:
   - statefulset.yaml
diff --git a/config/monitoring/alertmanager/pvc.yaml b/config/monitoring/alertmanager/pvc.yaml
index 17573543..c1b80337 100644
--- a/config/monitoring/alertmanager/pvc.yaml
+++ b/config/monitoring/alertmanager/pvc.yaml
@@ -1,7 +1,8 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: alertmanagerdata
+  name: alertmanager-data
+  namespace: monitoring
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/config/monitoring/alertmanager/service.yaml b/config/monitoring/alertmanager/service.yaml
index 4f420dea..8e5300fa 100644
--- a/config/monitoring/alertmanager/service.yaml
+++ b/config/monitoring/alertmanager/service.yaml
@@ -3,14 +3,7 @@ kind: Service
 metadata:
   name: aerospike-monitoring-stack-alertmanager
   namespace: monitoring
-  labels:
-    app: aerospike-monitoring-stack-alertmanager
-    chart: aerospike-monitoring-stack
-    release: aerospike-monitoring-stack
-    app.kubernetes.io/component: aerospike-alertmanager
 spec:
   ports:
     - name: http
-      port: 9093
-  selector:
-    app: aerospike-monitoring-stack-alertmanager
\ No newline at end of file
+      port: 9093
\ No newline at end of file
diff --git a/config/monitoring/alertmanager/statefulset.yaml b/config/monitoring/alertmanager/statefulset.yaml
index 030a84ae..54dba1e6 100644
--- a/config/monitoring/alertmanager/statefulset.yaml
+++ b/config/monitoring/alertmanager/statefulset.yaml
@@ -3,14 +3,7 @@ kind: StatefulSet
 metadata:
   name: aerospike-monitoring-stack-alertmanager
   namespace: monitoring
-  labels:
-    app: aerospike-monitoring-stack-alertmanager
-    chart: aerospike-monitoring-stack
-    release: aerospike-monitoring-stack
-    app.kubernetes.io/component: aerospike-alertmanager
-    unique-app: aerospike-monitoring-stack-alertmanager
 spec:
-  selector: {}
   template:
     spec:
       containers:
@@ -35,17 +28,17 @@ spec:
               port: 9093
           volumeMounts:
             - mountPath: /etc/alertmanager
-              name: alertmanagerconf
+              name: alertmanager-conf
             - mountPath: /alertmanager
-              name: alertmanagerdata
+              name: alertmanager-data
       securityContext:
         fsGroup: 26
       serviceAccountName: aerospike-monitoring-stack
       volumes:
-        - name: alertmanagerdata
+        - name: alertmanager-data
           persistentVolumeClaim:
-            claimName: alertmanagerdata
-        - name: alertmanagerconf
+            claimName: alertmanager-data
+        - name: alertmanager-conf
           configMap:
             defaultMode: 420
             name: alertmanager-config
\ No newline at end of file
diff --git a/config/monitoring/grafana/config/aerospike_grafana_dashboards.yaml b/config/monitoring/grafana/config/aerospike_grafana_dashboards_config.yaml
similarity index 100%
rename from config/monitoring/grafana/config/aerospike_grafana_dashboards.yaml
rename to config/monitoring/grafana/config/aerospike_grafana_dashboards_config.yaml
diff --git a/config/monitoring/grafana/kustomization.yaml b/config/monitoring/grafana/kustomization.yaml
index 865cd9c6..506842d9 100644
--- a/config/monitoring/grafana/kustomization.yaml
+++ b/config/monitoring/grafana/kustomization.yaml
@@ -5,6 +5,7 @@ labels:
   - includeSelectors: true
     pairs:
       app.kubernetes.io/component: aerospike-grafana
+      app: aerospike-monitoring-stack-grafana
 
 resources:
   - statefulset.yaml
@@ -21,7 +22,7 @@ configMapGenerator:
       - config/grafana.ini
   - name: grafana-dashboards
     files:
-      - config/aerospike_grafana_dashboards.yaml
+      - config/aerospike_grafana_dashboards_config.yaml
 
 generatorOptions:
   disableNameSuffixHash: true
diff --git a/config/monitoring/grafana/pvc.yaml b/config/monitoring/grafana/pvc.yaml
index 00c9bd5c..d6ae98e6 100644
--- a/config/monitoring/grafana/pvc.yaml
+++ b/config/monitoring/grafana/pvc.yaml
@@ -1,7 +1,8 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: grafanadata
+  name: grafana-data
+  namespace: monitoring
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/config/monitoring/grafana/service.yaml b/config/monitoring/grafana/service.yaml
index daf1c118..1d825b3d 100644
--- a/config/monitoring/grafana/service.yaml
+++ b/config/monitoring/grafana/service.yaml
@@ -3,16 +3,9 @@ kind: Service
 metadata:
   name: aerospike-monitoring-stack-grafana
   namespace: monitoring
-  labels:
-    app: aerospike-monitoring-stack-grafana
-    chart: aerospike-monitoring-stack
-    release: aerospike-monitoring-stack
-    app.kubernetes.io/component: grafana
 spec:
   ports:
     - name: http
       port: 80
       protocol: TCP
-      targetPort: 3000
-  selector:
-    app: aerospike-monitoring-stack-grafana
\ No newline at end of file
+      targetPort: 3000
\ No newline at end of file
diff --git a/config/monitoring/grafana/statefulset.yaml b/config/monitoring/grafana/statefulset.yaml
index 741af25e..f29b9b6b 100644
--- a/config/monitoring/grafana/statefulset.yaml
+++ b/config/monitoring/grafana/statefulset.yaml
@@ -3,21 +3,10 @@ kind: StatefulSet
 metadata:
   name: aerospike-monitoring-stack-grafana
   namespace: monitoring
-  labels: &Labels
-    app: aerospike-monitoring-stack-grafana
-    chart: aerospike-monitoring-stack
-    release: aerospike-monitoring-stack
-    app.kubernetes.io/component: grafana
-    unique-app: aerospike-monitoring-stack-grafana
 spec:
   serviceName: aerospike-monitoring-stack-grafana
   replicas: 1
-  selector:
-    matchLabels: *Labels
   template:
-    metadata:
-      labels: *Labels
-      annotations:
     spec:
       serviceAccountName: aerospike-monitoring-stack
       terminationGracePeriodSeconds: 120
@@ -38,7 +27,7 @@ spec:
             - name: node-dashboard
               mountPath: "/var/lib/grafana/dashboards/node.json"
               subPath: node.json
-            - name: grafanadata
+            - name: grafana-data
               mountPath: "/data"
           ports:
             - name: service
@@ -93,6 +82,6 @@ spec:
           configMap:
             defaultMode: 420
             name: node-dashboard
-        - name: grafanadata
+        - name: grafana-data
           persistentVolumeClaim:
-            claimName: grafanadata
\ No newline at end of file
+            claimName: grafana-data
\ No newline at end of file
diff --git a/config/monitoring/prometheus/clusterrole.yaml b/config/monitoring/prometheus/clusterrole.yaml
index 269cb56f..6af4c619 100644
--- a/config/monitoring/prometheus/clusterrole.yaml
+++ b/config/monitoring/prometheus/clusterrole.yaml
@@ -3,9 +3,7 @@ kind: ClusterRole
 metadata:
   labels:
     app: aerospike-monitoring-stack
-    chart: aerospike-monitoring-stack
-    release: aerospike-monitoring-stack
-  name: aerospike-monitoring-stack-aerospike-monitoring-stack
+  name: aerospike-monitoring-stack
 rules:
   - apiGroups:
       - ""
diff --git a/config/monitoring/prometheus/clusterrolebinding.yaml b/config/monitoring/prometheus/clusterrolebinding.yaml
index 802c1000..74a3609c 100644
--- a/config/monitoring/prometheus/clusterrolebinding.yaml
+++ b/config/monitoring/prometheus/clusterrolebinding.yaml
@@ -3,13 +3,11 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app: aerospike-monitoring-stack
-    chart: aerospike-monitoring-stack
-    release: aerospike-monitoring-stack
-  name: aerospike-monitoring-stack-aerospike-monitoring-stack
+  name: aerospike-monitoring-stack
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: aerospike-monitoring-stack-aerospike-monitoring-stack
+  name: aerospike-monitoring-stack
 subjects:
   - kind: ServiceAccount
     name: aerospike-monitoring-stack
diff --git a/config/monitoring/prometheus/kustomization.yaml b/config/monitoring/prometheus/kustomization.yaml
index 5c5c51f5..1f38af69 100644
--- a/config/monitoring/prometheus/kustomization.yaml
+++ b/config/monitoring/prometheus/kustomization.yaml
@@ -5,6 +5,7 @@ labels:
   - includeSelectors: true
     pairs:
       app.kubernetes.io/component: aerospike-prometheus
+      app: aerospike-monitoring-stack-prometheus
 
 resources:
   - statefulset.yaml
diff --git a/config/monitoring/prometheus/pvc.yaml b/config/monitoring/prometheus/pvc.yaml
index 705a106c..e0b34430 100644
--- a/config/monitoring/prometheus/pvc.yaml
+++ b/config/monitoring/prometheus/pvc.yaml
@@ -1,7 +1,8 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: prometheusdata
+  name: prometheus-data
+  namespace: monitoring
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/config/monitoring/prometheus/service.yaml b/config/monitoring/prometheus/service.yaml
index 16f18f44..5eb4f6e2 100644
--- a/config/monitoring/prometheus/service.yaml
+++ b/config/monitoring/prometheus/service.yaml
@@ -3,17 +3,10 @@ apiVersion: v1
 metadata:
   name: aerospike-monitoring-stack-prometheus
   namespace: monitoring
-  labels:
-    app: aerospike-monitoring-stack-prometheus
-    chart: aerospike-monitoring-stack
-    release: aerospike-monitoring-stack
-    app.kubernetes.io/component: prometheus
 spec:
   ports:
     - name: http
       port: 9090
       protocol: TCP
       targetPort: 9090
-  sessionAffinity: ClientIP
-  selector:
-    app: aerospike-monitoring-stack-prometheus
\ No newline at end of file
+  sessionAffinity: ClientIP
\ No newline at end of file
diff --git a/config/monitoring/prometheus/serviceaccount.yaml b/config/monitoring/prometheus/serviceaccount.yaml
index e67292c3..028bdc4f 100644
--- a/config/monitoring/prometheus/serviceaccount.yaml
+++ b/config/monitoring/prometheus/serviceaccount.yaml
@@ -3,7 +3,5 @@ kind: ServiceAccount
 metadata:
   labels:
     app: aerospike-monitoring-stack
-    chart: aerospike-monitoring-stack
-    release: aerospike-monitoring-stack
   name: aerospike-monitoring-stack
   namespace: monitoring
\ No newline at end of file
diff --git a/config/monitoring/prometheus/statefulset.yaml b/config/monitoring/prometheus/statefulset.yaml
index 9dbb256e..ba8c0cb6 100644
--- a/config/monitoring/prometheus/statefulset.yaml
+++ b/config/monitoring/prometheus/statefulset.yaml
@@ -3,24 +3,13 @@ kind: StatefulSet
 metadata:
   name: aerospike-monitoring-stack-prometheus
   namespace: monitoring
-  labels: &Labels
-    app: aerospike-monitoring-stack-prometheus
-    chart: aerospike-monitoring-stack
-    release: aerospike-monitoring-stack
-    app.kubernetes.io/component: prometheus
-    unique-app: aerospike-monitoring-stack-prometheus
 spec:
   serviceName: aerospike-monitoring-stack-prometheus
   replicas: 1
   podManagementPolicy: Parallel
   updateStrategy:
     type: RollingUpdate
-  selector:
-    matchLabels: *Labels
   template:
-    metadata:
-      labels: *Labels
-      annotations:
     spec:
       serviceAccountName: aerospike-monitoring-stack
       containers:
@@ -59,7 +48,7 @@ spec:
             - name: "prometheus-data"
               mountPath: /data
             - mountPath: /etc/prometheus/alert-rules.d
-              name: alertmanagerrules
+              name: alert-manager-rules
       terminationGracePeriodSeconds: 120
       securityContext:
         fsGroup: 65534
@@ -67,10 +56,10 @@ spec:
         - name: config-volume
           configMap:
             name: aerospike-monitoring-stack-prometheus-config
-        - name: "prometheus-data"
+        - name: prometheus-data
           persistentVolumeClaim:
-            claimName: prometheusdata
-        - name: alertmanagerrules
+            claimName: prometheus-data
+        - name: alert-manager-rules
           configMap:
               defaultMode: 420
               name: alert-rules-config
\ No newline at end of file