diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index d037c31..0ace91a 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -39,8 +39,38 @@ jobs:
           username: ${{ secrets.CI_USERNAME }}
           password: ${{ secrets.CI_TOKEN }}
 
-      - name: Build Base Builder
+      - name: Build Builder
         run: docker build -t "$BASE_BUILDER_TAG" ./Linux/BaseBuilder
 
-      - name: Push Base Builder
-        run: docker push "$BASE_BUILDER_TAG"
\ No newline at end of file
+      - name: Push Builder
+        run: docker push "$BASE_BUILDER_TAG"
+
+  build-base-builder:
+    runs-on: ubuntu-latest
+    timeout-minutes: 360
+    container:
+        image: docker:29.1.5-dind
+        options: --privileged
+    services:
+      docker:
+        image: docker:29.1.5-dind
+        options: --privileged
+    steps:
+      - name: Install Node.js
+        run: apk add --no-cache nodejs npm
+
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Login to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ vars.CI_REGISTRY }}
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_TOKEN }}
+
+      - name: Build Builder
+        run: docker build -t "$CPP_BUILDER_TAG" ./Linux/CPPBuilder --build-arg BASE_BUILDER="$BASE_BUILDER_TAG"
+
+      - name: Push Builder
+        run: docker push "$CPP_BUILDER_TAG"
\ No newline at end of file