diff --git a/.github/workflows/ci-qemu.yml b/.github/workflows/ci-qemu.yml
index ac9a56048168f0ead606bc066c3d977c87b9bbf7..52077293ae91357d1bea00380d3e58e3816d8cd5 100644
--- a/.github/workflows/ci-qemu.yml
+++ b/.github/workflows/ci-qemu.yml
@@ -83,8 +83,8 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ secrets.PRIVATEHUB_HOSTNAME }}/${{ env.REPOSITORY_NAME }}:buildcache
-          cache-to: type=registry,ref=${{ secrets.PRIVATEHUB_HOSTNAME }}/${{ env.REPOSITORY_NAME }}:buildcache,mode=min,compression=zstd
+          cache-from: type=registry,ref=${{ secrets.PRIVATEHUB_HOSTNAME }}/${{ env.REPOSITORY_NAME }}:${{ env.GITHUB_REF_NAME }}-buildcache
+          cache-to: type=registry,ref=${{ secrets.PRIVATEHUB_HOSTNAME }}/${{ env.REPOSITORY_NAME }}:${{ env.GITHUB_REF_NAME }}-buildcache,mode=min,compression=zstd
 
       - name: Update repo description
         uses: peter-evans/dockerhub-description@v3
diff --git a/Dockerfile b/Dockerfile
index 335e4a5395db646e0dd729785b60466174e99f34..71e6119758e86cfcd35f1cb00708099b426e23df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,13 +25,13 @@ ENV CONDA_PKG_DIR=/opt/conda/pkgs/
 # We need to remove the default `docker-clean` to avoid cache cleaning
 RUN mkdir -p ${PIP_CACHE_DIR} && \
  	rm -f /etc/apt/apt.conf.d/docker-clean && \ 
-    echo "Dir::Cache::pkgcache ${APT_CACHE_DIR};" > /etc/apt/apt.conf.d/00-move-cache && \
+    #echo "Dir::Cache::pkgcache ${APT_CACHE_DIR};" > /etc/apt/apt.conf.d/00-move-cache && \
     mkdir -p ${CONDA_PKG_DIR} && \
     cat /etc/apt/apt.conf.d/00-move-cache
 
 COPY Artefacts/apt_packages /tmp/
 
-RUN --mount=type=cache,target=${APT_CACHE_DIR},sharing=locked \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
  	apt-get update && \
 	apt-get install -qq --yes --no-install-recommends \
 		$(cat /tmp/apt_packages) && \