diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e53e5dda718a9fae1ee68c5277153551aa992670..87e1531e235a66f559b918e6867a49b5e5a5a1c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,20 +83,12 @@ Generate_Project:
             )"
 
 Generate_Project_Without_Toolkit:
-    rules: 
-      - if: $CI_PIPELINE_SOURCE == "web"
-      - if: $CI_PIPELINE_SOURCE == "schedule"
-      - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-      - if: $CI_COMMIT_TAG
-      - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    extends: .Generate_Project_
+    extends: Generate_Project
     variables:
-        RUN_SETUP: "false"
         GEN_DEPENDENCIES: "(
             [master@UnrealDTrackPlugin]='https://github.com/VRGroupRWTH/UnrealDTrackPlugin.git'
             )"
 
-
 Build_Windows:
     rules: 
       - if: $CI_PIPELINE_SOURCE == "web"
@@ -138,24 +130,8 @@ Build_Linux:
         - job: "Generate_Project"
           artifacts: true
 
-    
 Build_Linux_Without_Toolkit:
-    rules: 
-      - if: $CI_PIPELINE_SOURCE == "web"
-      - if: $CI_PIPELINE_SOURCE == "schedule"
-      - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-      - if: $CI_COMMIT_TAG
-      - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    extends: .Build_Linux_
-    tags:
-        - linux
-        - unreal
-        - docker-executor
-    variables:
-        GIT_STRATEGY: none   
-        GIT_CHECKOUT: "false"
-        # CLIENT_CONFIG: "Shipping"
-        CLIENT_CONFIG: "DebugGame"
+    extends: Build_Linux
     needs:
         - job: "Generate_Project_Without_Toolkit"
           artifacts: true