diff --git a/quickstart/101-vm-cluster-linux/main.tf b/quickstart/101-vm-cluster-linux/main.tf
index d1a7cc08d..0131a19fb 100644
--- a/quickstart/101-vm-cluster-linux/main.tf
+++ b/quickstart/101-vm-cluster-linux/main.tf
@@ -95,8 +95,8 @@ resource "azurerm_linux_virtual_machine" "test" {
 
   source_image_reference {
     publisher = "Canonical"
-    offer     = "UbuntuServer"
-    sku       = "16.04-LTS"
+    offer     = "ubuntu-24_04-lts"
+    sku       = "server-gen1"
     version   = "latest"
   }
 
diff --git a/quickstart/201-machine-learning-moderately-secure/compute.tf b/quickstart/201-machine-learning-moderately-secure/compute.tf
index e5be7fbb8..2123118dc 100644
--- a/quickstart/201-machine-learning-moderately-secure/compute.tf
+++ b/quickstart/201-machine-learning-moderately-secure/compute.tf
@@ -3,7 +3,7 @@ resource "random_string" "ci_prefix" {
   length  = 8
   upper   = false
   special = false
-  number  = false
+  numeric  = false
 }
 
 # Compute instance
diff --git a/quickstart/201-vmss-jumpbox/main.tf b/quickstart/201-vmss-jumpbox/main.tf
index d4196ab73..12f36349f 100644
--- a/quickstart/201-vmss-jumpbox/main.tf
+++ b/quickstart/201-vmss-jumpbox/main.tf
@@ -27,7 +27,7 @@ resource "random_string" "fqdn" {
   length  = 6
   special = false
   upper   = false
-  number  = false
+  numeric  = false
 }
 
 resource "azurerm_virtual_network" "vmss" {
@@ -105,8 +105,8 @@ resource "azurerm_virtual_machine_scale_set" "vmss" {
 
   storage_profile_image_reference {
     publisher = "Canonical"
-    offer     = "UbuntuServer"
-    sku       = "16.04-LTS"
+    offer     = "ubuntu-24_04-lts"
+    sku       = "server-gen1"
     version   = "latest"
   }
 
@@ -183,8 +183,8 @@ resource "azurerm_virtual_machine" "jumpbox" {
 
   storage_image_reference {
     publisher = "Canonical"
-    offer     = "UbuntuServer"
-    sku       = "16.04-LTS"
+    offer     = "ubuntu-24_04-lts"
+    sku       = "server-gen1"
     version   = "latest"
   }
 
diff --git a/quickstart/201-vmss-packer-jumpbox/main.tf b/quickstart/201-vmss-packer-jumpbox/main.tf
index 8525398a3..564c9038c 100644
--- a/quickstart/201-vmss-packer-jumpbox/main.tf
+++ b/quickstart/201-vmss-packer-jumpbox/main.tf
@@ -233,8 +233,8 @@ resource "azurerm_virtual_machine" "jumpbox" {
 
   storage_image_reference {
     publisher = "Canonical"
-    offer     = "UbuntuServer"
-    sku       = "16.04-LTS"
+    offer     = "ubuntu-24_04-lts"
+    sku       = "server-gen1"
     version   = "latest"
   }
 
diff --git a/quickstart/201-vmss-packer-jumpbox/ubuntu.pkr.hcl b/quickstart/201-vmss-packer-jumpbox/ubuntu.pkr.hcl
index 7cd055cf8..75e5f0813 100644
--- a/quickstart/201-vmss-packer-jumpbox/ubuntu.pkr.hcl
+++ b/quickstart/201-vmss-packer-jumpbox/ubuntu.pkr.hcl
@@ -38,9 +38,9 @@ variable "image_resource_group_name" {
 source "azure-arm" "builder" {
   client_id                         = var.client_id
   client_secret                     = var.client_secret
-  image_offer                       = "UbuntuServer"
-  image_publisher                   = "canonical"
-  image_sku                         = "16.04-LTS"
+  image_offer                       = "ubuntu-24_04-lts"
+  image_publisher                   = "Canonical"
+  image_sku                         = "server-gen1"
   location                          = var.location
   managed_image_name                = "myPackerImage"
   managed_image_resource_group_name = var.image_resource_group_name
diff --git a/quickstart/301-hub-spoke/hub-nva.tf b/quickstart/301-hub-spoke/hub-nva.tf
index 31c8ff30b..6d13d8dab 100644
--- a/quickstart/301-hub-spoke/hub-nva.tf
+++ b/quickstart/301-hub-spoke/hub-nva.tf
@@ -40,8 +40,8 @@ resource "azurerm_virtual_machine" "hub-nva-vm" {
 
     storage_image_reference {
     publisher = "Canonical"
-    offer     = "UbuntuServer"
-    sku       = "16.04-LTS"
+    offer     = "ubuntu-24_04-lts"
+    sku       = "server-gen1"
     version   = "latest"
     }
 
diff --git a/quickstart/301-hub-spoke/hub-vnet.tf b/quickstart/301-hub-spoke/hub-vnet.tf
index cd51c9903..f80075849 100644
--- a/quickstart/301-hub-spoke/hub-vnet.tf
+++ b/quickstart/301-hub-spoke/hub-vnet.tf
@@ -69,8 +69,8 @@ resource "azurerm_virtual_machine" "hub-vm" {
 
     storage_image_reference {
     publisher = "Canonical"
-    offer     = "UbuntuServer"
-    sku       = "16.04-LTS"
+    offer     = "ubuntu-24_04-lts"
+    sku       = "server-gen1"
     version   = "latest"
     }
 
diff --git a/quickstart/301-hub-spoke/on-prem.tf b/quickstart/301-hub-spoke/on-prem.tf
index fe7fa9a6a..7fbb69032 100644
--- a/quickstart/301-hub-spoke/on-prem.tf
+++ b/quickstart/301-hub-spoke/on-prem.tf
@@ -96,8 +96,8 @@ resource "azurerm_virtual_machine" "onprem-vm" {
 
     storage_image_reference {
     publisher = "Canonical"
-    offer     = "UbuntuServer"
-    sku       = "16.04-LTS"
+    offer     = "ubuntu-24_04-lts"
+    sku       = "server-gen1"
     version   = "latest"
     }
 
diff --git a/quickstart/301-hub-spoke/spoke1.tf b/quickstart/301-hub-spoke/spoke1.tf
index adb36d420..66f022689 100644
--- a/quickstart/301-hub-spoke/spoke1.tf
+++ b/quickstart/301-hub-spoke/spoke1.tf
@@ -69,8 +69,8 @@ resource "azurerm_virtual_machine" "spoke1-vm" {
 
     storage_image_reference {
     publisher = "Canonical"
-    offer     = "UbuntuServer"
-    sku       = "16.04-LTS"
+    offer     = "ubuntu-24_04-lts"
+    sku       = "server-gen1"
     version   = "latest"
     }
 
diff --git a/quickstart/301-hub-spoke/spoke2.tf b/quickstart/301-hub-spoke/spoke2.tf
index bfb114017..af2235d72 100644
--- a/quickstart/301-hub-spoke/spoke2.tf
+++ b/quickstart/301-hub-spoke/spoke2.tf
@@ -73,8 +73,8 @@ resource "azurerm_virtual_machine" "spoke2-vm" {
 
     storage_image_reference {
     publisher = "Canonical"
-    offer     = "UbuntuServer"
-    sku       = "16.04-LTS"
+    offer     = "ubuntu-24_04-lts"
+    sku       = "server-gen1"
     version   = "latest"
     }
 
diff --git a/quickstart/301-machine-learning-hub-spoke-secure/azure-firewall.tf b/quickstart/301-machine-learning-hub-spoke-secure/azure-firewall.tf
index 6293ab1cb..11117be14 100644
--- a/quickstart/301-machine-learning-hub-spoke-secure/azure-firewall.tf
+++ b/quickstart/301-machine-learning-hub-spoke-secure/azure-firewall.tf
@@ -3,7 +3,7 @@ resource "random_string" "fw_diag_prefix" {
   length  = 8
   upper   = false
   special = false
-  number  = false
+  numeric  = false
 }
 resource "azurerm_ip_group" "ip_group_hub" {
   name                = "hub-ipgroup"
diff --git a/quickstart/301-machine-learning-hub-spoke-secure/compute.tf b/quickstart/301-machine-learning-hub-spoke-secure/compute.tf
index 520031a73..6f69f601c 100644
--- a/quickstart/301-machine-learning-hub-spoke-secure/compute.tf
+++ b/quickstart/301-machine-learning-hub-spoke-secure/compute.tf
@@ -3,7 +3,7 @@ resource "random_string" "ci_prefix" {
   length  = 8
   upper   = false
   special = false
-  number  = false
+  numeric  = false
 }
 
 # Compute instance
diff --git a/samples/end-to-end-testing/src/main.tf b/samples/end-to-end-testing/src/main.tf
index a95e72487..58ab5c2b0 100644
--- a/samples/end-to-end-testing/src/main.tf
+++ b/samples/end-to-end-testing/src/main.tf
@@ -90,8 +90,8 @@ resource "azurerm_linux_virtual_machine" "vm1" {
 
   source_image_reference {
     publisher = "Canonical"
-    offer     = "UbuntuServer"
-    sku       = "18.04-LTS"
+    offer     = "ubuntu-24_04-lts"
+    sku       = "server-gen1"
     version   = "latest"
   }
 }
@@ -133,8 +133,8 @@ resource "azurerm_linux_virtual_machine" "vm2" {
 
   source_image_reference {
     publisher = "Canonical"
-    offer     = "UbuntuServer"
-    sku       = "18.04-LTS"
+    offer     = "ubuntu-24_04-lts"
+    sku       = "server-gen1"
     version   = "latest"
   }
 }
\ No newline at end of file
diff --git a/solution_template/vm-linux-terraform/mainTemplate.json b/solution_template/vm-linux-terraform/mainTemplate.json
index 476940ac6..91426bf00 100644
--- a/solution_template/vm-linux-terraform/mainTemplate.json
+++ b/solution_template/vm-linux-terraform/mainTemplate.json
@@ -245,8 +245,8 @@
         "storageProfile": {
           "imageReference": {
             "publisher": "Canonical",
-            "offer": "UbuntuServer",
-            "sku": "16.04-LTS",
+            "offer": "ubuntu-24_04-lts",
+            "sku": "server-gen1",
             "version": "latest"
           },
           "osDisk": {