diff --git a/build/docker/lambda/Dockerfile b/build/docker/lambda/Dockerfile
index e500a83a6..b9b21af13 100644
--- a/build/docker/lambda/Dockerfile
+++ b/build/docker/lambda/Dockerfile
@@ -1,6 +1,9 @@
 FROM public.ecr.aws/lambda/python:3.14-arm64
-# Update Pip
-RUN python -m pip install --upgrade pip
+# Apply OS updates and update Pip
+RUN dnf upgrade -y \
+    && dnf clean all \
+    && rm -rf /var/cache/dnf \
+    && python -m pip install --upgrade pip
 # Copy Python requirements
 COPY assets/requirements.txt /
 # Install Python requirements
diff --git a/build/docker/tester/Dockerfile b/build/docker/tester/Dockerfile
index 115c692fd..aa18e783b 100644
--- a/build/docker/tester/Dockerfile
+++ b/build/docker/tester/Dockerfile
@@ -1,6 +1,13 @@
 FROM python:3.14
-# Update Pip
-RUN python -m pip install --upgrade pip
+# Apply OS security updates only and update Pip
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends unattended-upgrades \
+    && unattended-upgrade -d \
+    && apt-get remove -y unattended-upgrades \
+    && apt-get autoremove -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && python -m pip install --upgrade pip
 # Copy Python requirements
 COPY assets/requirements.txt /
 # Install Python requirements
diff --git a/infrastructure/stacks/development-and-deployment-tools/batch-buildspecs/task-env-deploy-and-test-buildspec.yml b/infrastructure/stacks/development-and-deployment-tools/batch-buildspecs/task-env-deploy-and-test-buildspec.yml
index e703bcd9c..8662f4291 100644
--- a/infrastructure/stacks/development-and-deployment-tools/batch-buildspecs/task-env-deploy-and-test-buildspec.yml
+++ b/infrastructure/stacks/development-and-deployment-tools/batch-buildspecs/task-env-deploy-and-test-buildspec.yml
@@ -149,7 +149,7 @@ batch:
           PARALLEL_TEST_COUNT: 20
       buildspec: infrastructure/stacks/development-and-deployment-tools/batch-buildspecs/task-env-deploy-and-test-batch-jobs/integration-test.yml
       depend-on:
-        - deploy
+        - deploy_cloudwatch_queries
 
     - identifier: integration_test_validation
       env:
@@ -163,7 +163,7 @@ batch:
           PARALLEL_TEST_COUNT: 40
       buildspec: infrastructure/stacks/development-and-deployment-tools/batch-buildspecs/task-env-deploy-and-test-batch-jobs/integration-test.yml
       depend-on:
-        - deploy
+        - deploy_cloudwatch_queries
 
     - identifier: integration_test_opening_times
       env:
@@ -177,7 +177,7 @@ batch:
           PARALLEL_TEST_COUNT: 40
       buildspec: infrastructure/stacks/development-and-deployment-tools/batch-buildspecs/task-env-deploy-and-test-batch-jobs/integration-test.yml
       depend-on:
-        - deploy
+        - deploy_cloudwatch_queries
 
     - identifier: integration_test_general
       env:
@@ -191,4 +191,4 @@ batch:
           PARALLEL_TEST_COUNT: 40
       buildspec: infrastructure/stacks/development-and-deployment-tools/batch-buildspecs/task-env-deploy-and-test-batch-jobs/integration-test.yml
       depend-on:
-        - deploy
+        - deploy_cloudwatch_queries