diff --git a/src/main/cljc/dda/c4k_taiga/core.cljc b/src/main/cljc/dda/c4k_taiga/core.cljc
index baa529d..f4f5b61 100644
--- a/src/main/cljc/dda/c4k_taiga/core.cljc
+++ b/src/main/cljc/dda/c4k_taiga/core.cljc
@@ -29,14 +29,14 @@
                                    :pvc-storage-class-name default-storage-class})
            (postgres/generate-deployment)
            (postgres/generate-service)
-           ; TODO: Add configuration and authentication to relevant calls
            (taiga/generate-async-rabbitmq-deployment)
            (taiga/generate-async-rabbitmq-service)
            (taiga/generate-async-service)
            (taiga/generate-back-deployment)
            (taiga/generate-back-service)
-           (taiga/generate-configmap)
-           (taiga/generate-data-pvcs)
+           (taiga/generate-configmap config)
+           (taiga/generate-pvc-taiga-media-data config)
+           (taiga/generate-pvc-taiga-static-data config)
            (taiga/generate-events-deployment)
            (taiga/generate-events-rabbitmq-deployment)
            (taiga/generate-events-rabbitmq-service)
@@ -48,8 +48,9 @@
            (taiga/generate-gateway-service)
            (taiga/generate-protected-deployment)
            (taiga/generate-protected-service)
-           (taiga/generate-rabbitmq-pvc)
-           (taiga/generate-secret)]
-          (taiga/generate-ingress-and-cert)
+           (taiga/generate-rabbitmq-pvc-async config)
+           (taiga/generate-rabbitmq-pvc-events config)
+           (taiga/generate-secret auth)]
+          (taiga/generate-ingress-and-cert config)
           (when (:contains? config :mon-cfg)
             (mon/generate (:mon-cfg config) (:mon-auth auth))))))))