diff --git a/clusters/cl01tl/platform/pgadmin/Chart.yaml b/clusters/cl01tl/platform/pgadmin/Chart.yaml
index 6a6a80b0f..28c7ba4c7 100644
--- a/clusters/cl01tl/platform/pgadmin/Chart.yaml
+++ b/clusters/cl01tl/platform/pgadmin/Chart.yaml
@@ -10,12 +10,13 @@ home: ""
 sources:
   - https://github.com/pgadmin-org/pgadmin4
   - https://hub.docker.com/r/dpage/pgadmin4/
-  - https://github.com/rowanruseler/helm-charts
+  - https://github.com/bjw-s/helm-charts/blob/main/charts/other/app-template/values.yaml
 maintainers:
-  - name: alexlebens  
+  - name: alexlebens
 dependencies:
-  - name: pgadmin4
-    version: 1.26.0
-    repository: https://helm.runix.net
+  - name: app-template
+    alias: pgadmin4
+    repository: https://bjw-s.github.io/helm-charts/
+    version: 3.2.1
 icon: https://raw.githubusercontent.com/walkxcode/dashboard-icons/main/png/pgadmin.png
-appVersion: 8.8
+appVersion: "8.8"
diff --git a/clusters/cl01tl/platform/pgadmin/templates/external-secret.yaml b/clusters/cl01tl/platform/pgadmin/templates/external-secret.yaml
index 50a9ffd53..5fadcc842 100644
--- a/clusters/cl01tl/platform/pgadmin/templates/external-secret.yaml
+++ b/clusters/cl01tl/platform/pgadmin/templates/external-secret.yaml
@@ -2,13 +2,13 @@ apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
   name: pgadmin-password-secret
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Release.Name | quote }}
-    app.kubernetes.io/instance: {{ .Release.Name | quote }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+    app.kubernetes.io/name: pgadmin-password-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name | quote }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -27,13 +27,13 @@ apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
   name: pgadmin-env-secret
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Release.Name | quote }}
-    app.kubernetes.io/instance: {{ .Release.Name | quote }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+    app.kubernetes.io/name: pgadmin-env-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name | quote }}
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/platform/pgadmin/values.yaml b/clusters/cl01tl/platform/pgadmin/values.yaml
index 689be174f..8c4efa34c 100644
--- a/clusters/cl01tl/platform/pgadmin/values.yaml
+++ b/clusters/cl01tl/platform/pgadmin/values.yaml
@@ -1,40 +1,71 @@
 pgadmin4:
-  image:
-    repository: dpage/pgadmin4
-    tag: 8.8
+  controllers:
+    main:
+      type: deployment
+      replicas: 1
+      strategy: Recreate
+      revisionHistoryLimit: 3
+      containers:
+        main:
+          image:
+            repository: dpage/pgadmin4
+            tag: 8.8
+            pullPolicy: IfNotPresent
+          env:
+            - name: PGADMIN_CONFIG_ENHANCED_COOKIE_PROTECTION
+              value: "False"
+            - name: PGADMIN_DEFAULT_EMAIL
+              value: alexanderlebens@gmail.com
+            - name: PGADMIN_DEFAULT_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: pgadmin-password-secret
+                  key: pgadmin-password
+          envFrom:
+            - secretRef:
+                name: pgadmin-env-secret
+          resources:
+            requests:
+              cpu: 100m
+              memory: 128Mi
   serviceAccount:
     create: true
-    automountServiceAccountToken: true
-  strategy:
-    type: Recreate    
-  serverDefinitions:
-    enabled: false
+  service:
+    main:
+      controller: main
+      ports:
+        http:
+          port: 80
+          targetPort: 80
+          protocol: TCP
   ingress:
-    enabled: true
-    ingressClassName: traefik
-    annotations:
-      traefik.ingress.kubernetes.io/router.entrypoints: websecure
-      traefik.ingress.kubernetes.io/router.tls: "true"
-      cert-manager.io/cluster-issuer: letsencrypt-issuer
-    hosts:
-      - host: pgadmin.alexlebens.net
-        paths:
-          - path: /
-            pathType: Prefix
-    tls:
-      - secretName: pgadmin-secret-tls
-        hosts:
-          - pgadmin.alexlebens.net
-  existingSecret: pgadmin-password-secret
-  secretKeys:
-    pgadminPasswordKey: pgadmin-password
-  env:
-    email: alexanderlebens@gmail.com
-  envVarsFromSecrets:
-    - pgadmin-env-secret
-  persistentVolume:
-    enabled: true
-    accessModes:
-      - ReadWriteOnce
-    size: 5Gi
-    storageClass: ceph-block
+    main:
+      enabled: true
+      className: traefik
+      annotations:
+        traefik.ingress.kubernetes.io/router.entrypoints: websecure
+        traefik.ingress.kubernetes.io/router.tls: "true"
+        cert-manager.io/cluster-issuer: letsencrypt-issuer
+      hosts:
+        - host: pgadmin.alexlebens.net
+          paths:
+            - path: /
+              pathType: Prefix
+              service:
+                name: pgadmin
+                port: 80
+      tls:
+        - secretName: pgadmin-secret-tls
+          hosts:
+            - pgadmin.alexlebens.net
+  persistence:
+    data:
+      storageClass: ceph-block
+      accessMode: ReadWriteOnce
+      size: 5Gi
+      retain: true
+      advancedMounts:
+        main:
+          main:
+            - path: /var/lib/pgadmin
+              readOnly: false