diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index 9b7c3f1..ed85444 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -29,52 +29,38 @@ jobs:
         run: |
           docker build -t ${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} ./Linux/BaseBuilder
 
-      # - name: Set up Docker Buildx
-      #   uses: docker/setup-buildx-action@v4
+      - name: Login to registry
+        run: |
+          echo "${{ secrets.DOCKER_TOKEN }}" | docker login ${{ vars.DOCKER_REGISTRY }} \
+            -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
-      # - name: Login to the Container registry
-      #   uses: docker/login-action@v4
-      #   with:
-      #     registry: ${{ vars.DOCKER_REGISTRY }}
-      #     username: ${{ secrets.DOCKER_USERNAME }}
-      #     password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Push
+        run: |
+          docker push ${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
 
-      # - name: Build and push base builder
-      #   uses: docker/build-push-action@v7
-      #   with:
-      #     context: ./Linux/BaseBuilder
-      #     push: true
-      #     tags: ${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
+  build-cpp-builder:
+    runs-on: ubuntu-latest
+    timeout-minutes: 360
+    needs: build-base-builder
 
-  # build-cpp-builder:
-  #   runs-on: ubuntu-latest
-  #   timeout-minutes: 360
-  #   needs: build-base-builder
-
-  #   steps:
-  #     - name: Set ENV
-  #       run: |
-  #         echo "BRANCH_NAME_LOWER=$(echo $GITHUB_REF_NAME | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
-  #         echo "BRANCH_NAME=$(echo $GITHUB_REF_NAME)" >> $GITHUB_ENV
+    steps:
+      - name: Set ENV
+        run: |
+          echo "BRANCH_NAME_LOWER=$(echo $GITHUB_REF_NAME | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+          echo "BRANCH_NAME=$(echo $GITHUB_REF_NAME)" >> $GITHUB_ENV
           
-  #     - name: Checkout
-  #       uses: actions/checkout@v6
+      - name: Checkout
+        uses: actions/checkout@v6
 
-  #     - name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v4
+      - name: Build
+        run: |
+          docker build -t ${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} --build-arg BASE_BUILDER=${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }} ./Linux/CPPBuilder
 
-  #     - name: Login to the Container registry
-  #       uses: docker/login-action@v4
-  #       with:
-  #         registry: ${{ vars.DOCKER_REGISTRY }}
-  #         username: ${{ secrets.DOCKER_USERNAME }}
-  #         password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to registry
+        run: |
+          echo "${{ secrets.DOCKER_TOKEN }}" | docker login ${{ vars.DOCKER_REGISTRY }} \
+            -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
 
-  #     - name: Build and push cpp builder
-  #       uses: docker/build-push-action@v7
-  #       with:
-  #         context: ./Linux/CPPBuilder
-  #         push: true
-  #         tags: ${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
-  #         build-args: |
-  #           BASE_BUILDER=${{ env.BASE_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
\ No newline at end of file
+      - name: Push
+        run: |
+          docker push ${{ env.CPP_BUILDER_TAG }}:${{ env.BRANCH_NAME_LOWER }}
\ No newline at end of file