diff --git a/.dockerignore b/.dockerignore
index 2886a059a9..e12ea8709b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,26 @@
+# IDE/Editor configs
 .devcontainer
-.github
 .vscode
+.idea
+*.swp
+*.swo
+
+# Build artifacts
 target/
+*.pyc
+*.pyo
+*.pyd
+__pycache__/
+
+# Git-related
+.git
+.gitignore
+
+# CI/CD
+.github
 .dockerignore
+.gitattributes
+
+# Dockerfiles
 Dockerfile
+Dockerfile-localnet
\ No newline at end of file
diff --git a/.github/workflows/check-bittensor-e2e-tests.yml.yml b/.github/workflows/check-bittensor-e2e-tests.yml.yml
index 902ea2cd39..721eb96994 100644
--- a/.github/workflows/check-bittensor-e2e-tests.yml.yml
+++ b/.github/workflows/check-bittensor-e2e-tests.yml.yml
@@ -110,6 +110,7 @@ jobs:
 
   build-image-with-current-branch:
     needs: check-label
+    if: needs.check-label.outputs.skip-bittensor-e2e-tests == 'false'
     runs-on: [self-hosted, type-ccx33]
     steps:
       - name: Checkout code
@@ -211,12 +212,6 @@ jobs:
       - name: Retag Docker Image
         run: docker tag localnet ghcr.io/opentensor/subtensor-localnet:devnet-ready
 
-#      - name: Run tests
-#        working-directory: ${{ github.workspace }}/btcli
-#        run: |
-#          source ${{ github.workspace }}/venv/bin/activate
-#          uv run pytest ${{ matrix.test-file }} -s
-
       - name: Run with retry
         working-directory: ${{ github.workspace }}/btcli
         run: |
@@ -311,12 +306,6 @@ jobs:
       - name: Retag Docker Image
         run: docker tag localnet ghcr.io/opentensor/subtensor-localnet:devnet-ready
 
-#      - name: Run tests
-#        working-directory: ${{ github.workspace }}/bittensor
-#        run: |
-#          source ${{ github.workspace }}/venv/bin/activate
-#          uv run pytest ${{ matrix.test-file }} -s
-
       - name: Run with retry
         working-directory: ${{ github.workspace }}/bittensor
         run: |
diff --git a/.github/workflows/docker-localnet.yml b/.github/workflows/docker-localnet.yml
index 133f3dd800..13068682c7 100644
--- a/.github/workflows/docker-localnet.yml
+++ b/.github/workflows/docker-localnet.yml
@@ -86,3 +86,5 @@ jobs:
           tags: |
             ghcr.io/${{ github.repository }}-localnet:${{ env.tag }}
             ${{ env.latest_tag == 'true' && format('ghcr.io/{0}-localnet:latest', github.repository) || '' }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max