diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2b326ba..90cbfc6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,23 +35,24 @@ jobs:
       - name: Update block and item implementations
         run: ./gradlew clean blockAndItemCodeGen
 
-      - name: Build
-        run: ./gradlew build
-
-      - name: Capture Common build artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: Artifacts
-          path: Common/build/libs/
-
+      - name: Build Fabric
+        run: ./gradlew :Fabric:build
       - name: Capture Fabric build artifacts
         uses: actions/upload-artifact@v3
         with:
           name: Artifacts
           path: Fabric/build/libs/
 
+      - name: Build Forge
+        run: ./gradlew :Forge:build
       - name: Capture Forge build artifacts
         uses: actions/upload-artifact@v3
         with:
           name: Artifacts
           path: Forge/build/libs/
+
+      - name: Capture Common build artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: Artifacts
+          path: Common/build/libs/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 755bb9a..38967ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,9 @@ Build Test:
     - chmod +x gradlew
   script:
     - echo "**** Building ****"
-    - "./gradlew clean build --info --full-stacktrace"
+    - "./gradlew clean blockAndItemCodeGen --info --full-stacktrace"
+    - "./gradlew :Fabric:build --info --full-stacktrace"
+    - "./gradlew :Forge:build  --info --full-stacktrace"
   retry: 1
   rules:
     - if: '$CI_SERVER_HOST == "git.griefed.de"'