diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2b99e00..d167c8d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -469,47 +469,34 @@ tumbleweed/static-analysis:
   variables:
     ErrorActionPreference: STOP
   script:
-  - $env:VCPKG_DEFAULT_TRIPLET="x64-windows"
-  - mkdir -p obj; if ($?) {cd obj}; if (! $?) {exit 1}
-  - cmake
-      -A x64
-      -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_TOOLCHAIN_FILE"
-      -DPICKY_DEVELOPER=ON
-      -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON -DWITH_PCAP=ON
-      -DUNIT_TESTING=ON ..
-  - cmake --build .
-  - ctest --output-on-failure
+    - cmake --build .
+    - ctest --output-on-failure
   tags:
-  - windows
-  - shared-windows
+    - windows
+    - shared-windows
   except:
-  - tags
+    - tags
   artifacts:
     expire_in: 1 week
     when: on_failure
     paths:
       - obj/
   before_script:
-  - choco install --no-progress -y cmake
-  - $env:Path += ';C:\Program Files\CMake\bin'
-  - If (!(test-path .vcpkg\archives)) { mkdir -p .vcpkg\archives }
-  - $env:VCPKG_DEFAULT_BINARY_CACHE="$PWD\.vcpkg\archives"
-  - echo $env:VCPKG_DEFAULT_BINARY_CACHE
-  - $env:VCPKG_DEFAULT_TRIPLET="$TRIPLET-windows"
-  - vcpkg install cmocka
-  - vcpkg install openssl
-  - vcpkg install zlib
-  - vcpkg integrate install
-  - mkdir -p obj; if ($?) {cd obj}; if (! $?) {exit 1}
-  - cmake
-      -A $PLATFORM
-      -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
-      -DPICKY_DEVELOPER=ON
-      -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON -DWITH_PCAP=ON
-      -DUNIT_TESTING=ON ..
-  # The Windows runners are broken for last month
-  # https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/gcp/windows-containers/-/issues/40
-  allow_failure: true
+    - If (!(test-path .vcpkg\archives)) { mkdir -p .vcpkg\archives }
+    - $env:VCPKG_DEFAULT_BINARY_CACHE="$PWD\.vcpkg\archives"
+    - echo $env:VCPKG_DEFAULT_BINARY_CACHE
+    - $env:VCPKG_DEFAULT_TRIPLET="$TRIPLET-windows"
+    - vcpkg install cmocka
+    - vcpkg install openssl
+    - vcpkg install zlib
+    - vcpkg integrate install
+    - mkdir -p obj; if ($?) {cd obj}; if (! $?) {exit 1}
+    - cmake
+        -A $PLATFORM
+        -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
+        -DPICKY_DEVELOPER=ON
+        -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON -DWITH_PCAP=ON
+        -DUNIT_TESTING=ON ..
 
 visualstudio/x86_64:
   extends: .vs