diff --git a/src/main/resources/taiga/taiga-async-deployment.yaml b/src/main/resources/taiga/taiga-async-deployment.yaml
index 8e4a0c4..201ec0d 100644
--- a/src/main/resources/taiga/taiga-async-deployment.yaml
+++ b/src/main/resources/taiga/taiga-async-deployment.yaml
@@ -31,7 +31,7 @@ spec:
           readOnly: false
         envFrom:
         - configMapRef:
-            name: taiga-back-configmap
+            name: taiga-configmap
         - secretRef:
             name: taiga-back-secret
         - secretRef:
diff --git a/src/main/resources/taiga/taiga-back-deployment.yaml b/src/main/resources/taiga/taiga-back-deployment.yaml
index 2afb431..dd6bc81 100644
--- a/src/main/resources/taiga/taiga-back-deployment.yaml
+++ b/src/main/resources/taiga/taiga-back-deployment.yaml
@@ -78,7 +78,7 @@ spec:
           readOnly: false
         envFrom:
         - configMapRef:
-            name: taiga-back-configmap # ToDo: Update configmap name
+            name: taiga-configmap
         - secretRef:
             name: taiga-back-secret
         - secretRef:
diff --git a/src/main/resources/taiga/taiga-back-secret.yaml b/src/main/resources/taiga/taiga-back-secret.yaml
index 902f3fa..097316b 100644
--- a/src/main/resources/taiga/taiga-back-secret.yaml
+++ b/src/main/resources/taiga/taiga-back-secret.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: taiga-back-secret
+  name: taiga-back-secret # ToDo: rename to taiga-secret
   labels:
     app.kubernetes.part-of: taiga
 data:
diff --git a/src/main/resources/taiga/taiga-events-deployment.yaml b/src/main/resources/taiga/taiga-events-deployment.yaml
index 38368a5..35acb97 100644
--- a/src/main/resources/taiga/taiga-events-deployment.yaml
+++ b/src/main/resources/taiga/taiga-events-deployment.yaml
@@ -23,7 +23,7 @@ spec:
           containerPort: 8888
         envFrom: # ToDo: check if all vars are needed
         - configMapRef:
-          name: taiga-back-configmap
+          name: taiga-configmap
         - secretRef:
           name: taiga-back-secret
         - secretRef: