diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index feec33b..fafbcc8 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -8,10 +8,10 @@ on:
 
 env:
   BRANCH_NAME: ${{ github.ref_name }}
-  BASE_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxbasebuilder:${{ github.ref_name }}
-  CPP_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxcppbuilder:${{ github.ref_name }}
-  BIGFOOT_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxbigfootbuilder:${{ github.ref_name }}
-  BIGFOOT_COVERAGE_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxbigfootcoveragebuilder:${{ github.ref_name }}
+  BASE_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxbasebuilder:${{ env.BRANCH_NAME_LOWER }}
+  CPP_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxcppbuilder:${{ env.BRANCH_NAME_LOWER }}
+  BIGFOOT_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxbigfootbuilder:${{ env.BRANCH_NAME_LOWER }}
+  BIGFOOT_COVERAGE_BUILDER_TAG: ${{ vars.DOCKER_IMAGE }}/linuxbigfootcoveragebuilder:${{ env.BRANCH_NAME_LOWER }}
 
 jobs:
   build-base-builder:
@@ -19,6 +19,9 @@ jobs:
     timeout-minutes: 360
 
     steps:
+      - name: Set BRANCH_NAME_LOWER
+        run: echo "BRANCH_NAME_LOWER=$(echo $GITHUB_REF_NAME | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+
       - name: Checkout
         uses: actions/checkout@v6
 
@@ -45,6 +48,9 @@ jobs:
     needs: build-base-builder
 
     steps:
+      - name: Set BRANCH_NAME_LOWER
+        run: echo "BRANCH_NAME_LOWER=$(echo $GITHUB_REF_NAME | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+
       - name: Checkout
         uses: actions/checkout@v6
 
@@ -74,8 +80,8 @@ jobs:
     needs: build-cpp-builder
 
     steps:
-      - name: Set BRANCH_NAME
-        run: echo "BRANCH_NAME=$(echo $GITHUB_REF_NAME | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+      - name: Set BRANCH_NAME_LOWER
+        run: echo "BRANCH_NAME_LOWER=$(echo $GITHUB_REF_NAME | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
 
       - name: Checkout
         uses: actions/checkout@v6
@@ -105,25 +111,14 @@ jobs:
             CONAN_DEBUG_PROFILE=clangd
             PACKAGES_CHANNEL=${{ env.BRANCH_NAME }}
 
-  bigfoot-builder-push-built-packages:
-    runs-on: ubuntu-latest
-    timeout-minutes: 360
-    needs: build-bigfoot-builder
-    container:
-      image: BIGFOOT_BUILDER_TAG
-
-    steps:
-      - name: Push built Packages
-        run: CONAN_LOGIN_USERNAME=${{ secrets.ARTIFACTORY_USER }} CONAN_PASSWORD=${{ secrets.ARTIFACTORY_PASSWORD }} conan upload "*" --remote=bigfootpackages --force --confirm
-
   build-bigfootcoverage-builder:
     runs-on: ubuntu-latest
     timeout-minutes: 360
     needs: build-cpp-builder
 
     steps:
-      - name: Set BRANCH_NAME
-        run: echo "BRANCH_NAME=$(echo $GITHUB_REF_NAME | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+      - name: Set BRANCH_NAME_LOWER
+        run: echo "BRANCH_NAME_LOWER=$(echo $GITHUB_REF_NAME | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
 
       - name: Checkout
         uses: actions/checkout@v6