diff --git a/api/Dockerfile b/api/Dockerfile
index 25b467058834688e28b771dbb183678d12ddaf05..d1f6de15ab80e3c37c7245a4d263ad63b470a48a 100755
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,3 +1,5 @@
+ARG PIP_CACHE_DIR
+
 # Can be "development" or "production"
 ARG ENV_TYPE
 ARG GIT_COMMIT_SHA
diff --git a/common_py/Dockerfile b/common_py/Dockerfile
index 60f2f1e38d29234f0319d5f91ba59b2fa1b12786..c5ac8fc36c8dd4e792ec0bd5b01f95c31bcafe01 100755
--- a/common_py/Dockerfile
+++ b/common_py/Dockerfile
@@ -1,3 +1,5 @@
+ARG PIP_CACHE_DIR
+
 FROM python:3.12
 
 WORKDIR /code
diff --git a/generate_ci_pipeline.py b/generate_ci_pipeline.py
index f8b6f9792c9eec247e9521e4f60b47e9eb6c2d36..c1a80512b44f31808502bf67924699cbdc885a61 100644
--- a/generate_ci_pipeline.py
+++ b/generate_ci_pipeline.py
@@ -92,6 +92,7 @@ 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()}",
+            f"--build-arg=PIP_CACHE_DIR=$CI_PROJECT_DIR/.cache/pip",
             f"--cache=true",
         ]
         
@@ -106,6 +107,9 @@ echo "{\\"auths\\":{\\"$CI_REGISTRY\\":{\\"username\\":\\"$CI_REGISTRY_USER\\",\
     image:
         name: gcr.io/kaniko-project/executor:v1.23.2-debug
         entrypoint: [""]
+    cache:
+        paths:
+            - .cache/pip
     script:
         - {self._get_auth_echo()}
         - echo {self.context.commit_sha}
@@ -165,6 +169,7 @@ run-api-tests:
         - name: postgres:17
           alias: ci-database
           variables:
+              POSTGRES_DB: videoagtest
               POSTGRES_USER: videoagtest
               POSTGRES_PASSWORD: LetMeTest...
 
diff --git a/job_controller/Dockerfile b/job_controller/Dockerfile
index fdf2366b2480c5895683b974b3eb022e1831f7ce..1cb272a5d842a185842eac4edca4bcbf572b4f30 100644
--- a/job_controller/Dockerfile
+++ b/job_controller/Dockerfile
@@ -1,3 +1,5 @@
+ARG PIP_CACHE_DIR
+
 # Can be "development" or "production"
 ARG ENV_TYPE
 ARG GIT_COMMIT_SHA