diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index 3ffc73cd..885b0f9e 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -62,15 +62,15 @@ jobs:
 
       - name: Cache Qt
         id: cache-qt
-        uses: actions/cache@v1  # not v2!
+        uses: actions/cache@v4
         with:
           path: ../Qt
-          key: ${{ runner.os }}-QtCache-6.5
+          key: ${{ runner.os }}-QtCache-6.8
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.5.3
+          version: 6.8.3
           target: desktop
           modules: 'qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat qtserialport'
           tools: 'tools_opensslv3_src'
@@ -114,6 +114,8 @@ jobs:
 
       - name: Build Project
         run: |
+          # Remove the libqsqlmimer.so as libmimerapi.so is not deployed with Qt6
+          rm ${{runner.workspace}}/Qt/6.*/gcc_64/plugins/sqldrivers/libqsqlmimer.so
           cmake --build . --target pack
         working-directory: ${{runner.workspace}}/build
 
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
index 521d2b9f..f3d3ec2b 100644
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -31,7 +31,7 @@ jobs:
           - name: "Build on Arm64"
             os: macos-latest
             arch: universal
-            qt: 6.5.3
+            qt: 6.8.3
 
     runs-on: ${{matrix.config.os}}
 
@@ -81,10 +81,10 @@ jobs:
 
       - name: Cache Qt
         id: cache-qt
-        uses: actions/cache@v1  # not v2!
+        uses: actions/cache@v4
         with:
           path: ../Qt
-          key: ${{ runner.os }}-QtCache-6.5
+          key: ${{ runner.os }}-QtCache-6.8
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml
index 1d8214d5..fa849a41 100644
--- a/.github/workflows/ci-win.yml
+++ b/.github/workflows/ci-win.yml
@@ -21,7 +21,7 @@ env:
 jobs:
   build:
     name: ${{ matrix.config.name }}
-    runs-on: windows-2019
+    runs-on: windows-${{ matrix.config.vs_version }}
     timeout-minutes: 120
 
     strategy:
@@ -30,14 +30,18 @@ jobs:
         config:
           - name: "Build on Win64 Qt 5.15"
             arch: win64_msvc2019_64
+            vs_version: 2019
+            vs_cmd: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
             qt: 5.15.2
             qt_modules: qtwebengine
             qt_tools: tools_opensslv3_x64
             qt_major: 5
             suffix: "-windows7"
-          - name: "Build on Win64 Qt 6.5"
-            arch: win64_msvc2019_64
-            qt: 6.5.3
+          - name: "Build on Win64 Qt 6"
+            arch: win64_msvc2022_64
+            vs_version: 2022
+            vs_cmd: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat"
+            qt: 6.8.3
             qt_modules: "qtwebengine qtwebchannel qtpositioning qtpdf qtimageformats qt5compat"
             qt_tools: tools_opensslv3_x64
             qt_major: 6
@@ -58,7 +62,7 @@ jobs:
 
       - name: Cache Qt
         id: cache-qt
-        uses: actions/cache@v1  # not v2!
+        uses: actions/cache@v4
         with:
           path: ../Qt
           key: ${{runner.os}}-${{matrix.config.arch}}-QtCache-${{matrix.config.qt}}
@@ -94,7 +98,7 @@ jobs:
         shell: cmd
         run: |
           cmake --version
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+          call "${{matrix.config.vs_cmd}}"
           cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DQT_DEFAULT_MAJOR_VERSION=${{matrix.config.qt_major}} -DOPENSSL_EXTRA_LIB_DIR=${{runner.workspace}}\build\openssl-utils.git\1.1.1j\Win_x64 %GITHUB_WORKSPACE%
           cmake --build .
           cmake --build . --target=pack