diff --git a/api/Dockerfile b/api/Dockerfile
index d1f6de15ab80e3c37c7245a4d263ad63b470a48a..0836f92bee95e370564ffe905b1a8086bad0fb2d 100755
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,10 +1,11 @@
-ARG PIP_CACHE_DIR
-
 # Can be "development" or "production"
 ARG ENV_TYPE
 ARG GIT_COMMIT_SHA
 FROM registry.git.fsmpi.rwth-aachen.de/videoag/backend/${ENV_TYPE}_common_py:${GIT_COMMIT_SHA}
 
+ARG PIP_CACHE_DIR
+RUN echo ${PIP_CACHE_DIR}
+
 ENV VIDEOAG_API_GIT_COMMIT_HASH $GIT_COMMIT_SHA
 
 COPY extra_requirements.txt ./
diff --git a/common_py/Dockerfile b/common_py/Dockerfile
index c5ac8fc36c8dd4e792ec0bd5b01f95c31bcafe01..f23990167e5d2df52b519c260ddd5e1327245a28 100755
--- a/common_py/Dockerfile
+++ b/common_py/Dockerfile
@@ -1,7 +1,7 @@
-ARG PIP_CACHE_DIR
-
 FROM python:3.12
 
+ARG PIP_CACHE_DIR
+
 WORKDIR /code
 
 RUN mkdir -p /code
diff --git a/generate_ci_pipeline.py b/generate_ci_pipeline.py
index c1a80512b44f31808502bf67924699cbdc885a61..946e4583b3f17fc5256880c9ce50f6177bee5e4a 100644
--- a/generate_ci_pipeline.py
+++ b/generate_ci_pipeline.py
@@ -92,6 +92,8 @@ echo "{\\"auths\\":{\\"$CI_REGISTRY\\":{\\"username\\":\\"$CI_REGISTRY_USER\\",\
             f"--destination=$CI_REGISTRY_IMAGE/{self.versioned_full_name()}",
             f"--build-arg=GIT_COMMIT_SHA={self.context.commit_sha}",
             f"--build-arg=ENV_TYPE={self.context.env_type()}",
+            
+            # See https://github.com/GoogleContainerTools/kaniko/issues/969#issuecomment-2160910028
             f"--build-arg=PIP_CACHE_DIR=$CI_PROJECT_DIR/.cache/pip",
             f"--cache=true",
         ]
diff --git a/job_controller/Dockerfile b/job_controller/Dockerfile
index 1cb272a5d842a185842eac4edca4bcbf572b4f30..677adfd6f1c9d6351d100d59f05956c373f7f67e 100644
--- a/job_controller/Dockerfile
+++ b/job_controller/Dockerfile
@@ -1,10 +1,9 @@
-ARG PIP_CACHE_DIR
-
 # Can be "development" or "production"
 ARG ENV_TYPE
 ARG GIT_COMMIT_SHA
 FROM registry.git.fsmpi.rwth-aachen.de/videoag/backend/${ENV_TYPE}_common_py:${GIT_COMMIT_SHA}
 
+ARG PIP_CACHE_DIR
 # Empty by default
 ARG GIT_COMMIT_TAG=