diff --git a/manifest/overlays/production/kustomization.yaml b/manifest/overlays/production/kustomization.yaml
index 9b62234..b6ac283 100644
--- a/manifest/overlays/production/kustomization.yaml
+++ b/manifest/overlays/production/kustomization.yaml
@@ -24,3 +24,4 @@ resources:
   - ops-safe-vmcp.yaml
   - ops-safe-vmcp-ingress.yaml
   - k8s-registry.yaml
+  - toolhive-registry-postgres.yaml
diff --git a/manifest/overlays/production/toolhive-registry-postgres.yaml b/manifest/overlays/production/toolhive-registry-postgres.yaml
new file mode 100644
index 0000000..77f8981
--- /dev/null
+++ b/manifest/overlays/production/toolhive-registry-postgres.yaml
@@ -0,0 +1,27 @@
+apiVersion: postgresql.cnpg.io/v1
+kind: Cluster
+metadata:
+  name: toolhive-registry-postgres
+  namespace: toolhive-system
+spec:
+  instances: 2
+  storage:
+    storageClass: local-postgres
+    size: 8Gi
+  affinity:
+    enablePodAntiAffinity: true
+    podAntiAffinityType: required
+    topologyKey: topology.kubernetes.io/zone
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: minio-store
+  bootstrap:
+    initdb:
+      database: toolhive-registry
+      owner: toolhive-registry
+  postgresql:
+    parameters:
+      max_connections: "200"
+      shared_buffers: "256MB"