diff --git a/clusters/cl01tl/storage/democratic-csi-synology-iscsi/templates/external-secret.yaml b/clusters/cl01tl/storage/democratic-csi-synology-iscsi/templates/external-secret.yaml
index e8a9d8ec3..f1c0e2113 100644
--- a/clusters/cl01tl/storage/democratic-csi-synology-iscsi/templates/external-secret.yaml
+++ b/clusters/cl01tl/storage/democratic-csi-synology-iscsi/templates/external-secret.yaml
@@ -6,9 +6,6 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: storage
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/storage/democratic-csi-synology-iscsi/templates/namespace.yaml b/clusters/cl01tl/storage/democratic-csi-synology-iscsi/templates/namespace.yaml
index 2555d45b2..f2e640822 100644
--- a/clusters/cl01tl/storage/democratic-csi-synology-iscsi/templates/namespace.yaml
+++ b/clusters/cl01tl/storage/democratic-csi-synology-iscsi/templates/namespace.yaml
@@ -3,6 +3,8 @@ kind: Namespace
 metadata:
   name: democratic-csi-synology-iscsi
   labels:
+    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     pod-security.kubernetes.io/audit: privileged
     pod-security.kubernetes.io/enforce: privileged
     pod-security.kubernetes.io/warn: privileged
diff --git a/clusters/cl01tl/storage/local-path-provisioner/templates/namespace.yaml b/clusters/cl01tl/storage/local-path-provisioner/templates/namespace.yaml
index 7bcdfc203..ed56400f6 100644
--- a/clusters/cl01tl/storage/local-path-provisioner/templates/namespace.yaml
+++ b/clusters/cl01tl/storage/local-path-provisioner/templates/namespace.yaml
@@ -3,6 +3,8 @@ kind: Namespace
 metadata:
   name: local-path-provisioner
   labels:
+    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     pod-security.kubernetes.io/audit: privileged
     pod-security.kubernetes.io/enforce: privileged
     pod-security.kubernetes.io/warn: privileged
diff --git a/clusters/cl01tl/storage/pgadmin/Chart.yaml b/clusters/cl01tl/storage/pgadmin/Chart.yaml
index 8d69b6bf1..374ee55f7 100644
--- a/clusters/cl01tl/storage/pgadmin/Chart.yaml
+++ b/clusters/cl01tl/storage/pgadmin/Chart.yaml
@@ -17,6 +17,6 @@ dependencies:
   - name: app-template
     alias: pgadmin4
     repository: https://bjw-s-labs.github.io/helm-charts/
-    version: 3.7.3
+    version: 4.0.1
 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/pgadmin.png
 appVersion: 9.3.0
diff --git a/clusters/cl01tl/storage/pgadmin/templates/external-secret.yaml b/clusters/cl01tl/storage/pgadmin/templates/external-secret.yaml
index b36379307..c647ce00c 100644
--- a/clusters/cl01tl/storage/pgadmin/templates/external-secret.yaml
+++ b/clusters/cl01tl/storage/pgadmin/templates/external-secret.yaml
@@ -4,11 +4,8 @@ metadata:
   name: pgadmin-password-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: pgadmin-password-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -29,11 +26,8 @@ metadata:
   name: pgadmin-env-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: pgadmin-env-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
@@ -68,11 +62,8 @@ metadata:
   name: pgadmin-data-backup-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: pgadmin-data-backup-secret
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: backup
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/clusters/cl01tl/storage/pgadmin/templates/http-route.yaml b/clusters/cl01tl/storage/pgadmin/templates/http-route.yaml
index 68a6a52a8..144a830ee 100644
--- a/clusters/cl01tl/storage/pgadmin/templates/http-route.yaml
+++ b/clusters/cl01tl/storage/pgadmin/templates/http-route.yaml
@@ -4,11 +4,8 @@ metadata:
   name: http-route-pgadmin
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: http-route-pgadmin
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   parentRefs:
     - group: gateway.networking.k8s.io
diff --git a/clusters/cl01tl/storage/pgadmin/templates/replication-source.yaml b/clusters/cl01tl/storage/pgadmin/templates/replication-source.yaml
index 4dd211667..b39300479 100644
--- a/clusters/cl01tl/storage/pgadmin/templates/replication-source.yaml
+++ b/clusters/cl01tl/storage/pgadmin/templates/replication-source.yaml
@@ -4,11 +4,8 @@ metadata:
   name: pgadmin-data-backup-source
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: pgadmin-data-backup-source
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    app.kubernetes.io/component: backup
-    app.kubernetes.io/part-of: {{ .Release.Name }}
 spec:
   sourcePVC: pgadmin-data
   trigger:
diff --git a/clusters/cl01tl/storage/pgadmin/values.yaml b/clusters/cl01tl/storage/pgadmin/values.yaml
index ba9ffafb4..8742568ff 100644
--- a/clusters/cl01tl/storage/pgadmin/values.yaml
+++ b/clusters/cl01tl/storage/pgadmin/values.yaml
@@ -19,7 +19,7 @@ pgadmin4:
               /bin/chown -R 5050:5050 /var/lib/pgadmin
           resources:
             requests:
-              cpu: 100m
+              cpu: 10m
               memory: 128Mi
       containers:
         main:
@@ -47,8 +47,6 @@ pgadmin4:
             requests:
               cpu: 10m
               memory: 256Mi
-  serviceAccount:
-    create: true
   service:
     main:
       controller: main
@@ -59,6 +57,7 @@ pgadmin4:
           protocol: TCP
   persistence:
     data:
+      forceRename: pgadmin4-data
       storageClass: ceph-block
       accessMode: ReadWriteOnce
       size: 5Gi