diff --git a/images/ubuntu/templates/locals.ubuntu.pkr.hcl b/images/ubuntu/templates/locals.ubuntu.pkr.hcl
index 14fde5d90..0c62430a5 100644
--- a/images/ubuntu/templates/locals.ubuntu.pkr.hcl
+++ b/images/ubuntu/templates/locals.ubuntu.pkr.hcl
@@ -5,7 +5,7 @@ locals {
             os_disk_size_gb = 75
       },
       "ubuntu24" = {
-            source_image_marketplace_sku = "canonical:ubuntu-24_04-lts:server-gen1"
+            source_image_marketplace_sku = "canonical:ubuntu-24_04-lts:server"
             os_disk_size_gb = 75
       }
   }
diff --git a/images/windows/templates/locals.windows.pkr.hcl b/images/windows/templates/locals.windows.pkr.hcl
index 231c7634b..d7f8e8658 100644
--- a/images/windows/templates/locals.windows.pkr.hcl
+++ b/images/windows/templates/locals.windows.pkr.hcl
@@ -9,7 +9,7 @@ locals {
             os_disk_size_gb = 256
       },
       "win25" = {
-            source_image_marketplace_sku = "MicrosoftWindowsServer:WindowsServer:2025-Datacenter"
+            source_image_marketplace_sku = "MicrosoftWindowsServer:WindowsServer:2025-Datacenter-g2"
             os_disk_size_gb = 150
       }
   }