diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 4b4a11f..a9e7984 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -76,6 +76,23 @@ jobs:
             fi
           done
 
+      - name: Deploy Grafana
+        run: |
+          for chart in ./ops/helm/grafana/*; do
+           echo "Processing chart $(basename "$chart")..."
+            if [ -d "$chart" ]; then
+              namespace=$(yq e '.namespace' "$chart/values.yaml" || echo "default")
+              echo "Deploying chart $(basename "$chart") to namespace $namespace..."
+              helm dependency update "$chart"
+              helm upgrade --install "$(basename "$chart")" "$chart" \
+                --namespace "$namespace" \
+                --create-namespace \
+                --values "$chart/values.yaml" \
+                --wait --timeout 10m \
+                --force
+            fi
+          done
+
       - name: Deploy Tempo, Loki and Mimir
         run: |
           for chart in ./ops/helm/ingestion/*; do
diff --git a/ops/helm/grafana/grafana/values.yaml b/ops/helm/grafana/grafana/values.yaml
index cb82089..0d6c95a 100644
--- a/ops/helm/grafana/grafana/values.yaml
+++ b/ops/helm/grafana/grafana/values.yaml
@@ -1,16 +1,40 @@
 namespace: monitoring
 
 grafana:
-  enabled: true
   adminUser: admin
-  adminPassword: admin
+
+  admin:
+    userKey: admin
+    passwordKey: admin
+
+  persistence:
+    type: pvc
+    enabled: true
+
+  plugins:
+    - grafana-lokiexplore-app
+    - grafana-exploretraces-app
+    - grafana-pyroscope-app
+    - alexanderzobnin-zabbix-app
+
   service:
-      type: LoadBalancer
+      type: ClusterIP
       port: 80
-  ingress:
-      enabled: true
-      annotations:
-      kubernetes.io/ingress.class: nginx
-      hosts:
-      - host: grafana.{{ .Values.namespace }}.{{ .Values.clusterDomain }}
-          paths:
+
+#  ingress:
+#    enabled: true
+#    annotations:
+#      kubernetes.io/ingress.class: ingress-traefik
+#      cert-manager.io/issuer: letsencrypt-traefik
+#    tls:
+#      - secretName: letsencrypt-traefik-grafana
+#        hosts:
+#          - grafana.{{ .Values.namespace }}.{{ .Values.clusterDomain }}
+#    hosts:
+#      - grafana.webgrip.k8s.traefik.nl
+#    extraPaths:
+#      - path: /
+#        backend:
+#          serviceName: grafana
+#          servicePort: 80
+
diff --git a/ops/helm/ingestion/loki/Chart.lock b/ops/helm/unused/loki/Chart.lock
similarity index 100%
rename from ops/helm/ingestion/loki/Chart.lock
rename to ops/helm/unused/loki/Chart.lock
diff --git a/ops/helm/ingestion/loki/Chart.yaml b/ops/helm/unused/loki/Chart.yaml
similarity index 100%
rename from ops/helm/ingestion/loki/Chart.yaml
rename to ops/helm/unused/loki/Chart.yaml
diff --git a/ops/helm/ingestion/loki/values.yaml b/ops/helm/unused/loki/values.yaml
similarity index 100%
rename from ops/helm/ingestion/loki/values.yaml
rename to ops/helm/unused/loki/values.yaml