diff --git a/.github/workflows/cmake-lx.yml b/.github/workflows/cmake-lx.yml
index 5242f6dd..53ec5b62 100644
--- a/.github/workflows/cmake-lx.yml
+++ b/.github/workflows/cmake-lx.yml
@@ -1,4 +1,4 @@
-name: CMake Linux
+name: Linux build
 
 on: [push, pull_request]
 
@@ -12,6 +12,7 @@ jobs:
     # 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/actions/configuring-and-managing-workflows/configuring-a-workflow#configuring-a-build-matrix
+    name: CMake, Ubuntu
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/vs-win.yml b/.github/workflows/vs-win.yml
index 7efbf7ae..4ee09106 100644
--- a/.github/workflows/vs-win.yml
+++ b/.github/workflows/vs-win.yml
@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: Windows VS 2017
+name: Windows build
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the master branch
@@ -10,6 +10,8 @@ on: [push, pull_request]
 jobs:
   # This workflow contains a single job called "build"
   build:
+    name: VS 2017
+    
     # The type of runner that the job will run on
     runs-on: windows-2016
 
@@ -26,15 +28,6 @@ jobs:
         shell: cmd
         run: powershell -ExecutionPolicy Bypass -NoProfile -File .\build.ps1 Init
 
-      - name: Generate Build Files for Jansson 
-        working-directory: ${{github.workspace}}
-        shell: cmd
-        run: |
-          cd dependencies\jansson\
-          mkdir build
-          cd build
-          cmake .. -DJANSSON_BUILD_SHARED_LIBS=ON -DJANSSON_EXAMPLES=OFF -DJANSSON_BUILD_DOCS=OFF -G "Visual Studio 15 2017" -T "v141_xp"
-
       # Runs a single command using the runners shell
       - name: Build
         shell: cmd
diff --git a/build.ps1 b/build.ps1
index 720a0a53..93b7190c 100644
--- a/build.ps1
+++ b/build.ps1
@@ -101,7 +101,7 @@ function Init
     cd dependencies\jansson\
     mkdir build
     cd build
-    cmake .. -DJANSSON_BUILD_SHARED_LIBS=ON -DJANSSON_EXAMPLES=OFF -DJANSSON_BUILD_DOCS=OFF -G "Visual Studio 15 2017" -T "v141_xp"
+    cmake .. -DJANSSON_BUILD_SHARED_LIBS=ON -DJANSSON_EXAMPLES=OFF -DJANSSON_BUILD_DOCS=OFF -A "Win32" -T "v141_xp"
     cd ..\..\..
 }