diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index acab03a1e2c9afab842460219f8cabc96f2ab891..247d1ed0c76998d51eca48d2e4904dfb494e6435 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,18 @@ include:
   ref: master
   file: devcontainer_images.gitlab-ci.yml
 
-build:
+variables:
+  IMAGE_BASENAME: ${IMAGE_PREFIX}/devcontainer-python
+  TAG_SUFFIX: bookworm
+
+"3.13.0":
   extends: .build_image_job_template
   variables:
-    IMAGE_BASENAME: ${IMAGE_PREFIX}/devcontainer-python
-    IMAGE_NAME: ${IMAGE_BASENAME}:3.13.0-bookworm,${IMAGE_BASENAME}:3.13-bookworm,${IMAGE_BASENAME}:3-bookworm
+    IMAGE_NAME: ${IMAGE_BASENAME}:3.13.0-${TAG_SUFFIX},${IMAGE_BASENAME}:3.13-${TAG_SUFFIX},${IMAGE_BASENAME}:3-${TAG_SUFFIX}
+    BUILD_ARGS: BASE_IMAGE_VERSION=3.13.0
+
+"3.12.7":
+  extends: .build_old_version
+  variables:
+    IMAGE_NAME: ${IMAGE_BASENAME}:3.12.7-${TAG_SUFFIX},${IMAGE_BASENAME}:3.12-${TAG_SUFFIX}
+    BUILD_ARGS: BASE_IMAGE_VERSION=3.12.7
diff --git a/Dockerfile b/Dockerfile
index a744085de59a3cd5cc2c534220901900f2bcab95..a2a15e340ddd56efcae88ab81ce9f3f048d10468 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM python:3.13.0-bookworm
+ARG BASE_IMAGE_VERSION="3.12.7"
+
+FROM python:$BASE_IMAGE_VERSION-bookworm
 
 ARG USERNAME="vscode"
 ARG USER_UID="1000"
@@ -10,4 +12,7 @@ RUN groupadd --gid ${USER_GID} ${USERNAME} \
     && mkdir -p ${WORKSPACE}
 
 USER $USERNAME
+
+RUN python -m pip install --upgrade pip
+
 WORKDIR ${WORKSPACE}