diff --git a/terraform/azure_fxci/worker-images.tf b/terraform/azure_fxci/worker-images.tf
index c861dc8d..bc676ae4 100644
--- a/terraform/azure_fxci/worker-images.tf
+++ b/terraform/azure_fxci/worker-images.tf
@@ -259,13 +259,14 @@ resource "azurerm_shared_image_gallery" "win10_64_2009" {
 }
 
 resource "azurerm_shared_image" "win10_64_2009" {
-  name                = "win10_64_2009"
-  gallery_name        = azurerm_shared_image_gallery.win10_64_2009.name
-  resource_group_name = azurerm_resource_group.rg-packer-worker-images.name
-  location            = azurerm_resource_group.rg-packer-worker-images.location
-  os_type             = "Windows"
-  release_note_uri    = "https://github.com/mozilla-platform-ops/worker-images/releases"
-  hyper_v_generation  = "V2"
+  name                              = "win10_64_2009"
+  gallery_name                      = azurerm_shared_image_gallery.win10_64_2009.name
+  resource_group_name               = azurerm_resource_group.rg-packer-worker-images.name
+  location                          = azurerm_resource_group.rg-packer-worker-images.location
+  os_type                           = "Windows"
+  release_note_uri                  = "https://github.com/mozilla-platform-ops/worker-images/releases"
+  hyper_v_generation                = "V2"
+  disk_controller_type_nvme_enabled = true
 
   identifier {
     publisher = "MicrosoftWindowsDesktop"
@@ -470,13 +471,14 @@ resource "azurerm_shared_image_gallery" "win11_64_24h2" {
 }
 
 resource "azurerm_shared_image" "win11_64_24h2" {
-  name                = "win11_64_24h2"
-  gallery_name        = azurerm_shared_image_gallery.win11_64_24h2.name
-  resource_group_name = azurerm_resource_group.rg-packer-worker-images.name
-  location            = azurerm_resource_group.rg-packer-worker-images.location
-  os_type             = "Windows"
-  release_note_uri    = "https://github.com/mozilla-platform-ops/worker-images/releases"
-  hyper_v_generation  = "V2"
+  name                              = "win11_64_24h2"
+  gallery_name                      = azurerm_shared_image_gallery.win11_64_24h2.name
+  resource_group_name               = azurerm_resource_group.rg-packer-worker-images.name
+  location                          = azurerm_resource_group.rg-packer-worker-images.location
+  os_type                           = "Windows"
+  release_note_uri                  = "https://github.com/mozilla-platform-ops/worker-images/releases"
+  hyper_v_generation                = "V2"
+  disk_controller_type_nvme_enabled = true
 
   identifier {
     publisher = "MicrosoftWindowsDesktop"
@@ -499,13 +501,14 @@ resource "azurerm_shared_image_gallery" "win11_64_24h2_alpha" {
 }
 
 resource "azurerm_shared_image" "win11_64_24h2_alpha" {
-  name                = "win11_64_24h2_alpha"
-  gallery_name        = azurerm_shared_image_gallery.win11_64_24h2_alpha.name
-  resource_group_name = azurerm_resource_group.rg-packer-worker-images.name
-  location            = azurerm_resource_group.rg-packer-worker-images.location
-  os_type             = "Windows"
-  release_note_uri    = "https://github.com/mozilla-platform-ops/worker-images/releases"
-  hyper_v_generation  = "V2"
+  name                              = "win11_64_24h2_alpha"
+  gallery_name                      = azurerm_shared_image_gallery.win11_64_24h2_alpha.name
+  resource_group_name               = azurerm_resource_group.rg-packer-worker-images.name
+  location                          = azurerm_resource_group.rg-packer-worker-images.location
+  os_type                           = "Windows"
+  release_note_uri                  = "https://github.com/mozilla-platform-ops/worker-images/releases"
+  hyper_v_generation                = "V2"
+  disk_controller_type_nvme_enabled = true
 
   identifier {
     publisher = "MicrosoftWindowsDesktop"
@@ -528,13 +531,14 @@ resource "azurerm_shared_image_gallery" "win2022_64_2009_alpha" {
 }
 
 resource "azurerm_shared_image" "win2022_64_2009_alpha" {
-  name                = "win2022_64_2009_alpha"
-  gallery_name        = azurerm_shared_image_gallery.win2022_64_2009_alpha.name
-  resource_group_name = azurerm_resource_group.rg-packer-worker-images.name
-  location            = azurerm_resource_group.rg-packer-worker-images.location
-  os_type             = "Windows"
-  release_note_uri    = "https://github.com/mozilla-platform-ops/worker-images/releases"
-  hyper_v_generation  = "V2"
+  name                              = "win2022_64_2009_alpha"
+  gallery_name                      = azurerm_shared_image_gallery.win2022_64_2009_alpha.name
+  resource_group_name               = azurerm_resource_group.rg-packer-worker-images.name
+  location                          = azurerm_resource_group.rg-packer-worker-images.location
+  os_type                           = "Windows"
+  release_note_uri                  = "https://github.com/mozilla-platform-ops/worker-images/releases"
+  hyper_v_generation                = "V2"
+  disk_controller_type_nvme_enabled = true
 
   identifier {
     publisher = "MicrosoftWindowsServer"
@@ -557,13 +561,14 @@ resource "azurerm_shared_image_gallery" "win2022_64_2009" {
 }
 
 resource "azurerm_shared_image" "win2022_64_2009" {
-  name                = "win2022_64_2009"
-  gallery_name        = azurerm_shared_image_gallery.win2022_64_2009.name
-  resource_group_name = azurerm_resource_group.rg-packer-worker-images.name
-  location            = azurerm_resource_group.rg-packer-worker-images.location
-  os_type             = "Windows"
-  release_note_uri    = "https://github.com/mozilla-platform-ops/worker-images/releases"
-  hyper_v_generation  = "V2"
+  name                              = "win2022_64_2009"
+  gallery_name                      = azurerm_shared_image_gallery.win2022_64_2009.name
+  resource_group_name               = azurerm_resource_group.rg-packer-worker-images.name
+  location                          = azurerm_resource_group.rg-packer-worker-images.location
+  os_type                           = "Windows"
+  release_note_uri                  = "https://github.com/mozilla-platform-ops/worker-images/releases"
+  hyper_v_generation                = "V2"
+  disk_controller_type_nvme_enabled = true
 
   identifier {
     publisher = "MicrosoftWindowsServer"
diff --git a/terraform/azure_trusted_fxci/worker-images.tf b/terraform/azure_trusted_fxci/worker-images.tf
index 04a9218f..20a63e89 100644
--- a/terraform/azure_trusted_fxci/worker-images.tf
+++ b/terraform/azure_trusted_fxci/worker-images.tf
@@ -57,7 +57,7 @@ locals {
       gallery_description               = "trusted-win2022-64-2009"
       gallery_tags                      = local.legacy_gallery_tags
       image_tags                        = {}
-      disk_controller_type_nvme_enabled = false
+      disk_controller_type_nvme_enabled = true
     },
     "trusted_win2025_64_24h2" = {
       publisher                         = "MicrosoftWindowsServer"