diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6691d6c7833ca4176ae6e77311d0a08491e461e..42bf82209a6c8f8f22168dc9333e54831a3d8e89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,6 +63,7 @@ build windows:
   script:
     - $image_name = "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower())"
     - docker build --memory 10G -t "${image_name}:${CI_COMMIT_REF_NAME}-base-windows" windows/base
+    - docker tag "${image_name}:${CI_COMMIT_REF_NAME}-base-windows" "${image_name}:current-base-windows"
     - docker build --memory 15G -t "${image_name}:${CI_COMMIT_REF_NAME}-devel-windows" -f windows/devel/Dockerfile windows/devel
     - docker build --memory 15G -t "${image_name}:${CI_COMMIT_REF_NAME}-cuda-devel-windows" -f windows/cuda-devel/Dockerfile windows/cuda-devel
 
diff --git a/windows/cuda-devel/Dockerfile b/windows/cuda-devel/Dockerfile
index 360cf18773c3e2e1e182b79e9c1850cbf7b03de0..eddeb2ac7ea589f48730b8074a23d3c9bf200a3a 100644
--- a/windows/cuda-devel/Dockerfile
+++ b/windows/cuda-devel/Dockerfile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
-FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows
+FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:current-base-windows
 
 LABEL maintainer="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
 LABEL authors="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
diff --git a/windows/devel/Dockerfile b/windows/devel/Dockerfile
index 48a8b57bdb3cec7a0e78d08be6026d481216728f..0721d9eb8ee9f94576832bb135008c5afd270b85 100644
--- a/windows/devel/Dockerfile
+++ b/windows/devel/Dockerfile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
-FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows
+FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:current-base-windows
 
 LABEL maintainer="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
 LABEL authors="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"