diff --git a/dev/apps/core-api.yaml b/dev/apps/core-api.yaml
index c10c843..52cb9ae 100644
--- a/dev/apps/core-api.yaml
+++ b/dev/apps/core-api.yaml
@@ -18,25 +18,12 @@ spec:
     spec:
       project: 'comissions.app'
       sources:
-        - repoURL: https://github.com/comissions-app/argocd.git
-          targetRevision: HEAD
-          path: charts/postgresql/
-          helm:
-            values: |
-             nameOverride : "comissions-app-db"
-              global:
-                postgresql:
-                  auth:
-                    username: "postgres"
-                    password: "postgres"
-                    database: "comissionsapp" 
-              postgresqlPassword:
         - repoURL: https://github.com/comissions-app/argocd.git
           targetRevision: HEAD
           path: charts/core-api
           helm:
             values: |
-              postgresHost: "comissions-app-db"
+              postgresHost: "postgres"
               postgresPort: 5432
               postgresUsername: "postgres"
               postgresPassword: "postgres"
diff --git a/dev/apps/postgres.yaml b/dev/apps/postgres.yaml
new file mode 100644
index 0000000..0110919
--- /dev/null
+++ b/dev/apps/postgres.yaml
@@ -0,0 +1,42 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: core-api
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - git:
+      repoURL: https://github.com/comissions-app/argocd.git
+      revision: HEAD
+      files:
+      - path: "dev/.config/config.json"
+  template:
+    metadata:
+      name: 'postgres'
+    spec:
+      project: 'comissions.app'
+      sources:
+        - repoURL: https://github.com/comissions-app/argocd.git
+          targetRevision: HEAD
+          path: charts/postgresql/
+          helm:
+            values: |
+             nameOverride : "comissions-app-db"
+              global:
+                postgresql:
+                  auth:
+                    username: "postgres"
+                    password: "postgres"
+                    database: "comissionsapp" 
+      destination:
+        server: 'https://kubernetes.default.svc'
+        namespace: 'argocd'
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true
+        syncOptions:
+          - ApplyOutOfSyncOnly=true
+          - CreateNamespace=true