diff --git a/charts/meta-monitoring/templates/grafana/grafana.yaml b/charts/meta-monitoring/templates/grafana/grafana-deployment.yaml
similarity index 86%
rename from charts/meta-monitoring/templates/grafana/grafana.yaml
rename to charts/meta-monitoring/templates/grafana/grafana-deployment.yaml
index 0a2f68f..d7d795b 100644
--- a/charts/meta-monitoring/templates/grafana/grafana.yaml
+++ b/charts/meta-monitoring/templates/grafana/grafana-deployment.yaml
@@ -1,16 +1,4 @@
 {{- if .Values.local.grafana.enabled }}
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: grafana-pvc
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 1Gi
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -98,19 +86,4 @@ spec:
         - name: agent-dashboards-1
           configMap:
             name: agent-dashboards-1
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: grafana
-spec:
-  ports:
-    - port: 3000
-      protocol: TCP
-      targetPort: http-grafana
-  selector:
-    app: grafana
-  sessionAffinity: None
-  type: ClusterIP  # Make this configurable
 {{- end }}
diff --git a/charts/meta-monitoring/templates/grafana/grafana-pvc.yaml b/charts/meta-monitoring/templates/grafana/grafana-pvc.yaml
new file mode 100644
index 0000000..5b06b06
--- /dev/null
+++ b/charts/meta-monitoring/templates/grafana/grafana-pvc.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.local.grafana.enabled }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: grafana-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
+{{- end }}
diff --git a/charts/meta-monitoring/templates/grafana/grafana-service.yaml b/charts/meta-monitoring/templates/grafana/grafana-service.yaml
new file mode 100644
index 0000000..0be9162
--- /dev/null
+++ b/charts/meta-monitoring/templates/grafana/grafana-service.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.local.grafana.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: grafana
+spec:
+  ports:
+    - port: 3000
+      protocol: TCP
+      targetPort: http-grafana
+  selector:
+    app: grafana
+  sessionAffinity: None
+  type: ClusterIP  # Make this configurable
+{{- end }}