diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e75d1943..5cb745a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,7 @@ build:shared_windows_release:
         - aqt install-qt -O ../aqt windows desktop $QT_VERSION win64_msvc2019_64 -m all
         - aqt install-tool -O ../aqt windows desktop tools_ifw
         - cd Tools
-        - python setup.py
+        - python setup.py --windows-shared-gitlab-ci
         - python build.py -type release -use-aqt -installer
     artifacts:
         expire_in: "4 weeks"
diff --git a/Tools/setup.py b/Tools/setup.py
index 4f85f8c5..b3f34f3d 100755
--- a/Tools/setup.py
+++ b/Tools/setup.py
@@ -52,6 +52,8 @@ if __name__ == "__main__":
     parser.add_argument(
         '--path', help='Manually set the vcpkg path. The path must be an absolute path \
 without the ScreenPlay-vcpkg folder (E.g. py .\setup.py --path "D:/Backup/Code/Qt/")')
+    parser.add_argument('--windows-shared-gitlab-ci', action='store_true',
+    help="Perform fixes for shared GitLab runner, you normally don't need to use this.")
     args = parser.parse_args()
 
     # ScreenPlay source and ScreenPlay-vcpkg have to be on the same file system hierarchy
@@ -80,12 +82,12 @@ without the ScreenPlay-vcpkg folder (E.g. py .\setup.py --path "D:/Backup/Code/Q
     if system() == "Windows":
         vcpkg_command = "vcpkg.exe"
         vcpkg_packages_list.append("infoware[d3d]")
-        if shutil.which("pwsh"):
-            print("Using experimental pwsh, may not work properly.")
-            platform_command.add("pwsh.exe -NoProfile -ExecutionPolicy Bypass .\scripts\\bootstrap.ps1", vcpkg_path)
+        if shutil.which("pwsh") and args.windows_shared_gitlab_ci:
+            print("Using experimental pwsh for GitLab CI, may not work properly.")
+            platform_command.add("pwsh.exe -NoProfile -ExecutionPolicy Bypass .\\scripts\\bootstrap.ps1", vcpkg_path)
         else:
             platform_command.add("bootstrap-vcpkg.bat", vcpkg_path, False)
-        platform_command.add("download_ffmpeg.bat", project_source_path.joinpath("Tools"), False)
+            platform_command.add("download_ffmpeg.bat", project_source_path.joinpath("Tools"), False)
         vcpkg_triplet = "x64-windows"
     elif system() == "Darwin":
         vcpkg_command = "./vcpkg"