diff --git a/.gitea/workflows/build-release.yml b/.gitea/workflows/build-release.yml
deleted file mode 100644
index 2bac5d6..0000000
--- a/.gitea/workflows/build-release.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-name: Docker Image Build Pipeline
-
-on:
-  push:
-    branches:
-      - release
-
-jobs:
-  Checkout-Branch:
-    runs-on: self-hosted
-    defaults:
-      run:
-        working-directory: /home/builds/src/ansible-dev
-
-    steps:
-      - name: Checkout release branch
-        run: |
-          git checkout ${{ env.GITHUB_REF_NAME }}
-
-      - name: Verify current commit
-        run: git log -1
-
-
-  Build-Images:
-    runs-on: self-hosted
-    needs: [Checkout-Branch]
-    defaults:
-      run:
-        working-directory: /home/builds/src/ansible-dev
-
-    steps:
-      - name: Fedora
-        run: |
-          echo "docker build -f build/Containerfile.fedora -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} ."
-          docker build -f build/Containerfile.fedora -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }} .
-
-      - name: Debian
-        run: |
-          echo "docker build -f build/Containerfile.debian -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} ."
-          docker build -f build/Containerfile.debian -t ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }} .
-
-
-  Push-Images:
-    runs-on: self-hosted
-    needs: [Build-Images]
-    steps:
-      - name: Docker login
-        run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login --username ${{ secrets.REGISTRY_USER }} --password-stdin ${{ vars.REGISTRY }}
-
-      - name: Push images to registry
-        run: |
-          pwd
-          docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_FEDORA }}:${{ env.GITHUB_REF_NAME }}
-          docker push ${{ vars.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}/${{ vars.BUILD_NAME_DEBIAN }}:${{ env.GITHUB_REF_NAME }}
-
-
-  Cleanup-Build-Images:
-    runs-on: self-hosted
-    needs: [Build-Images, Push-Images]
-    steps:
-      - name: Cleanup build images
-        run: docker system prune -af
-
-
-  Cleanup-Docker-Login:
-    runs-on: self-hosted
-    needs: [Push-Images]
-    steps:
-      - name: Cleanup Docker login
-        run: rm -v /home/builds/.docker/config.json
diff --git a/.gitea/workflows/build-stage.yml b/.gitea/workflows/build-stage-release.yml
similarity index 96%
rename from .gitea/workflows/build-stage.yml
rename to .gitea/workflows/build-stage-release.yml
index cfe911b..5c944f6 100644
--- a/.gitea/workflows/build-stage.yml
+++ b/.gitea/workflows/build-stage-release.yml
@@ -3,7 +3,7 @@ name: Docker Image Build Pipeline
 on:
   push:
     branches:
-      - staging
+      - staging,release
 
 jobs:
   Checkout-Branch:
@@ -13,7 +13,7 @@ jobs:
         working-directory: /home/builds/src/ansible-dev
 
     steps:
-      - name: Checkout staging branch
+      - name: "Checkout branch: ${{ env.GITHUB_REF_NAME }}"
         run: |
           git fetch origin ${{ env.GITHUB_REF_NAME }}:${{ env.GITHUB_REF_NAME }}
           git checkout ${{ env.GITHUB_REF_NAME }}
diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml
index 18f41b4..2bbb6b4 100644
--- a/.gitea/workflows/build-test.yml
+++ b/.gitea/workflows/build-test.yml
@@ -16,6 +16,9 @@ jobs:
       - name: Cleanup old code
         run: rm -rfv *
 
+      - name: Cleanup old build cache
+        run: docker system prune -af
+
 
   Check-Environment:
     runs-on: self-hosted