diff --git a/config/win10-64-2009-alpha.yaml b/config/win10-64-2009-alpha.yaml
index b9ce9d7..3364da4 100644
--- a/config/win10-64-2009-alpha.yaml
+++ b/config/win10-64-2009-alpha.yaml
@@ -4,8 +4,8 @@ image:
   offer: Windows-10
   sku: win10-22h2-avd
   version: latest
-  gallery_name: "ronin_t_windows10_64_2009_alpha"
-  image_name: "win10-64-2009-alpha"
+  gallery_name: "win10_64_2009_alpha"
+  image_name: "win10_64_2009_alpha"
   image_version: 1.0.0
 azure:
   managed_image_resource_group_name: rg-packer-through-cib
diff --git a/config/win10-64-2009.yaml b/config/win10-64-2009.yaml
index 5f4391e..1e9cb1f 100644
--- a/config/win10-64-2009.yaml
+++ b/config/win10-64-2009.yaml
@@ -5,8 +5,8 @@ image:
   sku: win10-22h2-avd
   version: latest
 sharedimage:
-  gallery_name: "ronin_t_windows10_64_2009_prod"
-  image_name: "win10-64-2009"
+  gallery_name: "win10_64_2009"
+  image_name: "win10_64_2009"
   image_version: 1.0.0
 azure:
   managed_image_resource_group_name: rg-packer-through-cib
diff --git a/config/win11-64-2009-alpha.yaml b/config/win11-64-2009-alpha.yaml
index 2884781..2cb7333 100644
--- a/config/win11-64-2009-alpha.yaml
+++ b/config/win11-64-2009-alpha.yaml
@@ -5,8 +5,8 @@ image:
   sku: win11-22h2-avd
   version: latest
 sharedimage:
-  gallery_name: "ronin_t_windows11_64_2009_alpha"
-  image_name: "win11-64-2009-alpha"
+  gallery_name: "win11_64_2009_alpha"
+  image_name: "win11_64_2009_alpha"
   image_version: 1.0.0
 azure:
   managed_image_resource_group_name: rg-packer-through-cib
diff --git a/config/win11-64-2009.yaml b/config/win11-64-2009.yaml
index 8c9e8b5..2125b16 100644
--- a/config/win11-64-2009.yaml
+++ b/config/win11-64-2009.yaml
@@ -4,8 +4,8 @@ image:
   offer: Windows-11
   sku: win11-22h2-avd
   version: latest
-  gallery_name: "ronin_t_windows11_64_2009_prod"
-  image_name: "win11-64-2009"
+  gallery_name: "win11_64_2009"
+  image_name: "win11_64_2009"
   image_version: 1.0.0
 azure:
   managed_image_resource_group_name: rg-packer-through-cib