diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
index b5624f8..bc59a09 100644
--- a/.github/workflows/build-ubuntu.yml
+++ b/.github/workflows/build-ubuntu.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         library_type: [static, shared, object]
-        os: [ubuntu-24.04, ubuntu-22.04]
+        os: [ubuntu-24.04, ubuntu-22.04, ubuntu-24.04-arm, ubuntu-22.04-arm]
 
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
@@ -41,6 +41,13 @@ jobs:
           echo "tcp_pubsub_library_type=OBJECT"  >> "$GITHUB_ENV"
           echo "package_postfix=object"       >> "$GITHUB_ENV"
         fi
+
+        # Get the ubuntu version
+        os_version=$(lsb_release -r | awk '{print $2}')
+        echo "os_name=ubuntu-${os_version}" >> "$GITHUB_ENV"
+
+        # Get cpu architecture for the package name (therefore the dpkg architecture, which differs from the arch architecture)
+        echo "cpu_architecture=$(dpkg --print-architecture)" >> "$GITHUB_ENV"
         
     - name: Checkout
       uses: actions/checkout@v4
@@ -90,7 +97,7 @@ jobs:
 
     - name: Rename .deb installer
       run: |
-        mv *.deb '${{ env.PROJECT_NAME }}-${{ env.CMAKE_PROJECT_VERSION }}-${{ matrix.os }}-${{ env.package_postfix }}.deb'
+        mv *.deb '${{ env.PROJECT_NAME }}-${{ env.CMAKE_PROJECT_VERSION }}-${{ env.os_name }}_${{ env.cpu_architecture }}-${{ env.package_postfix }}.deb'
       shell: bash
       working-directory: ${{github.workspace}}/_build/_package/
       if: ${{ matrix.library_type != 'object' }}
@@ -98,7 +105,7 @@ jobs:
     - name: Upload binaries
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.PROJECT_NAME }}-${{ env.CMAKE_PROJECT_VERSION }}-${{ matrix.os }}-${{ env.package_postfix }}
+        name: ${{ env.PROJECT_NAME }}-${{ env.CMAKE_PROJECT_VERSION }}-${{ env.os_name }}_${{ env.cpu_architecture }}-${{ env.package_postfix }}
         path: ${{github.workspace}}/_build/_package/*.deb
       if: ${{ matrix.library_type != 'object' }}
 
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index c31f3ac..ff04ae8 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -9,8 +9,8 @@ env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   INSTALL_PREFIX: _install
   PROJECT_NAME:   tcp_pubsub
-  VS_TOOLSET:     v141
-  VS_NAME:        vs2017
+  VS_TOOLSET:     v142
+  VS_NAME:        vs2019
 
 jobs:
   build-windows:
@@ -24,7 +24,7 @@ jobs:
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: windows-2019
+    runs-on: windows-2025
 
     steps:
 
@@ -62,7 +62,6 @@ jobs:
       shell: cmd
       run: |
            cmake -B ${{github.workspace}}/_build ^
-                 -G "Visual Studio 16 2019" ^
                  -A ${{ matrix.build_arch }} ^
                  -T ${{ env.VS_TOOLSET }} ^
                  -DTCP_PUBSUB_BUILD_SAMPLES=ON ^