diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a503b20..f0e5cbb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,5 @@
-# include:
-#   - .gitlab/existing_valid_theme_set.yml
-#   - .gitlab/missing_tag_set.yml
-#   - .gitlab/unbalanced_set.yml
-#   - .gitlab/valid_set.yml
+include:
+  - .gitlab/*.yml
 
 stages:
   - Manifest
@@ -24,14 +21,13 @@ variables:
     #- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "cicd"
     - if: $CI_COMMIT_TAG
       when: never
-    #- if: $CI_PIPELINE_SOURCE == "merge_request_event"
     - changes:
         - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
   script:
     - cd src/
     - npm install
     - npm run start
-    - cat ${ENTRY_FOLDER}/${PACKAGE_NAME}/theme.json
+    - cat ../${ENTRY_FOLDER}/${PACKAGE_NAME}/theme.json
     - npm run test
   artifacts:
     paths:
@@ -39,16 +35,6 @@ variables:
     when: on_success
     expire_in: "1 hour"
 
-manifest-job/existing_valid_theme_set:
-  variables:
-    PACKAGE_NAME: existing_valid_theme_set
-  extends: .manifest-job
-
-manifest-job/valid_set:
-  variables:
-    PACKAGE_NAME: "valid_set"
-  extends: .manifest-job
-
 .test-job:
   stage: Test
   image: python:latest
@@ -62,20 +48,6 @@ manifest-job/valid_set:
     - python -m pytest src/test_images.py --tb=line -rA --color=yes
   allow_failure: true
 
-test-images-job/existing_valid_theme_set:
-  needs:
-    - manifest-job/existing_valid_theme_set
-  variables:
-    PACKAGE_NAME: existing_valid_theme_set
-  extends: .test-job
-
-test-images-job/valid_set:
-  needs:
-    - manifest-job/valid_set
-  variables:
-    PACKAGE_NAME: "valid_set"
-  extends: .test-job
-
 # Jobs from here run Merged_results or Push/Merge Commits to the main branch. Tag is created on release so no run with tag creation
 .bundle-job:
   stage: Bundle