diff --git a/ops/chart/templates/postgresql.yaml b/ops/chart/templates/postgresql.yaml
deleted file mode 100644
index 7e40a4d..0000000
--- a/ops/chart/templates/postgresql.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{- /*
-Policy Service PostgreSQL Cluster using CNPG
-*/ -}}
-{{- if .Values.postgresql.enabled -}}
-apiVersion: postgresql.cnpg.io/v1
-kind: Cluster
-metadata:
-  name: {{ include "bjw-s.common.lib.chart.names.fullname" . }}-pg
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "bjw-s.common.lib.chart.names.labels" . | nindent 4 }}
-spec:
-  description: "PostgreSQL cluster for {{ .Release.Name }}"
-  imageName: {{ .Values.postgresql.image | default "ghcr.io/cloudnative-pg/container-image:1.23.1" }}
-  instances: {{ .Values.postgresql.instances | default 1 }}
-  
-  bootstrap:
-    initdb:
-      database: {{ .Values.postgresql.database | default "policy_service" }}
-      owner: {{ .Values.postgresql.owner | default "policy_service" }}
-  
-  users:
-    - name: {{ .Values.postgresql.appUsername | default "policy_service" }}
-      database: {{ .Values.postgresql.database | default "policy_service" }}
-  
-  storage:
-    size: {{ .Values.postgresql.storageSize | default "1Gi" }}
-  
-  resources:
-    requests:
-      cpu: {{ .Values.postgresql.resources.requests.cpu | default "100m" }}
-      memory: {{ .Values.postgresql.resources.requests.memory | default "128Mi" }}
-    limits:
-      cpu: {{ .Values.postgresql.resources.limits.cpu | default "500m" }}
-      memory: {{ .Values.postgresql.resources.limits.memory | default "512Mi" }}
-  
-  monitoring:
-    enablePodMonitoring: true
-{{- end -}}
\ No newline at end of file
diff --git a/ops/chart/values.yaml b/ops/chart/values.yaml
index 6056cd6..0bb3503 100644
--- a/ops/chart/values.yaml
+++ b/ops/chart/values.yaml
@@ -87,18 +87,35 @@ ingress:
               identifier: main
               port: http
 
-postgresql:
-  enabled: true
-  image: ghcr.io/cloudnative-pg/container-image:1.23.1
-  instances: 1
-  database: policy_service
-  owner: policy_service
-  appUsername: policy_service
-  storageSize: 1Gi
-  resources:
-    requests:
-      cpu: 100m
-      memory: 128Mi
-    limits:
-      cpu: 500m
-      memory: 512Mi
\ No newline at end of file
+# PostgreSQL Cluster - managed externally via CNPG operator
+# The secret policy-service-pg-app will be created by CNPG
+rawResources:
+  postgresql:
+    enabled: true
+    apiVersion: postgresql.cnpg.io/v1
+    kind: Cluster
+    labels:
+      app.kubernetes.io/name: policy-service
+      app.kubernetes.io/instance: policy-service
+    spec:
+      description: "PostgreSQL cluster for policy-service"
+      imageName: ghcr.io/cloudnative-pg/container-image:1.23.1
+      instances: 1
+      bootstrap:
+        initdb:
+          database: policy_service
+          owner: policy_service
+      users:
+        - name: policy_service
+          database: policy_service
+      storage:
+        size: 1Gi
+      resources:
+        requests:
+          cpu: 100m
+          memory: 128Mi
+        limits:
+          cpu: 500m
+          memory: 512Mi
+      monitoring:
+        enablePodMonitoring: true