diff --git a/bootstrap/azuredevops/providers.tf b/bootstrap/azuredevops/terraform.tf
similarity index 96%
rename from bootstrap/azuredevops/providers.tf
rename to bootstrap/azuredevops/terraform.tf
index 1122b1e6..1143f2f0 100644
--- a/bootstrap/azuredevops/providers.tf
+++ b/bootstrap/azuredevops/terraform.tf
@@ -31,6 +31,7 @@ provider "azurerm" {
       prevent_deletion_if_contains_resources = false
     }
   }
+  storage_use_azuread = true
 }
 
 provider "azuredevops" {
diff --git a/bootstrap/github/providers.tf b/bootstrap/github/terraform.tf
similarity index 96%
rename from bootstrap/github/providers.tf
rename to bootstrap/github/terraform.tf
index 3966c374..f3f69794 100644
--- a/bootstrap/github/providers.tf
+++ b/bootstrap/github/terraform.tf
@@ -31,6 +31,7 @@ provider "azurerm" {
       prevent_deletion_if_contains_resources = false
     }
   }
+  storage_use_azuread = true
 }
 
 provider "github" {
diff --git a/bootstrap/local/providers.tf b/bootstrap/local/terraform.tf
similarity index 95%
rename from bootstrap/local/providers.tf
rename to bootstrap/local/terraform.tf
index 11535f59..54372481 100644
--- a/bootstrap/local/providers.tf
+++ b/bootstrap/local/terraform.tf
@@ -31,4 +31,5 @@ provider "azurerm" {
       prevent_deletion_if_contains_resources = false
     }
   }
+  storage_use_azuread = true
 }
diff --git a/bootstrap/modules/azure/storage.tf b/bootstrap/modules/azure/storage.tf
index 11e5e558..f2154355 100644
--- a/bootstrap/modules/azure/storage.tf
+++ b/bootstrap/modules/azure/storage.tf
@@ -5,6 +5,7 @@ resource "azurerm_storage_account" "alz" {
   account_tier                    = "Standard"
   account_replication_type        = "GRS"
   allow_nested_items_to_be_public = false
+  shared_access_key_enabled       = false
   public_network_access_enabled   = local.use_private_networking && !var.allow_storage_access_from_my_ip ? false : true
 }