diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aaa2f0350..89d777e94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,10 +7,9 @@ image: gradle:eclipse-temurin
 stages:
   # TODO: Make stages depending on what is in versionProperties
   - build_1_18_2
-  # Disabled those for now as im attempting to optimise the build script
-#  - build_1_19_2
-#  - build_1_19_4
-#  - build_1_20_1
+  - build_1_19_2
+  - build_1_19_4
+  - build_1_20_1
   - api
   - pages
 
@@ -60,113 +59,29 @@ build_1_18_2:
     MC_VER: "1.18.2"
   extends: .build_mc
 
-
-
-
-
-
 # 1.19.2 build
 build_1_19_2:
   stage: build_1_19_2
-  script:
-    # this both runs the unit tests and assembles the code
-    - ./gradlew clean -PmcVer="1.19.2" --gradle-user-home cache/;
-    - ./gradlew build -PmcVer="1.19.2" --gradle-user-home cache/;
-    - ./gradlew mergeJars -PmcVer="1.19.2" --gradle-user-home cache/;
-  image: eclipse-temurin:17
-  artifacts:
-    name: "NightlyBuild_1_19_2-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
-    paths:
-      - Merged/*.jar
-      - fabric/build/libs/*.jar
-      - forge/build/libs/*.jar
-      - quilt/build/libs/*.jar
-    exclude:
-      # TODO: There is a lot of duplicate stuff here, fix it later to be smaller
-      - fabric/build/libs/*-all.jar
-      - fabric/build/libs/*-sources.jar
-      - forge/build/libs/*-all.jar
-      - forge/build/libs/*-sources.jar
-      - quilt/build/libs/*-all.jar
-      - quilt/build/libs/*-sources.jar
-    expire_in: 1 day
-    when: always
-  cache:
-    key: "gradleCache"
-    policy: pull-push
-    paths:
-      - .gradle
-      - cache/
-  allow_failure: true
+  variables:
+    MC_VER: "1.19.2"
+  extends: .build_mc
 
-# 1.19.4 build
+# 1.19.2 build
 build_1_19_4:
   stage: build_1_19_4
-  script:
-    # this both runs the unit tests and assembles the code
-    - ./gradlew clean -PmcVer="1.19.4" --gradle-user-home cache/;
-    - ./gradlew build -PmcVer="1.19.4" --gradle-user-home cache/;
-    - ./gradlew mergeJars -PmcVer="1.19.4" --gradle-user-home cache/;
-  image: eclipse-temurin:17
-  artifacts:
-    name: "NightlyBuild_1_19_4-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
-    paths:
-      - Merged/*.jar
-      - fabric/build/libs/*.jar
-      - forge/build/libs/*.jar
-      - quilt/build/libs/*.jar
-    exclude:
-      # TODO: There is a lot of duplicate stuff here, fix it later to be smaller
-      - fabric/build/libs/*-all.jar
-      - fabric/build/libs/*-sources.jar
-      - forge/build/libs/*-all.jar
-      - forge/build/libs/*-sources.jar
-      - quilt/build/libs/*-all.jar
-      - quilt/build/libs/*-sources.jar
-    expire_in: 1 day
-    when: always
-  cache:
-    key: "gradleCache"
-    policy: pull-push
-    paths:
-      - .gradle
-      - cache/
-  allow_failure: true
-
+  variables:
+    MC_VER: "1.19.4"
+  extends: .build_mc
 
 # 1.20.1 build
 build_1_20_1:
   stage: build_1_20_1
-  script:
-    # this both runs the unit tests and assembles the code
-    - ./gradlew clean -PmcVer="1.20.1" --gradle-user-home cache/;
-    - ./gradlew build -PmcVer="1.20.1" --gradle-user-home cache/;
-    - ./gradlew mergeJars -PmcVer="1.20.1" --gradle-user-home cache/;
-  image: eclipse-temurin:17
-  artifacts:
-    name: "NightlyBuild_1_20_1-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
-    paths:
-      - Merged/*.jar
-      - fabric/build/libs/*.jar
-      - forge/build/libs/*.jar
-      - quilt/build/libs/*.jar
-    exclude:
-      # TODO: There is a lot of duplicate stuff here, fix it later to be smaller
-      - fabric/build/libs/*-all.jar
-      - fabric/build/libs/*-sources.jar
-      - forge/build/libs/*-all.jar
-      - forge/build/libs/*-sources.jar
-      - quilt/build/libs/*-all.jar
-      - quilt/build/libs/*-sources.jar
-    expire_in: 1 day
-    when: always
-  cache:
-    key: "gradleCache"
-    policy: pull-push
-    paths:
-      - .gradle
-      - cache/
-  allow_failure: true
+  variables:
+    MC_VER: "1.20.1"
+  extends: .build_mc
+
+
+
 
 
 api: