diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 5318f73..8c668c5 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -15,7 +15,7 @@ env:
 jobs:
   build:
     name: "Build on x64"
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: "Checkout"  
         uses: actions/checkout@v4
@@ -24,14 +24,16 @@ jobs:
       - name: "Setup Environment"
         run: |
           mkdir build
-          sudo add-apt-repository universe
-          sudo apt-get update -y
-          sudo apt-get install firefox g++-14 gcc-14 xdg-user-dirs gettext tzdata locales -y
+          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" 
+          sudo apt-get install firefox xdg-user-dirs xdg-user-dirs-gtk gettext tzdata locales -y
+          brew install gcc cmake
           xdg-user-dirs-update
+          xdg-user-dirs-gtk-update
           sudo locale-gen en_US.UTF-8
           sudo update-locale LANG=en_US.UTF-8
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100
-          sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
+          sudo update-alternatives --install /usr/bin/gcc gcc /home/linuxbrew/.linuxbrew/bin/gcc-14 100
+          sudo update-alternatives --install /usr/bin/g++ g++ /home/linuxbrew/.linuxbrew/bin/g++-14 100
+          sudo update-alternatives --install /usr/bin/cmake cmake /home/linuxbrew/.linuxbrew/bin/cmake 100
       - name: "Unlock Keyring"
         uses: t1m0thyj/unlock-keyring@v1
       - name: "Vcpkg"
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 3945208..ad842f4 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -15,7 +15,7 @@ env:
 jobs:
   build:
     name: "Build on x64"
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       - name: "Checkout"  
         uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
       - name: "Build"
         working-directory: ${{github.workspace}}/build
         run: |
-          cmake -G "Visual Studio 16 2019" .. -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install
+          cmake -G "Visual Studio 17 2022" .. -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install
           cmake --build . --config Release
       - name: "Install"
         working-directory: ${{github.workspace}}/build