diff --git a/src/main/resources/backup/backup-restore-deployment.yaml b/src/main/resources/backup/backup-restore-deployment.yaml
index a187aad..5e52218 100644
--- a/src/main/resources/backup/backup-restore-deployment.yaml
+++ b/src/main/resources/backup/backup-restore-deployment.yaml
@@ -15,7 +15,7 @@ spec:
       labels:
         app: backup-restore
         app.kubernetes.io/name: backup-restore
-        app.kubernetes.io/part-of: taiga
+        app.kubernetes.io/part-of: c4k-taiga
     spec:
       containers:
       - image: domaindrivenarchitecture/c4k-taiga-backup
diff --git a/src/main/resources/backup/config.yaml b/src/main/resources/backup/config.yaml
index aaceaad..e5212f3 100644
--- a/src/main/resources/backup/config.yaml
+++ b/src/main/resources/backup/config.yaml
@@ -5,6 +5,6 @@ metadata:
   namespace: taiga
   labels:
     app.kubernetes.io/name: backup
-    app.kubernetes.io/part-of: taiga
+    app.kubernetes.io/part-of: c4k-taiga
 data:
   restic-repository: restic-repository
\ No newline at end of file
diff --git a/src/main/resources/backup/cron.yaml b/src/main/resources/backup/cron.yaml
index a450b2e..dfd0a20 100644
--- a/src/main/resources/backup/cron.yaml
+++ b/src/main/resources/backup/cron.yaml
@@ -4,7 +4,7 @@ metadata:
   name: taiga-backup
   namespace: taiga
   labels:
-    app.kubernetes.part-of: taiga
+    app.kubernetes.part-of: c4k-taiga
 spec:
   schedule: "10 23 * * *"
   successfulJobsHistoryLimit: 1
diff --git a/src/main/resources/taiga/async-rabbitmq-deployment.yaml b/src/main/resources/taiga/async-rabbitmq-deployment.yaml
index 67f20c6..223ea87 100644
--- a/src/main/resources/taiga/async-rabbitmq-deployment.yaml
+++ b/src/main/resources/taiga/async-rabbitmq-deployment.yaml
@@ -48,7 +48,6 @@ spec:
             configMapKeyRef:
               name: taiga-configmap
               key: RABBITMQ_DEFAULT_VHOST
-      
       volumes:
         - name: taiga-async-rabbitmq-data
           persistentVolumeClaim:
diff --git a/src/main/resources/taiga/configmap.yaml b/src/main/resources/taiga/configmap.yaml
index 03fc1bd..b9cfffc 100644
--- a/src/main/resources/taiga/configmap.yaml
+++ b/src/main/resources/taiga/configmap.yaml
@@ -3,6 +3,8 @@ kind: ConfigMap
 metadata:
   name: taiga-configmap
   namespace: taiga
+  labels:
+    app.kubernetes.part-of: c4k-taiga
 data:
   # These environment variables will be used by taiga-back and taiga-async.
   # Database settings handled in deployment
diff --git a/src/main/resources/taiga/events-rabbitmq-deployment.yaml b/src/main/resources/taiga/events-rabbitmq-deployment.yaml
index 3c52d75..0cb11a4 100644
--- a/src/main/resources/taiga/events-rabbitmq-deployment.yaml
+++ b/src/main/resources/taiga/events-rabbitmq-deployment.yaml
@@ -48,7 +48,6 @@ spec:
             secretKeyRef:
               name: taiga-secret
               key: RABBITMQ_PASS
-      
       volumes:
         - name: taiga-events-rabbitmq-data
           persistentVolumeClaim:
diff --git a/src/main/resources/taiga/gateway-configmap.yaml b/src/main/resources/taiga/gateway-configmap.yaml
index a5b1483..2ac3df1 100644
--- a/src/main/resources/taiga/gateway-configmap.yaml
+++ b/src/main/resources/taiga/gateway-configmap.yaml
@@ -3,6 +3,8 @@ kind: ConfigMap
 metadata:
   name: taiga-gateway-configmap
   namespace: taiga
+  labels:
+    app.kubernetes.part-of: c4k-taiga
 data:
   default.conf: |
     server {
diff --git a/src/main/resources/taiga/gateway-deployment.yaml b/src/main/resources/taiga/gateway-deployment.yaml
index c8abe80..f776852 100644
--- a/src/main/resources/taiga/gateway-deployment.yaml
+++ b/src/main/resources/taiga/gateway-deployment.yaml
@@ -34,7 +34,6 @@ spec:
         - name: taiga-media
           mountPath: /taiga/media
           readOnly: false
-
       volumes: 
         - name: taiga-gateway-configmap
           configMap:
diff --git a/src/main/resources/taiga/pvc-taiga-media-data.yaml b/src/main/resources/taiga/pvc-taiga-media-data.yaml
index e67748e..f1016b5 100644
--- a/src/main/resources/taiga/pvc-taiga-media-data.yaml
+++ b/src/main/resources/taiga/pvc-taiga-media-data.yaml
@@ -4,8 +4,7 @@ metadata:
   name: taiga-media-data
   namespace: taiga
   labels:
-    app: taiga
-    app.kubernetes.part-of: taiga
+    app.kubernetes.part-of: c4k-taiga
 spec:
   storageClassName: REPLACEME
   accessModes:
diff --git a/src/main/resources/taiga/pvc-taiga-static-data.yaml b/src/main/resources/taiga/pvc-taiga-static-data.yaml
index f315d4d..e22fe36 100644
--- a/src/main/resources/taiga/pvc-taiga-static-data.yaml
+++ b/src/main/resources/taiga/pvc-taiga-static-data.yaml
@@ -4,8 +4,7 @@ metadata:
   name: taiga-static-data
   namespace: taiga
   labels:
-    app: taiga
-    app.kubernetes.part-of: taiga
+    app.kubernetes.part-of: c4k-taiga
 spec:
   storageClassName: REPLACEME
   accessModes:
diff --git a/src/main/resources/taiga/rabbitmq-pvc-async.yaml b/src/main/resources/taiga/rabbitmq-pvc-async.yaml
index a0aa7cf..4399536 100644
--- a/src/main/resources/taiga/rabbitmq-pvc-async.yaml
+++ b/src/main/resources/taiga/rabbitmq-pvc-async.yaml
@@ -4,8 +4,7 @@ metadata:
   name: taiga-async-rabbitmq-data
   namespace: taiga
   labels:
-    app: taiga
-    app.kubernetes.part-of: taiga
+    app.kubernetes.part-of: c4k-taiga
 spec:
   storageClassName: REPLACEME
   accessModes:
diff --git a/src/main/resources/taiga/rabbitmq-pvc-events.yaml b/src/main/resources/taiga/rabbitmq-pvc-events.yaml
index 0ece03d..32c6937 100644
--- a/src/main/resources/taiga/rabbitmq-pvc-events.yaml
+++ b/src/main/resources/taiga/rabbitmq-pvc-events.yaml
@@ -4,8 +4,7 @@ metadata:
   name: taiga-events-rabbitmq-data
   namespace: taiga
   labels:
-    app: taiga
-    app.kubernetes.part-of: taiga
+    app.kubernetes.part-of: c4k-taiga
 spec:
   storageClassName: REPLACEME
   accessModes:
diff --git a/src/main/resources/taiga/secret.yaml b/src/main/resources/taiga/secret.yaml
index 22dfdb2..97de34c 100644
--- a/src/main/resources/taiga/secret.yaml
+++ b/src/main/resources/taiga/secret.yaml
@@ -4,7 +4,7 @@ metadata:
   name: taiga-secret
   namespace: taiga
   labels:
-    app.kubernetes.part-of: taiga
+    app.kubernetes.part-of: c4k-taiga
 data:
   # Taiga settings
   TAIGA_SECRET_KEY: TAIGA_SECRET_KEY
diff --git a/src/test/cljc/dda/c4k_taiga/backup_test.cljc b/src/test/cljc/dda/c4k_taiga/backup_test.cljc
index 9769c78..f6f3668 100644
--- a/src/test/cljc/dda/c4k_taiga/backup_test.cljc
+++ b/src/test/cljc/dda/c4k_taiga/backup_test.cljc
@@ -15,7 +15,7 @@
           :metadata {:name "backup-config"
                      :namespace "taiga"
                      :labels {:app.kubernetes.io/name "backup"
-                              :app.kubernetes.io/part-of "taiga"}}
+                              :app.kubernetes.io/part-of "c4k-taiga"}}
           :data
           {:restic-repository "s3:restic-repository"}}
          (cut/generate-config {:restic-repository "s3:restic-repository"}))))
diff --git a/src/test/cljc/dda/c4k_taiga/core_test.cljc b/src/test/cljc/dda/c4k_taiga/core_test.cljc
index 0913f98..b3f3ca9 100644
--- a/src/test/cljc/dda/c4k_taiga/core_test.cljc
+++ b/src/test/cljc/dda/c4k_taiga/core_test.cljc
@@ -14,3 +14,14 @@
 (deftest validate-valid-resources
   (is (s/valid? cut/config? (yaml/load-as-edn "taiga-test/valid-config.yaml")))
   (is (s/valid? cut/auth? (yaml/load-as-edn "taiga-test/valid-auth.yaml"))))
+
+(deftest test-whole-generation 
+  (is (= 49
+         (count 
+          (cut/config-objects 
+           (yaml/load-as-edn "taiga-test/valid-config.yaml")))))
+  (is (= 4
+         (count
+          (cut/auth-objects 
+           (yaml/load-as-edn "taiga-test/valid-config.yaml")
+           (yaml/load-as-edn "taiga-test/valid-auth.yaml"))))))
diff --git a/src/test/cljc/dda/c4k_taiga/taiga_test.cljc b/src/test/cljc/dda/c4k_taiga/taiga_test.cljc
index 08fbab4..874b55c 100644
--- a/src/test/cljc/dda/c4k_taiga/taiga_test.cljc
+++ b/src/test/cljc/dda/c4k_taiga/taiga_test.cljc
@@ -20,7 +20,9 @@
 (deftest should-generate-configmap
   (is (= {:apiVersion "v1",
           :kind "ConfigMap",
-          :metadata {:name "taiga-configmap", :namespace "taiga"},
+          :metadata 
+          {:name "taiga-configmap", :namespace "taiga"
+           :labels {:app.kubernetes.part-of "c4k-taiga"}},
           :data
           {:ENABLE_TELEMETRY "false",
            :TAIGA_SITES_SCHEME "https",
@@ -43,7 +45,7 @@
           :metadata
           {:name "taiga-media-data",
            :namespace "taiga"
-           :labels {:app "taiga", :app.kubernetes.part-of "taiga"}},
+           :labels {:app.kubernetes.part-of "c4k-taiga"}},
           :spec
           {:storageClassName "local-path",
            :accessModes ["ReadWriteOnce"],
@@ -54,7 +56,7 @@
           :metadata
           {:name "taiga-static-data",
            :namespace "taiga"
-           :labels {:app "taiga", :app.kubernetes.part-of "taiga"}},
+           :labels {:app.kubernetes.part-of "c4k-taiga"}},
           :spec
           {:storageClassName "local-path",
            :accessModes ["ReadWriteOnce"],
@@ -67,7 +69,7 @@
           :metadata
           {:name "taiga-async-rabbitmq-data",
            :namespace "taiga"
-           :labels {:app "taiga", :app.kubernetes.part-of "taiga"}},
+           :labels {:app.kubernetes.part-of "c4k-taiga"}},
           :spec
           {:storageClassName "local-path",
            :accessModes ["ReadWriteOnce"],
@@ -80,7 +82,7 @@
           :metadata
           {:name "taiga-events-rabbitmq-data",
            :namespace "taiga"
-           :labels {:app "taiga", :app.kubernetes.part-of "taiga"}},
+           :labels {:app.kubernetes.part-of "c4k-taiga"}},
           :spec
           {:storageClassName "local-path",
            :accessModes ["ReadWriteOnce"],
@@ -91,7 +93,7 @@
   (is (= {:apiVersion "v1",
           :kind "Secret",
           :metadata
-          {:name "taiga-secret", :namespace "taiga" :labels {:app.kubernetes.part-of "taiga"}},
+          {:name "taiga-secret", :namespace "taiga" :labels {:app.kubernetes.part-of "c4k-taiga"}},
           :data
           {:TAIGA_SECRET_KEY "c29tZS1rZXk=",
            :EMAIL_HOST_USER "bWFpbGVyLXVzZXI=",