diff --git a/azure/terraform/init.tf b/azure/terraform/init.tf
index 349c75452891e380eed3327e5bc40157950a25fd..d819a995b46168b9bbdd3de0c8072e76ce9e4921 100644
--- a/azure/terraform/init.tf
+++ b/azure/terraform/init.tf
@@ -50,3 +50,7 @@ variable "user_admin" {
   type    = string
   default = "tmpadmin"
 }
+
+variable "boot_diagnostics_uri" {
+  default = "https://swhresourcediag966.blob.core.windows.net"
+}
diff --git a/azure/terraform/kafka.tf b/azure/terraform/kafka.tf
index 50f54e80725a69a0f14e7cadf7491b85891eeda1..96949a28710b1f3f6f244f76ff70470666317953 100644
--- a/azure/terraform/kafka.tf
+++ b/azure/terraform/kafka.tf
@@ -40,6 +40,11 @@ resource "azurerm_virtual_machine" "kafka-server" {
   network_interface_ids = [azurerm_network_interface.kafka-interface[count.index].id]
   vm_size               = "Standard_B2s"
 
+  boot_diagnostics {
+    enabled     = true
+    storage_uri = var.boot_diagnostics_uri
+  }
+
   storage_os_disk {
     name              = format("kafka%02d-osdisk", count.index + 1)
     caching           = "ReadWrite"
@@ -102,6 +107,7 @@ resource "azurerm_virtual_machine" "kafka-server" {
         filesystem = "ext4",
         mount_options = "defaults",
       }]
+      raids = []
     })
     destination = var.firstboot_script