diff --git a/README.md b/README.md
index ab447fe..9700849 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,13 @@ Module to provision azure stack hci.
 
 The following requirements are needed by this module:
 
-- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (~> 1.5)
+- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (~> 1.8)
 
 - <a name="requirement_azapi"></a> [azapi](#requirement\_azapi) (~> 1.14)
 
 - <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) (~> 2.50.0)
 
-- <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) (~> 3.71)
+- <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) (~> 4.0)
 
 - <a name="requirement_modtm"></a> [modtm](#requirement\_modtm) (~> 0.3)
 
diff --git a/examples/default/README.md b/examples/default/README.md
index ad3dfc8..dad3c29 100644
--- a/examples/default/README.md
+++ b/examples/default/README.md
@@ -5,11 +5,11 @@ This deploys the module in its simplest form.
 
 ```hcl
 terraform {
-  required_version = "~> 1.5"
+  required_version = "~> 1.8"
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.74"
+      version = "~> 4.0"
     }
   }
 }
@@ -93,9 +93,9 @@ module "test" {
 
 The following requirements are needed by this module:
 
-- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (~> 1.5)
+- <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) (~> 1.8)
 
-- <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) (~> 3.74)
+- <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) (~> 4.0)
 
 ## Resources
 
diff --git a/examples/default/main.tf b/examples/default/main.tf
index 3ca11b9..2fd60c9 100644
--- a/examples/default/main.tf
+++ b/examples/default/main.tf
@@ -1,9 +1,9 @@
 terraform {
-  required_version = "~> 1.5"
+  required_version = "~> 1.8"
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.74"
+      version = "~> 4.0"
     }
   }
 }
diff --git a/locals.tf b/locals.tf
index d23a00d..d8e44a7 100644
--- a/locals.tf
+++ b/locals.tf
@@ -108,7 +108,7 @@ locals {
     }
   }
   deployment_setting_properties_omit_null = { for k, v in local.deployment_setting_properties : k => v if v != null }
-  key_vault                               = var.create_key_vault ? azurerm_key_vault.deployment_keyvault[0] : data.azurerm_key_vault.key_vault[0]
+  key_vault                               = var.create_key_vault ? azurerm_key_vault.deployment_keyvault[0] : provider::azurerm::normalise_resource_id(data.azurerm_key_vault.key_vault[0])
   keyvault_secret_names = var.use_legacy_key_vault_model ? {
     "AzureStackLCMUserCredential" = "AzureStackLCMUserCredential"
     "LocalAdminCredential"        = "LocalAdminCredential"
diff --git a/terraform.tf b/terraform.tf
index 42fd3d8..7612e1c 100644
--- a/terraform.tf
+++ b/terraform.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = "~> 1.5"
+  required_version = "~> 1.8"
   required_providers {
     azapi = {
       source  = "azure/azapi"
@@ -11,7 +11,7 @@ terraform {
     }
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.71"
+      version = "~> 4.0"
     }
     modtm = {
       source  = "azure/modtm"