diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a06afd63d4f4764adb40b266ce6e97c90c63807..f8e00254341babc59c5678063b7c11c27fcceee3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,20 +37,20 @@ build windows-1809:
   tags: [ windows-1809, shell ]
   before_script:
     - echo "${CI_REGISTRY_PASSWORD}" | docker login -u "${CI_REGISTRY_USER}" "${CI_REGISTRY}" --password-stdin
-    - Copy-Item 'C:/Windows/System32/opengl32.dll' 'windows1809/devel/opengl32.dll'
-    - Copy-Item 'C:/Windows/System32/glu32.dll' 'windows1809/devel/glu32.dll'
-    - Copy-Item 'C:/Windows/System32/ddraw.dll' 'windows1809/devel/ddraw.dll'
-    - Copy-Item 'C:/Windows/System32/opengl32.dll' 'windows1809/cuda-devel/opengl32.dll'
-    - Copy-Item 'C:/Windows/System32/glu32.dll' 'windows1809/cuda-devel/glu32.dll'
-    - Copy-Item 'C:/Windows/System32/ddraw.dll' 'windows1809/cuda-devel/ddraw.dll'
-    - Copy-Item 'C:/Windows/System32/nvcuda.dll' 'windows1809/cuda-devel/nvcuda.dll'
+    - Copy-Item 'C:/Windows/System32/opengl32.dll' 'windows-1809/devel/opengl32.dll'
+    - Copy-Item 'C:/Windows/System32/glu32.dll' 'windows-1809/devel/glu32.dll'
+    - Copy-Item 'C:/Windows/System32/ddraw.dll' 'windows-1809/devel/ddraw.dll'
+    - Copy-Item 'C:/Windows/System32/opengl32.dll' 'windows-1809/cuda-devel/opengl32.dll'
+    - Copy-Item 'C:/Windows/System32/glu32.dll' 'windows-1809/cuda-devel/glu32.dll'
+    - Copy-Item 'C:/Windows/System32/ddraw.dll' 'windows-1809/cuda-devel/ddraw.dll'
+    - Copy-Item 'C:/Windows/System32/nvcuda.dll' 'windows-1809/cuda-devel/nvcuda.dll'
   script:
-    - docker build --isolation process --memory 2G -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/devel
-    - 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/cuda-devel
-    - docker push "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):cuda-devel-windows1809"
+    - docker build --isolation process --memory 2G -t "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):base-windows-1809" windows-1809/base
+    - docker push "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):base-windows-1809"
+    - docker build --isolation process --memory 15G -t "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):devel-windows-1809" -f windows-1809/devel/Dockerfile windows-1809/devel
+    - docker push "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):devel-windows-1809"
+    - docker build --isolation process --memory 15G -t "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):cuda-devel-windows-1809" -f windows-1809/cuda-devel/Dockerfile windows-1809/cuda-devel
+    - docker push "${CI_REGISTRY}/$(${CI_PROJECT_PATH}.toLower()):cuda-devel-windows-1809"
   after_script:
     - docker logout "${CI_REGISTRY}"
 
diff --git a/windows1809/base/Dockerfile b/windows-1809/base/Dockerfile
similarity index 100%
rename from windows1809/base/Dockerfile
rename to windows-1809/base/Dockerfile
diff --git a/windows1809/base/powershell/00-Must-Run.ps1 b/windows-1809/base/powershell/00-Must-Run.ps1
similarity index 100%
rename from windows1809/base/powershell/00-Must-Run.ps1
rename to windows-1809/base/powershell/00-Must-Run.ps1
diff --git a/windows1809/base/powershell/10-VSDevEnv.ps1 b/windows-1809/base/powershell/10-VSDevEnv.ps1
similarity index 100%
rename from windows1809/base/powershell/10-VSDevEnv.ps1
rename to windows-1809/base/powershell/10-VSDevEnv.ps1
diff --git a/windows1809/base/powershell/20-MSVC-15.9.ps1 b/windows-1809/base/powershell/20-MSVC-15.9.ps1
similarity index 100%
rename from windows1809/base/powershell/20-MSVC-15.9.ps1
rename to windows-1809/base/powershell/20-MSVC-15.9.ps1
diff --git a/windows1809/base/powershell/Profile.ps1 b/windows-1809/base/powershell/Profile.ps1
similarity index 100%
rename from windows1809/base/powershell/Profile.ps1
rename to windows-1809/base/powershell/Profile.ps1
diff --git a/windows1809/base/qtifwsilent.qs b/windows-1809/base/qtifwsilent.qs
similarity index 100%
rename from windows1809/base/qtifwsilent.qs
rename to windows-1809/base/qtifwsilent.qs
diff --git a/windows1809/cuda-devel/Dockerfile b/windows-1809/cuda-devel/Dockerfile
similarity index 100%
rename from windows1809/cuda-devel/Dockerfile
rename to windows-1809/cuda-devel/Dockerfile
diff --git a/windows1809/cuda-devel/powershell/30-Vcpkg-CMake.ps1 b/windows-1809/cuda-devel/powershell/30-Vcpkg-CMake.ps1
similarity index 100%
rename from windows1809/cuda-devel/powershell/30-Vcpkg-CMake.ps1
rename to windows-1809/cuda-devel/powershell/30-Vcpkg-CMake.ps1
diff --git a/windows1809/devel/Dockerfile b/windows-1809/devel/Dockerfile
similarity index 100%
rename from windows1809/devel/Dockerfile
rename to windows-1809/devel/Dockerfile
diff --git a/windows1809/devel/powershell/30-Vcpkg-CMake.ps1 b/windows-1809/devel/powershell/30-Vcpkg-CMake.ps1
similarity index 100%
rename from windows1809/devel/powershell/30-Vcpkg-CMake.ps1
rename to windows-1809/devel/powershell/30-Vcpkg-CMake.ps1