diff --git a/apps/matrix-postgresql/service/service.yaml b/apps/matrix-postgresql/service/service.yaml
index 72620af..2a0f87f 100644
--- a/apps/matrix-postgresql/service/service.yaml
+++ b/apps/matrix-postgresql/service/service.yaml
@@ -11,5 +11,6 @@ spec:
       protocol: TCP
       targetPort: 5432
   selector:
-    cnpg.io/cluster: matrix-cnpg
-    cnpg.io/instanceRole: primary
+    app.kubernetes.io/component: primary
+    app.kubernetes.io/instance: postgresql
+    app.kubernetes.io/name: postgresql
diff --git a/bootstrap/matrix-postgresql.yaml b/bootstrap/matrix-postgresql.yaml
index 33aa585..73bf910 100644
--- a/bootstrap/matrix-postgresql.yaml
+++ b/bootstrap/matrix-postgresql.yaml
@@ -14,4 +14,6 @@ spec:
     namespace: matrix
   syncPolicy:
     automated:
-      enabled: false
+      enabled: true
+      prune: true
+      selfHeal: true