diff --git a/.github/workflows/build-test-windows.yml b/.github/workflows/build-test-windows.yml
index 8d691d1c6..c119d475d 100644
--- a/.github/workflows/build-test-windows.yml
+++ b/.github/workflows/build-test-windows.yml
@@ -3,14 +3,14 @@ name: build-test-windows
 on:
   push:
     paths:
-      - "**/windows-2019/**"
-      - "**/windows-2022/**"
+      - "**/windowsservercore-2019/**"
+      - "**/windowsservercore-2022/**"
       - ".github/workflows/build-test-windows.yml"
 
   pull_request:
     paths:
-      - "**/windows-2019/**"
-      - "**/windows-2022/**"
+      - "**/windowsservercore-2019/**"
+      - "**/windowsservercore-2022/**"
       - ".github/workflows/build-test-windows.yml"
 
 jobs:
@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         version: [ "22.8.0" ]
-        variant: [ "windows-2019" ]
+        variant: [ "windowsservercore-2019" ]
 
     steps:
       - name: Get short node version
@@ -71,7 +71,7 @@ jobs:
       fail-fast: false
       matrix:
         version: [ "22.8.0" ]
-        variant: [ "windows-2022" ]
+        variant: [ "windowsservercore-2022" ]
 
     steps:
       - name: Get short node version
diff --git a/genMatrix.js b/genMatrix.js
index fd90954ac..30f1588e5 100644
--- a/genMatrix.js
+++ b/genMatrix.js
@@ -8,8 +8,8 @@ const testFiles = [
 ];
 
 const nodeDirRegex = /^\d+$/;
-// Directories starting with 'windows-' are excluded from the matrix windows-2019 are excluded for example
-const windowsDirRegex = /^windows-/;
+// Directories starting with 'windowsservercore-' are excluded from the matrix windows-2019 are excluded for example
+const windowsDirRegex = /^windowsservercore-/;
 
 const areTestFilesChanged = (changedFiles) => changedFiles
   .some((file) => testFiles.includes(file));
diff --git a/update.sh b/update.sh
index d66b5cec3..ea7698827 100755
--- a/update.sh
+++ b/update.sh
@@ -11,14 +11,14 @@ function usage() {
     $0 [-s] [-w] [MAJOR_VERSION(S)] [VARIANT(S)]
 
   Examples:
-    - update.sh                       # Update all images
-    - update.sh -s                    # Update all images, skip updating Alpine and Yarn
-    - update.sh -w                    # Update only Windows images
-    - update.sh 8,10                  # Update all variants of version 8 and 10
-    - update.sh -s 8                  # Update version 8 and variants, skip updating Alpine and Yarn
-    - update.sh 8 alpine              # Update only Alpine variants for version 8
-    - update.sh -w 8 windows-2022     # Update only Windows 2022 variant for version 8
-    - update.sh . alpine              # Update the Alpine variant for all versions
+    - update.sh                                 # Update all images
+    - update.sh -s                              # Update all images, skip updating Alpine and Yarn
+    - update.sh -w                              # Update only Windows images
+    - update.sh 8,10                            # Update all variants of version 8 and 10
+    - update.sh -s 8                            # Update version 8 and variants, skip updating Alpine and Yarn
+    - update.sh 8 alpine                        # Update only Alpine variants for version 8
+    - update.sh -w 8 windowsservercore-2022     # Update only Windows Server Core 2022 variant for version 8
+    - update.sh . alpine                        # Update the Alpine variant for all versions
 
   OPTIONS:
     -s Security update; skip updating the Yarn and Alpine versions.