diff --git a/.github/workflows/ci-qemu.yml b/.github/workflows/ci-qemu.yml
index 66282a99c6fb4b7a374c93cf8e8b03b453d4031f..af107a396e3762899536e7d4f0c0cb8f57b72cc2 100644
--- a/.github/workflows/ci-qemu.yml
+++ b/.github/workflows/ci-qemu.yml
@@ -62,7 +62,8 @@ jobs:
           config-inline: |
             [registry."docker.io"]
               mirrors = ["${{ secrets.DOCKERHUB_PROXY_HOSTNAME }}"]
-              http = true
+            [registry."${{ secrets.DOCKERHUB_PROXY_HOSTNAME }}"]
+              http = true              
               insecure = true
             [registry."${{ secrets.PRIVATEHUB_HOSTNAME }}"]
               http = true
diff --git a/Dockerfile b/Dockerfile
index 18183d3c0a644cb739eaf9e342370d7ccc1dd414..f13d033470d060cd3de3fffd26c23dfda22fce81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
 
 # Sets a cache for pip packages
 #ENV PIP_CACHE_DIR=/var/cache/buildkit/pip
-ENV PIP_CACHE_DIR=/home/jovyan/work/var/cache/buildkit/pip
+ENV PIP_CACHE_DIR=/home/jovyan/work/var/cache/buildkit/pip/${TARGETPLATFORM}
 ENV APT_CACHE_DIR=/var/cache/apt/${TARGETPLATFORM}
 ENV CONDA_PKG_DIR=/opt/conda/pkgs/${TARGETPLATFORM}
 
@@ -26,7 +26,7 @@ ENV CONDA_PKG_DIR=/opt/conda/pkgs/${TARGETPLATFORM}
 RUN mkdir -p ${PIP_CACHE_DIR} && \
     mkdir -p ${APT_CACHE_DIR} && \
  	rm -f /etc/apt/apt.conf.d/docker-clean && \ 
-    echo "dir::cache::archives ${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}
 
 COPY Artefacts/apt_packages /tmp/