diff --git a/images/ubuntu/templates/locals.ubuntu.pkr.hcl b/images/ubuntu/templates/locals.ubuntu.pkr.hcl
index 469493d3f..14fde5d90 100644
--- a/images/ubuntu/templates/locals.ubuntu.pkr.hcl
+++ b/images/ubuntu/templates/locals.ubuntu.pkr.hcl
@@ -1,7 +1,7 @@
 locals {
   image_properties_map = {
       "ubuntu22" = {
-            source_image_marketplace_sku = "canonical:0001-com-ubuntu-server-jammy:22_04-lts"
+            source_image_marketplace_sku = "canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2"
             os_disk_size_gb = 75
       },
       "ubuntu24" = {
diff --git a/images/windows/templates/locals.windows.pkr.hcl b/images/windows/templates/locals.windows.pkr.hcl
index 976b4ffb0..231c7634b 100644
--- a/images/windows/templates/locals.windows.pkr.hcl
+++ b/images/windows/templates/locals.windows.pkr.hcl
@@ -5,7 +5,7 @@ locals {
             os_disk_size_gb = 256
       },
       "win22" = {
-            source_image_marketplace_sku = "MicrosoftWindowsServer:WindowsServer:2022-Datacenter"
+            source_image_marketplace_sku = "MicrosoftWindowsServer:WindowsServer:2022-Datacenter-g2"
             os_disk_size_gb = 256
       },
       "win25" = {