diff --git a/.github/workflows/buildandruntests.yml b/.github/workflows/buildandruntests.yml
index 182dae81f..6360c695e 100644
--- a/.github/workflows/buildandruntests.yml
+++ b/.github/workflows/buildandruntests.yml
@@ -20,8 +20,8 @@ defaults:
 jobs:
   build:
 
-    name: Prepare and build on Windows Server 2016 VM
-    runs-on: windows-2019
+    name: Prepare and build on Windows Server VM
+    runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
 
diff --git a/.github/workflows/buildandruntestslinux.yml b/.github/workflows/buildandruntestslinux.yml
index fba4fb362..0aa9ef3a9 100644
--- a/.github/workflows/buildandruntestslinux.yml
+++ b/.github/workflows/buildandruntestslinux.yml
@@ -1,4 +1,4 @@
-name: Build & Run all tests on Ubuntu (release)
+name: Build & Run all tests on Ubuntu (release)
 
 on:
   workflow_dispatch:
@@ -14,7 +14,7 @@ defaults:
 jobs:
   build:
 
-    name: Prepare and build on Ubuntu
+    name: Prepare and build on Ubuntu VM
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2