diff --git a/terraform/infrastructure/azure/modules/jump_host/main.tf b/terraform/infrastructure/azure/modules/jump_host/main.tf
index c35136ff7..ba7d5f726 100644
--- a/terraform/infrastructure/azure/modules/jump_host/main.tf
+++ b/terraform/infrastructure/azure/modules/jump_host/main.tf
@@ -29,7 +29,7 @@ resource "azurerm_linux_virtual_machine" "jump_host" {
   }
 
   boot_diagnostics {
-
+    storage_account_uri = null
   }
 
   user_data = base64encode(<<EOF
diff --git a/terraform/infrastructure/azure/modules/scale_set/main.tf b/terraform/infrastructure/azure/modules/scale_set/main.tf
index 86e95b0ff..99073ef46 100644
--- a/terraform/infrastructure/azure/modules/scale_set/main.tf
+++ b/terraform/infrastructure/azure/modules/scale_set/main.tf
@@ -57,7 +57,9 @@ resource "azurerm_linux_virtual_machine_scale_set" "scale_set" {
     identity_ids = [var.user_assigned_identity]
   }
 
-  boot_diagnostics {}
+  boot_diagnostics {
+    storage_account_uri = null
+  }
 
   dynamic "os_disk" {
     for_each = var.confidential_vm ? [1] : [] # if confidential_vm is true
diff --git a/terraform/infrastructure/gcp/modules/instance_group/main.tf b/terraform/infrastructure/gcp/modules/instance_group/main.tf
index 2e92d4375..b13289b89 100644
--- a/terraform/infrastructure/gcp/modules/instance_group/main.tf
+++ b/terraform/infrastructure/gcp/modules/instance_group/main.tf
@@ -70,7 +70,7 @@ resource "google_compute_instance_template" "template" {
   metadata = {
     kube-env                       = var.kube_env
     constellation-init-secret-hash = var.init_secret_hash
-    serial-port-enable             = var.debug ? "TRUE" : "FALSE"
+    serial-port-enable             = "TRUE"
   }
 
   network_interface {