diff --git a/appconfiguration/spring-cloud-azure-starter-appconfiguration/appconfiguration-client/terraform/main.tf b/appconfiguration/spring-cloud-azure-starter-appconfiguration/appconfiguration-client/terraform/main.tf
index 9030b34a8..a313a02cf 100644
--- a/appconfiguration/spring-cloud-azure-starter-appconfiguration/appconfiguration-client/terraform/main.tf
+++ b/appconfiguration/spring-cloud-azure-starter-appconfiguration/appconfiguration-client/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/cache/spring-cloud-azure-starter/spring-cloud-azure-sample-cache/terraform/main.tf b/cache/spring-cloud-azure-starter/spring-cloud-azure-sample-cache/terraform/main.tf
index 243390228..9b0b7dafd 100644
--- a/cache/spring-cloud-azure-starter/spring-cloud-azure-sample-cache/terraform/main.tf
+++ b/cache/spring-cloud-azure-starter/spring-cloud-azure-sample-cache/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/cosmos/azure-spring-data-cosmos/cosmos-multi-database-multi-account/terraform/main.tf b/cosmos/azure-spring-data-cosmos/cosmos-multi-database-multi-account/terraform/main.tf
index 60168cc36..5b5b0aa8b 100644
--- a/cosmos/azure-spring-data-cosmos/cosmos-multi-database-multi-account/terraform/main.tf
+++ b/cosmos/azure-spring-data-cosmos/cosmos-multi-database-multi-account/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm  = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/cosmos/azure-spring-data-cosmos/cosmos-multi-database-single-account/terraform/main.tf b/cosmos/azure-spring-data-cosmos/cosmos-multi-database-single-account/terraform/main.tf
index 7c05d9369..2815c95c9 100644
--- a/cosmos/azure-spring-data-cosmos/cosmos-multi-database-single-account/terraform/main.tf
+++ b/cosmos/azure-spring-data-cosmos/cosmos-multi-database-single-account/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm  = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/main.tf b/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/main.tf
index 19214e2d8..9296d96cd 100644
--- a/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/main.tf
+++ b/cosmos/spring-cloud-azure-starter-cosmos/spring-cloud-azure-cosmos-sample/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/main.tf b/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/main.tf
index 25c44275e..0ea742f63 100644
--- a/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/main.tf
+++ b/cosmos/spring-cloud-azure-starter-data-cosmos/spring-cloud-azure-data-cosmos-sample/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/eventhubs/spring-cloud-azure-starter-eventhubs/eventhubs-client/terraform/main.tf b/eventhubs/spring-cloud-azure-starter-eventhubs/eventhubs-client/terraform/main.tf
index 4acf0e47a..6bc31b396 100644
--- a/eventhubs/spring-cloud-azure-starter-eventhubs/eventhubs-client/terraform/main.tf
+++ b/eventhubs/spring-cloud-azure-starter-eventhubs/eventhubs-client/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/main.tf b/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/main.tf
index 1c3c34263..4ba44790c 100644
--- a/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/main.tf
+++ b/eventhubs/spring-cloud-azure-starter-integration-eventhubs/eventhubs-integration/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
@@ -85,7 +85,6 @@ resource "azurerm_storage_account" "storage_account" {
   location                 = var.location
   account_tier             = "Standard"
   account_replication_type = "LRS"
-  allow_blob_public_access = true
 
   tags = {
     "spring-cloud-azure-sample" = var.sample_tag_value
diff --git a/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/main.tf b/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/main.tf
index 53ac44181..6540f4460 100644
--- a/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/main.tf
+++ b/eventhubs/spring-cloud-azure-starter/spring-cloud-azure-sample-eventhubs-kafka/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/main.tf b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/main.tf
index 2448d08c1..9957000d1 100644
--- a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/main.tf
+++ b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-binder/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
@@ -85,7 +85,6 @@ resource "azurerm_storage_account" "storage_account" {
   location                 = var.location
   account_tier             = "Standard"
   account_replication_type = "LRS"
-  allow_blob_public_access = true
 
   tags = {
     "spring-cloud-azure-sample" = var.sample_tag_value
diff --git a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/pom.xml b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/pom.xml
index cd327ef38..4b41c00a4 100644
--- a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/pom.xml
+++ b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/pom.xml
@@ -12,7 +12,7 @@
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
-  <artifactId>spring-cloud-azure-sample-stream-eventhubs-multibinders</artifactId>
+  <artifactId>eventhubs-multibinders</artifactId>
   <version>1.0.0</version>
   <packaging>jar</packaging>
 
diff --git a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/main.tf b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/main.tf
index 029dc3723..6ba0b798b 100644
--- a/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/main.tf
+++ b/eventhubs/spring-cloud-azure-stream-binder-eventhubs/eventhubs-multibinders/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
@@ -119,7 +119,6 @@ resource "azurerm_storage_account" "storage_account" {
   location                 = var.location
   account_tier             = "Standard"
   account_replication_type = "LRS"
-  allow_blob_public_access = true
 
   tags = {
     "spring-cloud-azure-sample" = var.sample_tag_value
diff --git a/keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source/terraform/main.tf b/keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source/terraform/main.tf
index cffc15be8..cd38fd2ab 100644
--- a/keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source/terraform/main.tf
+++ b/keyvault/spring-cloud-azure-starter-keyvault-secrets/property-source/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client/terraform/main.tf b/keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client/terraform/main.tf
index 6066c52c1..b11d55555 100644
--- a/keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client/terraform/main.tf
+++ b/keyvault/spring-cloud-azure-starter-keyvault-secrets/secret-client/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/main.tf b/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/main.tf
index ec1d9176a..b4d7b3a0a 100644
--- a/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-starter-integration-servicebus/multiple-namespaces/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/main.tf b/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/main.tf
index cfd34ce6f..77480e35f 100644
--- a/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-starter-integration-servicebus/single-namespace/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf
index f4c6cea54..9a4efec01 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-queue/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf
index 0991daec2..173fa93a0 100644
--- a/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-starter-servicebus-jms/servicebus-jms-topic/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/main.tf b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/main.tf
index a2200ceee..0cdbc55ed 100644
--- a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-multibinders/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder-arm/terraform/main.tf b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder-arm/terraform/main.tf
index abec2c513..fe8e54b4b 100644
--- a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder-arm/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder-arm/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99.0"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/main.tf b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/main.tf
index b2cc63a39..d8e8f86bb 100644
--- a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-queue-binder/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/main.tf b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/main.tf
index af036576f..094688b8e 100644
--- a/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/main.tf
+++ b/servicebus/spring-cloud-azure-stream-binder-servicebus/servicebus-topic-binder/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/spring-native/storage-blob-native/terraform/main.tf b/spring-native/storage-blob-native/terraform/main.tf
index 18b8bf85a..711f6dab5 100644
--- a/spring-native/storage-blob-native/terraform/main.tf
+++ b/spring-native/storage-blob-native/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
@@ -47,7 +47,6 @@ resource "azurerm_storage_account" "application" {
   location                 = var.location
   account_tier             = "Standard"
   account_replication_type = "LRS"
-  allow_blob_public_access = true
 
   tags = {
     "spring-cloud-azure-sample" = var.sample_tag_value
diff --git a/spring-petclinic-microservices/terraform/main.tf b/spring-petclinic-microservices/terraform/main.tf
index 9491c1e9d..738bca28f 100644
--- a/spring-petclinic-microservices/terraform/main.tf
+++ b/spring-petclinic-microservices/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm  = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-integration/terraform/main.tf b/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-integration/terraform/main.tf
index 262d7f22d..a168ae248 100644
--- a/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-integration/terraform/main.tf
+++ b/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-integration/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation/terraform/main.tf b/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation/terraform/main.tf
index 262d7f22d..a168ae248 100644
--- a/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation/terraform/main.tf
+++ b/storage/spring-cloud-azure-starter-integration-storage-queue/storage-queue-operation/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
diff --git a/storage/spring-cloud-azure-starter-storage-blob/storage-blob-sample/terraform/main.tf b/storage/spring-cloud-azure-starter-storage-blob/storage-blob-sample/terraform/main.tf
index 18b8bf85a..711f6dab5 100644
--- a/storage/spring-cloud-azure-starter-storage-blob/storage-blob-sample/terraform/main.tf
+++ b/storage/spring-cloud-azure-starter-storage-blob/storage-blob-sample/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
@@ -47,7 +47,6 @@ resource "azurerm_storage_account" "application" {
   location                 = var.location
   account_tier             = "Standard"
   account_replication_type = "LRS"
-  allow_blob_public_access = true
 
   tags = {
     "spring-cloud-azure-sample" = var.sample_tag_value
diff --git a/storage/spring-cloud-azure-starter-storage-queue/storage-queue-client/terraform/main.tf b/storage/spring-cloud-azure-starter-storage-queue/storage-queue-client/terraform/main.tf
index 722981597..f32c0ffdb 100644
--- a/storage/spring-cloud-azure-starter-storage-queue/storage-queue-client/terraform/main.tf
+++ b/storage/spring-cloud-azure-starter-storage-queue/storage-queue-client/terraform/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "2.99"
+      version = "3.9.0"
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"