diff --git a/Dockerfile b/Dockerfile
index a75585cfd58..49303f4d206 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,9 +61,6 @@ COPY --from=builder /wheels/ /wheels/
 # Install the built wheel using pip; again using a wildcard if it's the only file
 RUN pip install *.whl /wheels/* --no-index --find-links=/wheels/ && rm -f *.whl && rm -rf /wheels
 
-# Force patched jaraco.context version (GHSA-58pv-8j8x-9vj2)
-RUN pip install --no-cache-dir 'jaraco.context==6.1.0'
-
 # Remove test files and keys from dependencies
 RUN find /usr/lib -type f -path "*/tornado/test/*" -delete && \
     find /usr/lib -type d -path "*/tornado/test" -delete
@@ -72,6 +69,10 @@ RUN find /usr/lib -type f -path "*/tornado/test/*" -delete && \
 # Convert Windows line endings to Unix and make executable
 RUN sed -i 's/\r$//' docker/install_auto_router.sh && chmod +x docker/install_auto_router.sh && ./docker/install_auto_router.sh
 
+# Force patched jaraco.context version (GHSA-58pv-8j8x-9vj2)
+# Must be after install_auto_router.sh as aurelio-sdk may downgrade jaraco.context
+RUN pip install --no-cache-dir 'jaraco.context>=6.1.0'
+
 # Generate prisma client
 RUN prisma generate
 # Convert Windows line endings to Unix for entrypoint scripts
diff --git a/docker/Dockerfile.database b/docker/Dockerfile.database
index a05e37591ab..605d5eccbc0 100644
--- a/docker/Dockerfile.database
+++ b/docker/Dockerfile.database
@@ -63,13 +63,14 @@ COPY --from=builder /wheels/ /wheels/
 # Install the built wheel using pip; again using a wildcard if it's the only file
 RUN pip install *.whl /wheels/* --no-index --find-links=/wheels/ && rm -f *.whl && rm -rf /wheels
 
-# Force patched jaraco.context version (GHSA-58pv-8j8x-9vj2)
-RUN pip install --no-cache-dir 'jaraco.context==6.1.0'
-
 # Install semantic_router and aurelio-sdk using script
 # Convert Windows line endings to Unix and make executable
 RUN sed -i 's/\r$//' docker/install_auto_router.sh && chmod +x docker/install_auto_router.sh && ./docker/install_auto_router.sh
 
+# Force patched jaraco.context version (GHSA-58pv-8j8x-9vj2)
+# Must be after install_auto_router.sh as aurelio-sdk may downgrade jaraco.context
+RUN pip install --no-cache-dir 'jaraco.context>=6.1.0'
+
 # ensure pyjwt is used, not jwt
 RUN pip uninstall jwt -y
 RUN pip uninstall PyJWT -y