diff --git a/dev/defectdojo/yaml/defectdojo.yaml b/dev/defectdojo/yaml/defectdojo.yaml
index c42c0b4..f26ad99 100644
--- a/dev/defectdojo/yaml/defectdojo.yaml
+++ b/dev/defectdojo/yaml/defectdojo.yaml
@@ -40,6 +40,24 @@ spec:
             claimName: defectdojo-media-pvc
 ---
 apiVersion: v1
+kind: Service
+metadata:
+  name: nginx
+  namespace: defectdojo
+spec:
+  ports:
+    - name: "8080"
+      port: 8080
+      targetPort: 8080
+    - name: "8443"
+      port: 8443
+      targetPort: 8443
+  selector:
+    io.kompose.service: nginx
+status:
+  loadBalancer: {}
+---
+apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: defectdojo-media-pvc
@@ -73,26 +91,6 @@ spec:
     path: /mnt/nfs_share/defectdojo/media
     readOnly: false
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: nginx
-  name: nginx
-  namespace: defectdojo
-spec:
-  ports:
-    - name: "8080"
-      port: 8080
-      targetPort: 8080
-    - name: "8443"
-      port: 8443
-      targetPort: 8443
-  selector:
-    io.kompose.service: nginx
-status:
-  loadBalancer: {}
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -145,39 +143,21 @@ spec:
           resources: {}
           volumeMounts:
             - mountPath: /app/docker/extra_settings
-              name: uwsgi-claim0
+              name: defectdojo-uwsgi
             - mountPath: /app/media
               name: defectdojo-media
       restartPolicy: Always
       volumes:
-        - name: uwsgi-claim0
+        - name: defectdojo-uwsgi
           persistentVolumeClaim:
-            claimName: uwsgi-claim0
+            claimName: defectdojo-uwsgi-pvc
         - name: defectdojo-media
           persistentVolumeClaim:
             claimName: defectdojo-media-pvc
 ---
 apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: uwsgi-claim0
-  name: uwsgi-claim0
-  namespace: defectdojo
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 100Mi
-status: {}
----
-apiVersion: v1
 kind: Service
 metadata:
-  labels:
-    io.kompose.service: uwsgi
   name: uwsgi
   namespace: defectdojo
 spec:
@@ -190,6 +170,40 @@ spec:
 status:
   loadBalancer: {}
 ---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: defectdojo-uwsgi-pvc
+  namespace: defectdojo
+spec:
+  storageClassName: ""
+  volumeName: defectdojo-uwsgi-pv
+  accessModes:
+    - ReadWriteOnce
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 2Gi
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: defectdojo-uwsgi-pv
+spec:
+  storageClassName: ""
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nfsvers=4.1
+  nfs:
+    server: 192.168.2.110
+    path: /mnt/nfs_share/defectdojo/uwsgi
+    readOnly: false
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -234,34 +248,51 @@ spec:
           resources: {}
           volumeMounts:
             - mountPath: /app/docker/extra_settings
-              name: celeryworker-claim0
+              name: defectdojo-celeryworker
             - mountPath: /app/media
               name: defectdojo-media
       restartPolicy: Always
       volumes:
-        - name: celeryworker-claim0
+        - name: defectdojo-celeryworker
           persistentVolumeClaim:
-            claimName: celeryworker-claim0
+            claimName: defectdojo-celeryworker-pvc
         - name: defectdojo-media
           persistentVolumeClaim:
             claimName: defectdojo-media-pvc
-status: {}
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: celeryworker-claim0
-  name: celeryworker-claim0
+  name: defectdojo-celeryworker-pvc
   namespace: defectdojo
 spec:
+  storageClassName: ""
+  volumeName: defectdojo-celeryworker-pv
   accessModes:
     - ReadWriteOnce
+  volumeMode: Filesystem
   resources:
     requests:
-      storage: 100Mi
-status: {}
+      storage: 2Gi
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: defectdojo-celeryworker-pv
+spec:
+  storageClassName: ""
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nfsvers=4.1
+  nfs:
+    server: 192.168.2.110
+    path: /mnt/nfs_share/defectdojo/celeryworker
+    readOnly: false
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -307,26 +338,46 @@ spec:
           resources: {}
           volumeMounts:
             - mountPath: /app/docker/extra_settings
-              name: celerybeat-claim0
+              name: defectdojo-celerybeat
       restartPolicy: Always
       volumes:
-        - name: celerybeat-claim0
+        - name: defectdojo-celerybeat
           persistentVolumeClaim:
-            claimName: celerybeat-claim0
+            claimName: defectdojo-celerybeat-pvc
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  labels:
-    io.kompose.service: celerybeat-claim0
-  name: celerybeat-claim0
+  name: defectdojo-celerybeat-pvc
   namespace: defectdojo
 spec:
+  storageClassName: ""
+  volumeName: defectdojo-celerybeat-pv
   accessModes:
     - ReadWriteOnce
+  volumeMode: Filesystem
   resources:
     requests:
-      storage: 100Mi
+      storage: 2Gi
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: defectdojo-celerybeat-pv
+spec:
+  storageClassName: ""
+  capacity:
+    storage: 2Gi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - hard
+    - nfsvers=4.1
+  nfs:
+    server: 192.168.2.110
+    path: /mnt/nfs_share/defectdojo/celerybeat
+    readOnly: false
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -351,14 +402,29 @@ spec:
         - image: redis:7.2.4-alpine@sha256:a40e29800d387e3cf9431902e1e7a362e4d819233d68ae39380532c3310091ac
           name: redis
           resources: {}
-#          volumeMounts:
-#            - mountPath: /data
-#              name: defectdojo-redis
+          volumeMounts:
+            - mountPath: /data
+              name: defectdojo-redis
       restartPolicy: Always
-#      volumes:
-#        - name: defectdojo-redis
-#          persistentVolumeClaim:
-#            claimName: defectdojo-redis-pvc
+      volumes:
+        - name: defectdojo-redis
+          persistentVolumeClaim:
+            claimName: defectdojo-redis-pvc
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis
+  namespace: defectdojo
+spec:
+  ports:
+    - name: "6379"
+      port: 6379
+      targetPort: 6379
+  selector:
+    io.kompose.service: redis
+status:
+  loadBalancer: {}
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -366,11 +432,14 @@ metadata:
   name: defectdojo-redis-pvc
   namespace: defectdojo
 spec:
+  storageClassName: ""
+  volumeName: defectdojo-redis-pv
   accessModes:
     - ReadWriteOnce
+  volumeMode: Filesystem
   resources:
     requests:
-      storage: 1Gi
+      storage: 2Gi
 ---
 apiVersion: v1
 kind: PersistentVolume
@@ -390,21 +459,3 @@ spec:
     server: 192.168.2.110
     path: /mnt/nfs_share/defectdojo/redis
     readOnly: false
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: redis
-  name: redis
-  namespace: defectdojo
-spec:
-  ports:
-    - name: "6379"
-      port: 6379
-      targetPort: 6379
-  selector:
-    io.kompose.service: redis
-status:
-  loadBalancer: {}
-