diff --git a/src/main/resources/taiga/donotapply/changes-made.md b/src/main/resources/taiga/donotapply/changes-made.md
index e69de29..67efa8b 100644
--- a/src/main/resources/taiga/donotapply/changes-made.md
+++ b/src/main/resources/taiga/donotapply/changes-made.md
@@ -0,0 +1,13 @@
+Comment EVENTS_PUSH_BACKEND_URL in taiga-events-deployment
+Indent name fields in envFrom field in taiga-back-deployment
+Remove indentation from name field in taiga-gateway-deployment
+Switch name and mountPath field positions in taiga-gateway-deployment
+Change postres to 1Gi in pvc.yaml
+b64 encoded values in *-secret.yaml
+Change integers to strings in env vars in deployments and configmaps
+Change bools to strings in env vars in deployments and configmaps
+Increase storage to 8Gi in pvc.yaml
+Change storageClassName to local-path in pvc.yaml
+Correct volume names in async, back, gateway
+Use service name as address in taiga-gateway-configmap.yaml
+Correct reference to taiga-configmap and taiga-secret in taiga-back-deployment
\ No newline at end of file
diff --git a/src/main/resources/taiga/persistent-volume.yaml b/src/main/resources/taiga/persistent-volume.yaml
index acc9b9d..d811805 100644
--- a/src/main/resources/taiga/persistent-volume.yaml
+++ b/src/main/resources/taiga/persistent-volume.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     type: local
 spec:
-  storageClassName: manual
+  storageClassName: local-path
   accessModes:
     - ReadWriteOnce
   capacity:
diff --git a/src/main/resources/taiga/pvc.yaml b/src/main/resources/taiga/pvc.yaml
index 785d8f9..5f8ab88 100644
--- a/src/main/resources/taiga/pvc.yaml
+++ b/src/main/resources/taiga/pvc.yaml
@@ -5,9 +5,9 @@ metadata:
   labels:
     app: postgres
 spec:
-  storageClassName: postgres
+  storageClassName: local-path
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
-      storage: postgres
\ No newline at end of file
+      storage: 8Gi
\ No newline at end of file
diff --git a/src/main/resources/taiga/secret.yaml b/src/main/resources/taiga/secret.yaml
index ebf2b69..8b368c4 100644
--- a/src/main/resources/taiga/secret.yaml
+++ b/src/main/resources/taiga/secret.yaml
@@ -4,5 +4,5 @@ metadata:
   name: postgres-secret
 type: Opaque
 data:
-  postgres-user: "psql-user"
-  postgres-password: "psql-pw"
+  postgres-user: "cHNxbC11c2Vy"
+  postgres-password: "ZGZnc2RoNDU2NzdzZGZnc2RmZw=="
diff --git a/src/main/resources/taiga/taiga-async-deployment.yaml b/src/main/resources/taiga/taiga-async-deployment.yaml
index 781508e..448ca4a 100644
--- a/src/main/resources/taiga/taiga-async-deployment.yaml
+++ b/src/main/resources/taiga/taiga-async-deployment.yaml
@@ -54,12 +54,12 @@ spec:
           - name: POSTGRES_HOST
             value: "postgresql-service"
           - name: POSTGRES_PORT
-            value: 5432
+            value: "5432"
 
       volumes:
         - name: taiga-static
           persistentVolumeClaim:
-            claimName: taiga-static
+            claimName: taiga-static-data
         - name: taiga-media
           persistentVolumeClaim:
-            claimName: taiga-media
+            claimName: taiga-media-data
diff --git a/src/main/resources/taiga/taiga-back-deployment.yaml b/src/main/resources/taiga/taiga-back-deployment.yaml
index e803734..36ff068 100644
--- a/src/main/resources/taiga/taiga-back-deployment.yaml
+++ b/src/main/resources/taiga/taiga-back-deployment.yaml
@@ -33,11 +33,11 @@ spec:
           readOnly: false
         envFrom:
         - configMapRef:
-          name: taiga-back-configmap
+            name: taiga-configmap
         - secretRef:
-          name: taiga-back-secret
+            name: taiga-secret
         - secretRef:
-          name: taiga-rabbitmq-secret
+            name: taiga-rabbitmq-secret
         env:
         - name: POSTGRES_USER # ToDo: Does taiga need a specific postgres version? Maybe test this
           valueFrom:
@@ -57,9 +57,9 @@ spec:
         - name: POSTGRES_HOST
           value: "postgresql-service"
         - name: POSTGRES_PORT
-          value: 5432
+          value: "5432"
         - name: CELERY_ENABLED
-          value: false
+          value: "false"
       containers:
       - name: taiga-back
         image: taigaio/taiga-back:latest 
@@ -100,12 +100,12 @@ spec:
         - name: POSTGRES_HOST
           value: "postgresql-service"
         - name: POSTGRES_PORT
-          value: 5432
+          value: "5432"
       
       volumes: # ToDo: Remove Volumes where not necessary
         - name: taiga-static
           persistentVolumeClaim:
-            claimName: taiga-static
+            claimName: taiga-static-data
         - name: taiga-media
           persistentVolumeClaim:
-            claimName: taiga-media
+            claimName: taiga-media-data
diff --git a/src/main/resources/taiga/taiga-configmap.yaml b/src/main/resources/taiga/taiga-configmap.yaml
index 8f97784..2a592e6 100644
--- a/src/main/resources/taiga/taiga-configmap.yaml
+++ b/src/main/resources/taiga/taiga-configmap.yaml
@@ -15,13 +15,13 @@ data:
   # Email settings.
   EMAIL_BACKEND: console # django.core.mail.backends.${EMAIL_BACKEND}.EmailBackend # ToDo move to code base
   DEFAULT_FROM_EMAIL: meissa@meissa.de
-  EMAIL_USE_TLS: false
-  EMAIL_USE_SSL: false
+  EMAIL_USE_TLS: "false"
+  EMAIL_USE_SSL: "false"
   EMAIL_HOST: smpt.meissa.de
-  EMAIL_PORT: 39
+  EMAIL_PORT: "39"
 
   # Telemetry settings
-  ENABLE_TELEMETRY: false
+  ENABLE_TELEMETRY: "false"
   # ...your customizations go here
 
   # Taiga Events Settings
diff --git a/src/main/resources/taiga/taiga-gateway-configmap.yaml b/src/main/resources/taiga/taiga-gateway-configmap.yaml
index 7ae184d..283d7c2 100644
--- a/src/main/resources/taiga/taiga-gateway-configmap.yaml
+++ b/src/main/resources/taiga/taiga-gateway-configmap.yaml
@@ -12,7 +12,7 @@ data:
 
         # Frontend
         location / {
-            proxy_pass http://taiga-front/;
+            proxy_pass http://taiga-front-service/;
             proxy_pass_header Server;
             proxy_set_header Host $http_host;
             proxy_redirect off;
@@ -22,7 +22,7 @@ data:
 
         # Api
         location /api {
-            proxy_pass http://taiga-back:8000/api;
+            proxy_pass http://taiga-back-service:8000/api;
             proxy_pass_header Server;
             proxy_set_header Host $http_host;
             proxy_redirect off;
@@ -32,7 +32,7 @@ data:
 
         # Admin
         location /admin {
-            proxy_pass http://taiga-back:8000/admin;
+            proxy_pass http://taiga-back-service:8000/admin;
             proxy_pass_header Server;
             proxy_set_header Host $http_host;
             proxy_redirect off;
@@ -64,13 +64,13 @@ data:
             proxy_set_header X-Scheme $scheme;
             proxy_set_header X-Forwarded-Proto $scheme;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_pass http://taiga-protected:8003/;
+            proxy_pass http://taiga-protected-service:8003/;
             proxy_redirect off;
         }
 
         # Events
         location /events {
-            proxy_pass http://taiga-events:8888/events;
+            proxy_pass http://taiga-events-service:8888/events;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
diff --git a/src/main/resources/taiga/taiga-gateway-deployment.yaml b/src/main/resources/taiga/taiga-gateway-deployment.yaml
index 79e85f3..dd9ab83 100644
--- a/src/main/resources/taiga/taiga-gateway-deployment.yaml
+++ b/src/main/resources/taiga/taiga-gateway-deployment.yaml
@@ -24,8 +24,8 @@ spec:
         - name: http
           containerPort: 80
         volumeMounts:
-        - mountPath: /etc/nginx/conf.d
-              name: taiga-gateway-configmap
+        - name: taiga-gateway-configmap
+          mountPath: /etc/nginx/conf.d          
         - name: taiga-static
           mountPath: /taiga/static
           readOnly: false
@@ -39,7 +39,7 @@ spec:
             name: taiga-gateway-configmap
         - name: taiga-static
           persistentVolumeClaim:
-            claimName: taiga-static
+            claimName: taiga-static-data
         - name: taiga-media
           persistentVolumeClaim:
-            claimName: taiga-media
+            claimName: taiga-media-data
diff --git a/src/main/resources/taiga/taiga-protected-deployment.yaml b/src/main/resources/taiga/taiga-protected-deployment.yaml
index e660671..b4a74fc 100644
--- a/src/main/resources/taiga/taiga-protected-deployment.yaml
+++ b/src/main/resources/taiga/taiga-protected-deployment.yaml
@@ -24,7 +24,7 @@ spec:
           containerPort: 8003
         env:
         - name: MAX_AGE
-          value: 5
+          value: "5"
         - name: SECRET_KEY
           valueFrom:
             secretKeyRef:
diff --git a/src/main/resources/taiga/taiga-rabbitmq-secret.yaml b/src/main/resources/taiga/taiga-rabbitmq-secret.yaml
index 2f13a86..359ac2b 100644
--- a/src/main/resources/taiga/taiga-rabbitmq-secret.yaml
+++ b/src/main/resources/taiga/taiga-rabbitmq-secret.yaml
@@ -6,5 +6,5 @@ metadata:
     app.kubernetes.part-of: taiga
 data:
   # Rabbitmq settings
-  RABBITMQ_DEFAULT_USER: rabbit # ToDo: Evaluate if we need two different users and passes for rabbitmq
-  RABBITMQ_DEFAULT_PASS: rabbit_pass
+  RABBITMQ_DEFAULT_USER: cmFiYml0 # ToDo: Evaluate if we need two different users and passes for rabbitmq
+  RABBITMQ_DEFAULT_PASS: cmFiYml0X3Bhc3M=
diff --git a/src/main/resources/taiga/taiga-secret.yaml b/src/main/resources/taiga/taiga-secret.yaml
index 92ff7d3..a3968f7 100644
--- a/src/main/resources/taiga/taiga-secret.yaml
+++ b/src/main/resources/taiga/taiga-secret.yaml
@@ -7,16 +7,16 @@ metadata:
 data:
   
   # Taiga settings
-  TAIGA_SECRET_KEY: 59dsfgjsdf4jq3ßdfej345
+  TAIGA_SECRET_KEY: NTlkc2ZnanNkZjRqcTPDn2RmZWozNDU=
 
   # Email settings
-  EMAIL_HOST_USER: meissa@meissa.de
-  EMAIL_HOST_PASSWORD: asdfasdf
+  EMAIL_HOST_USER: bWVpc3NhQG1laXNzYS5kZQ==
+  EMAIL_HOST_PASSWORD: YXNkZmFzZGY=
 
   # Rabbitmq settings
-  RABBITMQ_USER: rabbit
-  RABBITMQ_PASS: rabbit_pass
+  RABBITMQ_USER: cmFiYml0
+  RABBITMQ_PASS: cmFiYml0X3Bhc3M=
 
   # Django settings  
-  DJANGO_SUPERUSER_TAIGAADMIN: taiga
-  DJANGO_SUPERUSER_PASSWORD: taiga_pass
+  DJANGO_SUPERUSER_TAIGAADMIN: dGFpZ2E=
+  DJANGO_SUPERUSER_PASSWORD: dGFpZ2FfcGFzcw==