diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f049d0d84bc0dc72b4c7247ed8334d06a6ed45f8..6dcdca13c1da77583dc190ad24b510c49a0c6623 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,8 +45,6 @@ stages:
 Generate_Project:
     only: ['web', 'schedules']
     extends: .Generate_Project_
-    variables:
-        RUN_SETUP: "false"
 
 Build_Windows:
     only: ['web', 'schedules']
@@ -63,11 +61,11 @@ Build_Windows:
         - job: "Generate_Project"
           artifacts: true
     
-Build_CentOS:
+Build_Linux:
     only: ['web', 'schedules']
-    extends: .Build_CentOS_
+    extends: .Build_Linux_
     tags:
-        - centos
+        - linux
         - unreal-4.26
     variables:
         GIT_STRATEGY: none   
@@ -77,17 +75,18 @@ Build_CentOS:
     needs:
         - job: "Generate_Project"
           artifacts: true
-          
-Deploy_CAVE:
-    only: ['web', 'schedules']
-    extends: .Deploy_CAVE_
-    needs:
-        - job: "Build_CentOS"
-          artifacts: true
 
 Deploy_Windows:
     only: ['web', 'schedules']
     extends: .Deploy_VRDev_
     needs:
         - job: "Build_Windows"
+          artifacts: true          
+
+Deploy_CAVE:
+    only: ['web', 'schedules']
+    extends: .Deploy_CAVE_
+    needs:
+        - job: "Build_Linux"
           artifacts: true
+