diff --git a/dev/argocd/argocd-notifications-cm.yaml b/dev/argocd/argocd-notifications-cm.yaml
index 511ac55..3fb4a1b 100644
--- a/dev/argocd/argocd-notifications-cm.yaml
+++ b/dev/argocd/argocd-notifications-cm.yaml
@@ -13,7 +13,7 @@ data:
   context: |
     argocdUrl: https://argocd-dev.allarddcs.nl
 
-  service.email.smtp: |
+  service.email: |
     host: mail.allarddcs.nl
     port: 587
     from: argocd@allarddcs.nl
@@ -36,5 +36,6 @@ data:
 
   subscriptions: |
     - recipients:
-        - admin@allarddcs.nl
+        - email:admin@allarddcs.nl
       triggers:
+        - on-sync-failed
diff --git a/dev/argocd/pvc.yaml b/dev/argocd/pvc.yaml
new file mode 100644
index 0000000..de8d25e
--- /dev/null
+++ b/dev/argocd/pvc.yaml
@@ -0,0 +1,31 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: argo-cd-pv
+  labels:
+    type: local
+spec:
+  storageClassName: ""
+  capacity:
+    storage: 1Gi
+  accessModes:
+    - ReadWriteMany
+  nfs:
+    server: 192.168.2.110
+    path: /mnt/nfs_share/argo-cd/dev
+    readOnly: false
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: argo-cd-pvc
+  namespace: argocd
+spec:
+  storageClassName: ""
+  volumeName: argo-cd-pv
+  accessModes:
+    - ReadWriteMany
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 1Gi
diff --git a/dev/argocd/values.yaml b/dev/argocd/values.yaml
index 1cf1b8e..41a51db 100644
--- a/dev/argocd/values.yaml
+++ b/dev/argocd/values.yaml
@@ -27,10 +27,18 @@ ingress:
         jsonPointers:
           - /metadata/annotations/argocd.argoproj.io~1tracking-id
 
+applicationController:
+  persistence:
+    enabled: true
+    existingClaim: argocd-pvc
+
 server:
   tls:
     enabled: true
     secretName: argocd-tls-cert
+  persistence:
+    enabled: true
+    existingClaim: argocd-pvc
 
 repoServer:
   extraArgs:
@@ -48,34 +56,21 @@ repoServer:
     timeoutSeconds: 2
     failureThreshold: 10
 
+  persistence:
+    enabled: true
+    existingClaim: argocd-pvc
+
 notifications:
-  enabled: true
-  name: notifications-controller
-  # Context available in templates
-  context:
-    argocdUrl: "https://argocd-dev.allarddcs.nl"
 
-  # Secret for SMTP credentials
-  secret:
-    create: true
-    name: argocd-notifications-secret
-    items:
-      email-username: "argocd@allarddcs.nl"
-      email-password: "Argocd01@"
+  notifiers:
+    service.email: |
+      host: mail.allarddcs.nl
+      port: 587
+      from: argocd@allarddcs.nl
+      username: argocd@allarddcs.nl
+      password: Argocd01@
+      starttls: true
 
-  # ConfigMap used by notifications-controller
-  cm:
-    create: false
-    extra:
-      service.email.smtp: |
-        host: mail.allarddcs.nl
-        port: 587
-        from: argocd@allarddcs.nl
-        username: argocd@allarddcs.nl
-        password: Argocd01@
-        starttls: true
-
-  # Templates
   templates:
     app-sync-failed: |
       email:
@@ -85,16 +80,18 @@ notifications:
         Error: {{.app.status.operationState.message}}
         More details: {{.context.argocdUrl}}/applications/{{.app.metadata.name}}?operation=true
 
-  # Triggers
   triggers:
-    on-sync-failed: |
+    trigger.on-sync-failed: |
       - description: Application syncing has failed
-        send: [app-sync-failed]
+        send:
+        - app-sync-failed
         when: app.status.operationState != nil and app.status.operationState.phase in ['Error','Failed']
 
-  # Subscriptions
   subscriptions:
     - recipients:
-        - admin@allarddcs.nl
+        - email:admin@allarddcs.nl
       triggers:
         - on-sync-failed
+
+  context:
+    argocdUrl: https://argocd-dev.allarddcs.nl
diff --git a/dev/deptrack/README.md b/dev/deptrack2/README.md
similarity index 100%
rename from dev/deptrack/README.md
rename to dev/deptrack2/README.md
diff --git a/dev/deptrack/deptrack.old b/dev/deptrack2/deptrack.old
similarity index 100%
rename from dev/deptrack/deptrack.old
rename to dev/deptrack2/deptrack.old
diff --git a/dev/deptrack/deptrack.yaml b/dev/deptrack2/deptrack.yaml
similarity index 100%
rename from dev/deptrack/deptrack.yaml
rename to dev/deptrack2/deptrack.yaml
diff --git a/dev/postgres16/postgres16.yaml b/dev/postgres16/postgres16.yaml
index ff24352..85c6bf4 100755
--- a/dev/postgres16/postgres16.yaml
+++ b/dev/postgres16/postgres16.yaml
@@ -27,7 +27,7 @@ spec:
         - name: POSTGRES_PASSWORD
           value: defectdojo
         - name: PGOPTIONS
-          value: "-c max_connections=200"
+          value: "-c max_connections=1000"
         volumeMounts:
         - mountPath: /var/lib/postgresql/data
           name: postgres