diff --git a/api/Dockerfile b/api/Dockerfile
index 5ef791274..43e1df99a 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -9,15 +9,16 @@ ARG envarg
 # Add Tini
 # Startup daemon
 ENV SOURCE_MAP_VERSION=0.7.4 \
-    APP_NAME=chalice \
-    LISTEN_PORT=8000 \
-    PRIVATE_ENDPOINTS=false \
-    ENTERPRISE_BUILD=${envarg} \
-    GIT_SHA=$GIT_SHA
+  APP_NAME=chalice \
+  LISTEN_PORT=8000 \
+  PRIVATE_ENDPOINTS=false \
+  ENTERPRISE_BUILD=${envarg} \
+  GIT_SHA=$GIT_SHA
 
 WORKDIR /work
 COPY requirements.txt ./requirements.txt
 RUN pip install --no-cache-dir --upgrade uv
+RUN uv pip install --no-cache-dir --upgrade pip setuptools wheel --system
 RUN uv pip install --no-cache-dir --upgrade -r requirements.txt --system
 
 COPY . .
diff --git a/api/Dockerfile_alerts b/api/Dockerfile_alerts
index 908d4826c..2435d31de 100644
--- a/api/Dockerfile_alerts
+++ b/api/Dockerfile_alerts
@@ -17,6 +17,7 @@ ENV APP_NAME=alerts \
 WORKDIR /work
 COPY requirements-alerts.txt ./requirements.txt
 RUN pip install --no-cache-dir --upgrade uv
+RUN uv pip install --no-cache-dir --upgrade pip setuptools wheel --system
 RUN uv pip install --no-cache-dir --upgrade -r requirements.txt --system
 
 COPY . .
diff --git a/ee/api/Dockerfile b/ee/api/Dockerfile
index 28de57ef2..86071c52f 100644
--- a/ee/api/Dockerfile
+++ b/ee/api/Dockerfile
@@ -4,16 +4,17 @@ RUN apk add --no-cache build-base libressl libffi-dev libressl-dev libxslt-dev l
 
 ARG envarg
 ENV SOURCE_MAP_VERSION=0.7.4 \
-    APP_NAME=chalice \
-    LISTEN_PORT=8000 \
-    PRIVATE_ENDPOINTS=false \
-    ENTERPRISE_BUILD=${envarg} \
-    GIT_SHA=$GIT_SHA
+  APP_NAME=chalice \
+  LISTEN_PORT=8000 \
+  PRIVATE_ENDPOINTS=false \
+  ENTERPRISE_BUILD=${envarg} \
+  GIT_SHA=$GIT_SHA
 
 WORKDIR /work
 COPY requirements.txt ./requirements.txt
 # Caching the source build
 RUN pip install --no-cache-dir --upgrade uv
+RUN uv pip install --no-cache-dir --upgrade pip setuptools wheel --system
 RUN uv pip install --no-cache-dir --upgrade python3-saml==1.16.0 --no-binary=lxml --system
 RUN uv pip install --no-cache-dir --upgrade -r requirements.txt --system
 
diff --git a/ee/api/Dockerfile_alerts b/ee/api/Dockerfile_alerts
index f8fd78232..49f89c6ff 100644
--- a/ee/api/Dockerfile_alerts
+++ b/ee/api/Dockerfile_alerts
@@ -13,6 +13,7 @@ ENV APP_NAME=alerts \
 WORKDIR /work
 COPY requirements-alerts.txt ./requirements.txt
 RUN pip install --no-cache-dir --upgrade uv
+RUN uv pip install --no-cache-dir --upgrade pip setuptools wheel --system
 RUN uv pip install --no-cache-dir --upgrade -r requirements.txt --system
 
 COPY . .
diff --git a/ee/api/Dockerfile_crons b/ee/api/Dockerfile_crons
index e6337b8a9..a4d76751e 100644
--- a/ee/api/Dockerfile_crons
+++ b/ee/api/Dockerfile_crons
@@ -14,6 +14,7 @@ ENV APP_NAME=crons \
 WORKDIR /work
 COPY requirements-crons.txt ./requirements.txt
 RUN pip install --no-cache-dir --upgrade uv
+RUN uv pip install --no-cache-dir --upgrade pip setuptools wheel --system
 RUN uv pip install --no-cache-dir --upgrade -r requirements.txt --system
 
 COPY . .
diff --git a/ee/assist-stats/Dockerfile b/ee/assist-stats/Dockerfile
index d6e12a0b0..3df1059d9 100644
--- a/ee/assist-stats/Dockerfile
+++ b/ee/assist-stats/Dockerfile
@@ -8,12 +8,14 @@ ARG envarg
 # Add Tini
 # Startup daemon
 ENV APP_NAME=assist-stats \
-    ENTERPRISE_BUILD=${envarg} \
-    GIT_SHA=$GIT_SHA
+  ENTERPRISE_BUILD=${envarg} \
+  GIT_SHA=$GIT_SHA
 
 WORKDIR /work
 COPY requirements.txt ./requirements.txt
-RUN pip install --no-cache-dir --upgrade -r requirements.txt
+RUN pip install --no-cache-dir --upgrade uv
+RUN uv pip install --no-cache-dir --upgrade pip setuptools wheel --system
+RUN uv pip install --no-cache-dir --upgrade -r requirements.txt --system
 
 COPY . .
 RUN mv env.default .env