diff --git a/fast/extras/0-cicd-gitlab/main.tf b/fast/extras/0-cicd-gitlab/main.tf
index df23cb95a..76326a564 100644
--- a/fast/extras/0-cicd-gitlab/main.tf
+++ b/fast/extras/0-cicd-gitlab/main.tf
@@ -28,6 +28,8 @@ locals {
         ] : []),
         [for f in fileset(path.module, "${v.populate_from}/*.tf") : f],
         [for f in fileset(path.module, "${v.populate_from}/templates/*.tpl") : f],
+        [for f in fileset(path.module, "${v.populate_from}/templates/*.yaml") : f],
+        [for f in fileset(path.module, "${v.populate_from}/schemas/*.json") : f],
         [for f in fileset(path.module, "${v.populate_from}/terraform.tfvars") : f]
         ) : {
         project = k
@@ -61,7 +63,7 @@ locals {
       for k in local._repository_files :
       "${k.project}/${k.name}" => k
       if !endswith(k.name, ".tf") || (
-        !startswith(k.name, "0") && k.name != "globals.tf"
+        !startswith(k.name, "0") && !startswith(k.name, "1") && !startswith(k.name, "2") && k.name != "globals.tf"
       )
     },
     {