diff --git a/kubernetes/talos-flux/apps/observability/grafana/app/config/datasources.yaml b/kubernetes/talos-flux/apps/observability/grafana/app/config/datasources.yaml
index f7cb223ed..8db6a3b53 100644
--- a/kubernetes/talos-flux/apps/observability/grafana/app/config/datasources.yaml
+++ b/kubernetes/talos-flux/apps/observability/grafana/app/config/datasources.yaml
@@ -22,7 +22,7 @@ datasources:
   - name: GitHub
     type: grafana-github-datasource
     jsonData:
-      owner: "tyriis"
-      repository: "home-ops"
+      owner: tyriis
+      repository: home-ops
     secureJsonData:
-      accessToken: ${SECRET_GH_PAT}
+      accessToken: $GITHUB_PAT
diff --git a/kubernetes/talos-flux/apps/observability/grafana/app/grafana-auth-google.sops.yaml b/kubernetes/talos-flux/apps/observability/grafana/app/grafana-env.sops.yaml
similarity index 69%
rename from kubernetes/talos-flux/apps/observability/grafana/app/grafana-auth-google.sops.yaml
rename to kubernetes/talos-flux/apps/observability/grafana/app/grafana-env.sops.yaml
index 4667f50aa..29a0f10db 100644
--- a/kubernetes/talos-flux/apps/observability/grafana/app/grafana-auth-google.sops.yaml
+++ b/kubernetes/talos-flux/apps/observability/grafana/app/grafana-env.sops.yaml
@@ -2,10 +2,11 @@
 apiVersion: v1
 kind: Secret
 metadata:
-    name: grafana-auth-google
+    name: grafana-env
 stringData:
     GF_AUTH_GOOGLE_CLIENT_ID: ENC[AES256_GCM,data:EaJ5MS9jmXKZ1gbBwJU8xL09E95Lzog/ncqnq8+TYC/e27JpcE4LdQC2ZwjIWPcTDuUM5m7NpjMzUzIvISXoOJdDSxe/waRr,iv:Oub/mmnsIBGMB4GMMvL2eUK7Uz4XgHdIIdPiAeFuiXY=,tag:gKByk2mmlmJc5+yJmkXcAQ==,type:str]
     GF_AUTH_GOOGLE_CLIENT_SECRET: ENC[AES256_GCM,data:YLlBwyOWV0zksdQoc2Rp0GrNxXCBtsxbvhPSSBHy/By4djo=,iv:sHFcGqQj6Ak0GvA+I7guGLPY40bHO3re7XPV2xsToPA=,tag:1Ns/P/xXdUpNS6iYjv4Rxw==,type:str]
+    GITHUB_PAT: ENC[AES256_GCM,data:XkHDWOs2UQP3yT5NwiilDrDTOK7NDNAKWBqF4wuY31yA2TW70Vqfjg==,iv:SgHDC9NTU5bVpJNIX9DxwKo6WgNLs6T1Kjsi7T0HpcQ=,tag:E967XwHdFfwU0ERYYMIetQ==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -21,8 +22,8 @@ sops:
             eUQwcWJxQWZIUkRsb291SHpGSDhqT1EKgTQ1qSb4D0VNoXTiTkz9sHrHFPNHcPCW
             IQ8/QYEA6iWVt+v8s+ATb2OaLZhha5FgwCOGVyIv6GJLP1kBlz8RwQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-04-03T20:17:40Z"
-    mac: ENC[AES256_GCM,data:JQr1hrOpDMRAuxbA/7I6aJgQ5ReLfwqPW3SvgVvUVcJXeWTPt9xvYRUrUBzqunfiJ6wZKRCkuSZ5uRthlDwR2fAVqxbFjAhUxWuld7P5fZs6u63Qx/+cgd8WkLZZ8ikNI249eDn0rzTo1UfGSI4eAozejvCufyuGh/L+o2MCKQc=,iv:o557kvzdsWv+3VkT+WH1i0iyhxFc2sR1FIO8hlzSfIU=,tag:lzVtBxhbs5aRA7XhCnfS/Q==,type:str]
+    lastmodified: "2024-04-03T20:30:42Z"
+    mac: ENC[AES256_GCM,data:7isbGbxz0t0NxjhGER9Mq/TWUK20My9Z4b0yYcD1SWJ+toAGH36NmxC2i36bChU16d0ZPanlW6wmUL7O+1Ihvp/5tQyFp7ZW+6cPIAhWekdFYOrFk68pfB+IlD/YYOt6HO6bmcfXispqyqDZkr9k8UgirsEt7sA36NMs/nByWXY=,iv:y7jqoj+G/HzAKXmY6yI82AEfwo/ueGw1p8gbS9/GkTA=,tag:QagM09nKrdiO/mCBFDOSzw==,type:str]
     pgp: []
     encrypted_regex: ^(data|stringData)$
     version: 3.8.1
diff --git a/kubernetes/talos-flux/apps/observability/grafana/app/helm-release.yaml b/kubernetes/talos-flux/apps/observability/grafana/app/helm-release.yaml
index 37f385eb3..c6048ea5d 100644
--- a/kubernetes/talos-flux/apps/observability/grafana/app/helm-release.yaml
+++ b/kubernetes/talos-flux/apps/observability/grafana/app/helm-release.yaml
@@ -31,7 +31,7 @@ spec:
       TZ: ${SETTING_TZ}
 
     envFromSecrets:
-      - name: grafana-auth-google
+      - name: grafana-env
 
     admin:
       existingSecret: grafana-admin
diff --git a/kubernetes/talos-flux/apps/observability/grafana/app/kustomization.yaml b/kubernetes/talos-flux/apps/observability/grafana/app/kustomization.yaml
index 88f8d0d4e..a03967a8f 100644
--- a/kubernetes/talos-flux/apps/observability/grafana/app/kustomization.yaml
+++ b/kubernetes/talos-flux/apps/observability/grafana/app/kustomization.yaml
@@ -5,7 +5,7 @@ kind: Kustomization
 namespace: observability
 resources:
   - grafana-admin.sops.yaml
-  - grafana-auth-google.sops.yaml
+  - grafana-env.sops.yaml
   - helm-release.yaml
 configMapGenerator:
   - name: grafana-contactpoints