diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index 308a1e9..bd309d3 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -7,10 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  DOCKER_TLS_CERTDIR: "/certs"
-
   BRANCH_NAME: ${{ github.ref_name }}
-
   BASE_BUILDER_TAG: ${{ vars.CI_REGISTRY_IMAGE }}/linuxbasebuilder:${{ github.ref_name }}
   CPP_BUILDER_TAG: ${{ vars.CI_REGISTRY_IMAGE }}/linuxcppbuilder:${{ github.ref_name }}
   BIGFOOT_BUILDER_TAG: ${{ vars.CI_REGISTRY_IMAGE }}/linuxbigfootbuilder:${{ github.ref_name }}
@@ -20,59 +17,51 @@ jobs:
   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
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ vars.CI_REGISTRY }}
           username: ${{ secrets.CI_USERNAME }}
           password: ${{ secrets.CI_TOKEN }}
 
-      - name: Build Builder
-        run: docker build -t "$BASE_BUILDER_TAG" ./Linux/BaseBuilder
-
-      - name: Push Builder
-        run: docker push "$BASE_BUILDER_TAG"
+      - name: Build and push base builder
+        uses: docker/build-push-action@v5
+        with:
+          context: ./Linux/BaseBuilder
+          push: true
+          tags: ${{ env.BASE_BUILDER_TAG }}
 
   build-cpp-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
+    needs: build-base-builder
 
-      - name: Checkout repository
-        uses: actions/checkout@v3
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         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" --build-arg CONAN_PROFILE_BRANCH="${BRANCH_NAME}"
-
-      - name: Push Builder
-        run: docker push "$CPP_BUILDER_TAG"
\ No newline at end of file
+      - name: Build and push cpp builder
+        uses: docker/build-push-action@v5
+        with:
+          context: ./Linux/CPPBuilder
+          push: true
+          tags: ${{ env.CPP_BUILDER_TAG }}
+          build-args: |
+            BASE_BUILDER=${{ env.BASE_BUILDER_TAG }}
+            CONAN_PROFILE_BRANCH=${{ env.BRANCH_NAME }}