diff --git a/alz/azuredevops/terraform.tf b/alz/azuredevops/terraform.tf
index 4a86889..ba0dc2f 100644
--- a/alz/azuredevops/terraform.tf
+++ b/alz/azuredevops/terraform.tf
@@ -3,15 +3,15 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.105"
+      version = "~> 4.20"
     }
     azapi = {
       source  = "azure/azapi"
-      version = "~> 2.0"
+      version = "~> 2.2"
     }
     azuredevops = {
       source  = "microsoft/azuredevops"
-      version = "1.4"
+      version = "~> 1.7"
     }
     random = {
       source  = "hashicorp/random"
@@ -30,6 +30,9 @@ provider "azurerm" {
     resource_group {
       prevent_deletion_if_contains_resources = false
     }
+    storage {
+      data_plane_available = false
+    }
   }
   storage_use_azuread = true
 }
diff --git a/alz/github/terraform.tf b/alz/github/terraform.tf
index 231a8f7..ebbe447 100644
--- a/alz/github/terraform.tf
+++ b/alz/github/terraform.tf
@@ -3,15 +3,15 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.105"
+      version = "~> 4.20"
     }
     azapi = {
       source  = "azure/azapi"
-      version = "~> 2.0"
+      version = "~> 2.2"
     }
     github = {
       source  = "integrations/github"
-      version = "~> 5.36"
+      version = "~> 6.5"
     }
     random = {
       source  = "hashicorp/random"
@@ -30,6 +30,9 @@ provider "azurerm" {
     resource_group {
       prevent_deletion_if_contains_resources = false
     }
+    storage {
+      data_plane_available = false
+    }
   }
   storage_use_azuread = true
 }
diff --git a/alz/local/terraform.tf b/alz/local/terraform.tf
index 1af26d8..00a4f29 100644
--- a/alz/local/terraform.tf
+++ b/alz/local/terraform.tf
@@ -3,11 +3,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.105"
+      version = "~> 4.20"
     }
     azapi = {
       source  = "azure/azapi"
-      version = "~> 2.0"
+      version = "~> 2.2"
     }
     local = {
       source  = "hashicorp/local"
@@ -30,6 +30,9 @@ provider "azurerm" {
     resource_group {
       prevent_deletion_if_contains_resources = false
     }
+    storage {
+      data_plane_available = false
+    }
   }
   storage_use_azuread = true
 }
diff --git a/modules/azure/terraform.tf b/modules/azure/terraform.tf
index 5a894e1..c30ea0f 100644
--- a/modules/azure/terraform.tf
+++ b/modules/azure/terraform.tf
@@ -2,11 +2,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.105"
+      version = "~> 4.20"
     }
     azapi = {
       source  = "azure/azapi"
-      version = "~> 2.0"
+      version = "~> 2.2"
     }
     http = {
       source  = "hashicorp/http"
diff --git a/modules/azure_devops/terraform.tf b/modules/azure_devops/terraform.tf
index b385d12..446913c 100644
--- a/modules/azure_devops/terraform.tf
+++ b/modules/azure_devops/terraform.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azuredevops = {
       source  = "microsoft/azuredevops"
-      version = "1.4"
+      version = "~> 1.7"
     }
   }
 }
diff --git a/modules/github/terraform.tf b/modules/github/terraform.tf
index 0cf4e41..c013fd3 100644
--- a/modules/github/terraform.tf
+++ b/modules/github/terraform.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     github = {
       source  = "integrations/github"
-      version = "~> 5.36"
+      version = "~> 6.5"
     }
   }
 }