diff --git a/kubernetes/apps/database/kustomization.yaml b/kubernetes/apps/database/kustomization.yaml
index de4e93554..066725dd7 100644
--- a/kubernetes/apps/database/kustomization.yaml
+++ b/kubernetes/apps/database/kustomization.yaml
@@ -9,3 +9,4 @@ resources:
   - ./cloudnative-pg/ks.yaml
   - ./dragonfly/ks.yaml
   - ./influx/ks.yaml
+  - ./pgadmin/ks.yaml
diff --git a/kubernetes/apps/default/pgadmin/app/externalsecret.yaml b/kubernetes/apps/database/pgadmin/app/externalsecret.yaml
similarity index 96%
rename from kubernetes/apps/default/pgadmin/app/externalsecret.yaml
rename to kubernetes/apps/database/pgadmin/app/externalsecret.yaml
index 55697d399..574c259fb 100644
--- a/kubernetes/apps/default/pgadmin/app/externalsecret.yaml
+++ b/kubernetes/apps/database/pgadmin/app/externalsecret.yaml
@@ -4,7 +4,6 @@ apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
   name: pgadmin
-  namespace: default
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/kubernetes/apps/default/pgadmin/app/helmrelease.yaml b/kubernetes/apps/database/pgadmin/app/helmrelease.yaml
similarity index 93%
rename from kubernetes/apps/default/pgadmin/app/helmrelease.yaml
rename to kubernetes/apps/database/pgadmin/app/helmrelease.yaml
index df92d634d..e491b051a 100644
--- a/kubernetes/apps/default/pgadmin/app/helmrelease.yaml
+++ b/kubernetes/apps/database/pgadmin/app/helmrelease.yaml
@@ -4,7 +4,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: &app pgadmin
-  namespace: default
 spec:
   interval: 30m
   chart:
@@ -34,8 +33,8 @@ spec:
     defaultPodOptions:
       securityContext:
         runAsUser: 5050
-        runAsGroup: 5050
-        fsGroup: 5050
+        runAsGroup: 0
+        fsGroup: 0
         fsGroupChangePolicy: OnRootMismatch
     controllers:
       pgadmin:
@@ -92,3 +91,8 @@ spec:
         existingClaim: *app
         globalMounts:
           - path: /var/lib/pgadmin
+      sessions:
+        enabled: true
+        type: emptyDir
+        globalMounts:
+          - path: /var/lib/pgadmin/sessions
diff --git a/kubernetes/apps/default/pgadmin/app/kustomization.yaml b/kubernetes/apps/database/pgadmin/app/kustomization.yaml
similarity index 94%
rename from kubernetes/apps/default/pgadmin/app/kustomization.yaml
rename to kubernetes/apps/database/pgadmin/app/kustomization.yaml
index 48e972b27..5d04acddd 100644
--- a/kubernetes/apps/default/pgadmin/app/kustomization.yaml
+++ b/kubernetes/apps/database/pgadmin/app/kustomization.yaml
@@ -2,7 +2,6 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: default
 resources:
   - ./externalsecret.yaml
   - ./helmrelease.yaml
diff --git a/kubernetes/apps/default/pgadmin/ks.yaml b/kubernetes/apps/database/pgadmin/ks.yaml
similarity index 87%
rename from kubernetes/apps/default/pgadmin/ks.yaml
rename to kubernetes/apps/database/pgadmin/ks.yaml
index 5e5da8357..8da862207 100644
--- a/kubernetes/apps/default/pgadmin/ks.yaml
+++ b/kubernetes/apps/database/pgadmin/ks.yaml
@@ -6,11 +6,11 @@ metadata:
   name: &app pgadmin
   namespace: flux-system
 spec:
-  targetNamespace: default
+  targetNamespace: database
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/default/pgadmin/app
+  path: ./kubernetes/apps/database/pgadmin/app
   prune: true
   sourceRef:
     kind: GitRepository
@@ -28,4 +28,4 @@ spec:
       APP: *app
       VOLSYNC_CAPACITY: 2Gi
       VOLSYNC_UID: "5050"
-      VOLSYNC_GID: "5050"
+      VOLSYNC_GID: "0"
diff --git a/kubernetes/apps/default/kustomization.yaml b/kubernetes/apps/default/kustomization.yaml
index 26bd15890..230a45792 100644
--- a/kubernetes/apps/default/kustomization.yaml
+++ b/kubernetes/apps/default/kustomization.yaml
@@ -39,7 +39,6 @@ resources:
   - ./outline/ks.yaml
   - ./paperless/ks.yaml
   - ./plant-it/ks.yaml
-  - ./pgadmin/ks.yaml
   - ./prowlarr/ks.yaml
   - ./qbittorrent/ks.yaml
   - ./radarr/ks.yaml