diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index 0075400..443b87e 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -34,15 +34,10 @@ variables:
     when: on_success
     expire_in: "1 hour"
 
-manifest-job/valid_set:
-  variables:
-    PACKAGE_NAME: "valid_set"
-  extends: manifest-job
-
 manifest-job/missing_tag_set:
   variables:
     PACKAGE_NAME: "missing_tag_set"
-  extends: manifest-job
+  extends: .manifest-job
 
 .test-job:
   stage: Test
@@ -62,7 +57,7 @@ test-images-job/missing_tag_set:
     - manifest-job/missing_tag_set
   variables:
     PACKAGE_NAME: "missing_tag_set"
-  extends: test-job
+  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:
@@ -88,7 +83,7 @@ bundle-job/missing_tag_set:
     - manifest-job/missing_tag_set
   variables:
     PACKAGE_NAME: "missing_tag_set"
-  extends: bundle-job
+  extends: .bundle-job
 
 .upload-job:
   stage: Distribute
diff --git a/.gitlab/valid_set.yml b/.gitlab/valid_set.yml
index 1573025..341697c 100644
--- a/.gitlab/valid_set.yml
+++ b/.gitlab/valid_set.yml
@@ -1,27 +1,32 @@
+manifest-job/valid_set:
+  variables:
+    PACKAGE_NAME: "valid_set"
+  extends: .manifest-job
+
 test-images-job/valid_set:
   needs:
     - manifest-job/valid_set
   variables:
     PACKAGE_NAME: "valid_set"
-  extends: test-job
+  extends: .test-job
 
 bundle-job/valid_set:
   needs:
     - manifest-job/valid_set
   variables:
     PACKAGE_NAME: "valid_set"
-  extends: bundle-job
+  extends: .bundle-job
 
 upload-job/valid_set:
   needs:
     - bundle-job/valid_set
   variables:
     PACKAGE_NAME: "valid_set"
-  extends: upload-job
+  extends: .upload-job
 
 release-job/valid_set:
   needs:
     - upload-job/valid_set
   variables:
     PACKAGE_NAME: "valid_set"
-  extends: release-job
+  extends: .release-job