diff --git a/infrastructure/controllers/grafana.yaml b/infrastructure/controllers/grafana.yaml
index 30d2bb9..7fdb711 100644
--- a/infrastructure/controllers/grafana.yaml
+++ b/infrastructure/controllers/grafana.yaml
@@ -2,14 +2,14 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: grafana
+  name: monitoring
 
 ---
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: HelmRepository
 metadata:
   name: grafana
-  namespace: grafana
+  namespace: monitoring
 spec:
   interval: 24h
   url: https://grafana.github.io/helm-charts
@@ -19,7 +19,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: grafana
-  namespace: grafana
+  namespace: monitoring
 spec:
   interval: 30m
   chart:
@@ -29,9 +29,11 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: grafana
-        namespace: grafana
+        namespace: monitoring
       interval: 12h
   values:
+    admin:
+      existingSecret: grafana
     dashboardProviders:
       dashboardproviders.yaml:
         apiVersion: 1
diff --git a/scripts/k8s-secrets.sh b/scripts/k8s-secrets.sh
index 6c83eaf..2eb7f8c 100755
--- a/scripts/k8s-secrets.sh
+++ b/scripts/k8s-secrets.sh
@@ -23,6 +23,10 @@ data:
   aws_secret_access_key: $(echo -n $VELERO_S3_ACCESS_KEY | base64)
 EOF
 
+kubectl --namespace monitoring delete secret grafana --ignore-not-found
+kubectl --namespace monitoring create secret generic grafana \
+--from-literal=admin-user=${GRAFANA_USERNAME} \
+--from-literal=admin-password=${GRAFANA_PASSWORD}
 
 kubectl --namespace futureporn delete secret frp --ignore-not-found
 kubectl --namespace futureporn create secret generic frp \