diff --git a/.cirrus.yml b/.cirrus.yml
index 36fe43a80..3737c2baf 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -320,6 +320,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - clang --version
     - find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
     - sudo xcode-select -p
+    - xcrun --show-sdk-path -sdk macosx
     # Decode the environment variable into a regular .p12 file
     - echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
     # We need to create a new keychain, otherwise using the certificate will prompt
@@ -386,9 +387,9 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - conan profile update settings.os=Macos valentina
     - conan profile update settings.os.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
     - conan profile update settings.arch=armv8 valentina
-    - conan profile update settings.compiler=clang valentina
+    - conan profile update settings.compiler=apple-clang valentina
     - conan profile update settings.compiler.cppstd=17 valentina
-    - conan profile update settings.compiler.libcxx=libstdc++11 valentina
+    - conan profile update settings.compiler.libcxx=libc++ valentina
     - conan profile update settings.compiler.version=15 valentina
     - qbs setup-toolchains --detect
     - qbs config --list profiles
diff --git a/appveyor.yml b/appveyor.yml
index ed55340b7..a4a6fa238 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -414,7 +414,7 @@ for:
   deploy_script:
     - ps: |
         if ($env:WITH_CRASH_REPORTING -eq "True") {
-          $qmakeOutput = %QTDIR%\bin\%QMAKE% -query QT_VERSION
+          $qmakeOutput = $env:QTDIR\bin\$env:QMAKE -query QT_VERSION
           $majorMinorVersion = $qmakeOutput -replace '\D+(\d+)\.(\d+).*', '$1_$2'
           $env:CRASH_QT_VERSION = $majorMinorVersion
 
@@ -561,6 +561,7 @@ for:
     - sudo xcode-select -p
     - sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
     - sudo xcode-select -p
+    - xcrun --show-sdk-path -sdk macosx
     # Decode the environment variable into a regular .p12 file
     - echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
     # We need to create a new keychain, otherwise using the certificate will prompt
@@ -761,6 +762,7 @@ for:
     - sudo xcode-select -p
     - sudo xcode-select -s /Applications/Xcode-$XCODE_VERSION.app
     - sudo xcode-select -p
+    - xcrun --show-sdk-path -sdk macosx
     # Decode the environment variable into a regular .p12 file
     - echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
     # We need to create a new keychain, otherwise using the certificate will prompt