diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml
index 746b659b3a..cfa05a4b0d 100644
--- a/.github/workflows/master_build.yml
+++ b/.github/workflows/master_build.yml
@@ -197,10 +197,17 @@ jobs:
       shell: bash
 
     - name: Configure CMake
+      if: startsWith(matrix.os, 'Windows') == false
       shell: bash
            # This syntax requires CMake 3.23
       run: cmake --preset conan-${BUILD_TYPE,,} -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
 
+    - name: Configure CMake (Windows)
+      if: startsWith(matrix.os, 'Windows')
+      shell: bash
+           # This syntax requires CMake 3.23
+      run: cmake --preset conan-default -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
+
     - name: Build application
       working-directory: ${{runner.workspace}}/build
       shell: bash
diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index 6d273a2b51..36264416ce 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -61,7 +61,7 @@ jobs:
               runner: [self_hosted, type-cpx41, image-x86-app-docker-ce]
               arch: amd64
               build_type: full
-              qt_source: source
+              qt_source: system
               apt-dependencies: libxcb-glx0-dev # add missing dependencies to docker image when convenient
               image: docker.io/overte/overte-full-build:0.1.6-ubuntu-20.04-amd64
             # Android builds are currently failing
@@ -73,7 +73,7 @@ jobs:
               runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
               arch: aarch64
               build_type: full
-              qt_source: source
+              qt_source: system
               apt-dependencies: libxcb-glx0-dev # add missing dependencies to docker image when convenient
               image: docker.io/overte/overte-full-build:0.1.6-ubuntu-22.04-aarch64
         fail-fast: false
@@ -253,10 +253,17 @@ jobs:
       shell: bash
 
     - name: Configure CMake
+      if: startsWith(matrix.os, 'Windows') == false
       shell: bash
            # This syntax requires CMake 3.23
       run: cmake --preset conan-${BUILD_TYPE,,} $CMAKE_EXTRA
 
+    - name: Configure CMake (Windows)
+      if: startsWith(matrix.os, 'Windows')
+      shell: bash
+           # This syntax requires CMake 3.23
+      run: cmake --preset conan-default $CMAKE_EXTRA
+
     - name: Build Application
       if: matrix.build_type == 'full' || matrix.build_type == 'client'
       working-directory: build