diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 1f85d47..29d87cd 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -26,6 +26,9 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          # To facilitate local builds using the Makefile
+          driver-opts: ${{ startsWith(vars.DOCKERHUB_REPOSITORY, 'http://localhost') && 'network=host' || '' }}
 
       - name: Log into registry
         if: >
@@ -46,3 +49,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ vars.DOCKERHUB_REPOSITORY }}:${{ env.PYCHARM_VERSION }}-${{ env.azul_docker_pycharm_version }}
+          cache-from: type=registry,ref=${{ vars.DOCKERHUB_REPOSITORY }}/buildcache
+          cache-to: type=registry,ref=${{ vars.DOCKERHUB_REPOSITORY }}/buildcache,mode=max