diff --git a/.github/workflows/build-test-and-push-windows-image.yml b/.github/workflows/build-test-and-push-windows-image.yml
index 368016d38..977aa1509 100644
--- a/.github/workflows/build-test-and-push-windows-image.yml
+++ b/.github/workflows/build-test-and-push-windows-image.yml
@@ -55,7 +55,7 @@ jobs:
           cl="$(echo "$INPUT_FEATURES" | jq -r '.[1].version')";
           cuda="$(echo "$INPUT_FEATURES" | jq -r '.[0].version')";
           version="$(git describe --abbrev=0 --tags --first-parent | sed 's/[a-zA-Z]//g' | cut -d '.' -f -2)";
-          base_tag="cuda${cuda}-cl${cl}";
+          base_tag="cl${cl}-cuda${cuda}";
           tag_without_os="${version}-${base_tag}";
           cat <<EOF | tee "$GITHUB_OUTPUT"
           cl=${cl}
diff --git a/windows/.env b/windows/.env
index 90d148ca4..7a8363c84 100644
--- a/windows/.env
+++ b/windows/.env
@@ -1,4 +1,4 @@
-IMAGE_NAME=local:cudalatest-cllatest-windows2019
+IMAGE_NAME=local:cllatest-cudalatest-windows2019
 ISOLATION=hyperv
 MSVC_VER=17
 MSVC_COMPILER_VER=latest
diff --git a/windows/README.md b/windows/README.md
index 54fc23fa7..c9ddbe35c 100644
--- a/windows/README.md
+++ b/windows/README.md
@@ -40,7 +40,7 @@ Build desired configuration. Windows 2019 and Windows 2022 versions map to Windo
 
 Start up the container and mount workspace directories as needed.
 
-`$> docker run --mount type=bind,src="$(pwd)",dst="C:\thrust" -it local:windows-cuda-12.1-cl-14.36 powershell`
+`$> docker run --mount type=bind,src="$(pwd)",dst="C:\thrust" -it local:latest-cl14.36-cuda12.1-windows2019 powershell`
 
 ### Step 3 - Build your projects
 
diff --git a/windows/generate-image-name.ps1 b/windows/generate-image-name.ps1
index 722d58fcd..5e9b22faa 100644
--- a/windows/generate-image-name.ps1
+++ b/windows/generate-image-name.ps1
@@ -1,20 +1,20 @@
 # msvcVersion, cudaVersion, OS edition, isolation mode
 Param(
-    [Parameter(Mandatory=$true)]
+    [Parameter(Mandatory = $true)]
     [string]
     $clVersion,
-    [Parameter(Mandatory=$true)]
+    [Parameter(Mandatory = $true)]
     [string]
     $cudaVersion,
-    [Parameter(Mandatory=$true)]
+    [Parameter(Mandatory = $true)]
     [string]
     $edition,
-    [Parameter(Mandatory=$true)]
+    [Parameter(Mandatory = $true)]
     [string]
     $repo,
-    [Parameter(Mandatory=$false)]
+    [Parameter(Mandatory = $false)]
     [string]
-    $repoVersion="latest"
+    $repoVersion = "latest"
 )
 
-Write-Output "${repo}:${repoVersion}-cuda${cudaVersion}-cl${clVersion}-${edition}"
+Write-Output "${repo}:${repoVersion}-cl${clVersion}-cuda${cudaVersion}-${edition}"