diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 797bae2a972e3364931fc097d7ef930084f7b630..280634e5fc3dd92c5ba335356aba6c53d0c0fb52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,22 +23,22 @@ build ubuntu-18.04:
   after_script:
     - docker logout "${CI_REGISTRY}"
 
-build windows:
+build windows-1809:
   stage: build
-  tags: [ windows, shell ]
+  tags: [ windows1809, shell ]
   before_script:
     - echo "${CI_REGISTRY_PASSWORD}" | docker login -u "${CI_REGISTRY_USER}" "${CI_REGISTRY}" --password-stdin
-    - Copy-Item 'C:/Windows/System32/opengl32.dll' 'windows/opengl32.dll'
-    - Copy-Item 'C:/Windows/System32/glu32.dll' 'windows/glu32.dll'
-    - Copy-Item 'C:/Windows/System32/ddraw.dll' 'windows/ddraw.dll'
-    - Copy-Item 'C:/Windows/System32/nvcuda.dll' 'windows/nvcuda.dll'
+    - Copy-Item 'C:/Windows/System32/opengl32.dll' 'windows1809/opengl32.dll'
+    - Copy-Item 'C:/Windows/System32/glu32.dll' 'windows1809/glu32.dll'
+    - Copy-Item 'C:/Windows/System32/ddraw.dll' 'windows1809/ddraw.dll'
+    - Copy-Item 'C:/Windows/System32/nvcuda.dll' 'windows1809/nvcuda.dll'
   script:
-    - docker build --isolation process --memory 2G --pull -t "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):base-windows" windows/base
-    - docker push "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):base-windows"
-    - docker build --isolation process --memory 15G --pull -t "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):devel-windows" -f windows/devel/Dockerfile windows
-    - docker push "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):devel-windows"
-    - docker build --isolation process --memory 15G --pull -t "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):cuda-devel-windows" -f windows/cuda-devel/Dockerfile windows
-    - docker push "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):cuda-devel-windows"
+    - docker build --isolation process --memory 2G --pull -t "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):base-windows1809" windows1809/base
+    - docker push "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):base-windows1809"
+    - docker build --isolation process --memory 15G -t "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):devel-windows1809" -f windows1809/devel/Dockerfile windows1809
+    - docker push "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):devel-windows1809"
+    - docker build --isolation process --memory 15G -t "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):cuda-devel-windows1809" -f windows1809/cuda-devel/Dockerfile windows1809
+    - docker push "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):cuda-devel-windows1809"
   after_script:
     - docker logout "${CI_REGISTRY}"
 
diff --git a/windows/base/Dockerfile b/windows1809/base/Dockerfile
similarity index 99%
rename from windows/base/Dockerfile
rename to windows1809/base/Dockerfile
index 041f886b52fead6afd2e4459b1c7558a98dfe162..58293c7f06437f5472eb0f5b1250846ae6eb80da 100644
--- a/windows/base/Dockerfile
+++ b/windows1809/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet-framework:3.5-runtime-windowsservercore-ltsc2016
+FROM microsoft/dotnet-framework:3.5-runtime-windowsservercore-ltsc2019
 
 SHELL ["powershell", "-NoProfile", "-ExecutionPolicy Bypass", "-Command", "$ErrorActionPreference = 'Stop';"]
 
diff --git a/windows/base/Profile.ps1 b/windows1809/base/Profile.ps1
similarity index 100%
rename from windows/base/Profile.ps1
rename to windows1809/base/Profile.ps1
diff --git a/windows/base/qtifwsilent.qs b/windows1809/base/qtifwsilent.qs
similarity index 100%
rename from windows/base/qtifwsilent.qs
rename to windows1809/base/qtifwsilent.qs
diff --git a/windows/cuda-devel/Dockerfile b/windows1809/cuda-devel/Dockerfile
similarity index 99%
rename from windows/cuda-devel/Dockerfile
rename to windows1809/cuda-devel/Dockerfile
index f328440a4b2effad335adaeb4202c683cfcbdb7e..c1c5f3654de4bef0f4d5069733e7dba51ed59533 100644
--- a/windows/cuda-devel/Dockerfile
+++ b/windows1809/cuda-devel/Dockerfile
@@ -1,4 +1,4 @@
-FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows
+FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows1809
 
 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
     (New-Object Net.WebClient).DownloadFile('https://developer.nvidia.com/compute/cuda/10.1/Prod/network_installers/cuda_10.1.105_win10_network.exe', 'C:/cuda_10.1.105_win10_network.exe'); \
diff --git a/windows/devel/Dockerfile b/windows1809/devel/Dockerfile
similarity index 99%
rename from windows/devel/Dockerfile
rename to windows1809/devel/Dockerfile
index 665ac28d79f8b7e0aa7821fa2aff661a3e74fbda..7bd185eb21fe0bd0e76b1c638c08dc6f8a910d39 100644
--- a/windows/devel/Dockerfile
+++ b/windows1809/devel/Dockerfile
@@ -1,4 +1,4 @@
-FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows
+FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-windows1809
 
 COPY opengl32.dll C:/Windows/System32/opengl32.dll
 COPY glu32.dll C:/Windows/System32/glu32.dll