diff --git a/.github/workflows/.template.bicep.yml b/.github/workflows/.template.bicep.yml
index f6e0e979..076bf5a1 100644
--- a/.github/workflows/.template.bicep.yml
+++ b/.github/workflows/.template.bicep.yml
@@ -46,7 +46,7 @@ jobs:
         uses: actions/checkout@v4
 
       # Log into Azure via OIDC
-      - uses: azure/login@v1
+      - uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -74,7 +74,7 @@ jobs:
         uses: actions/checkout@main
     
       # Log into Azure via OIDC
-      - uses: azure/login@v1
+      - uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
diff --git a/.github/workflows/.template.terraform.yml b/.github/workflows/.template.terraform.yml
index 8afc1580..0b2ee65c 100644
--- a/.github/workflows/.template.terraform.yml
+++ b/.github/workflows/.template.terraform.yml
@@ -7,7 +7,7 @@ on:
         type: string
         description: 'Terraform version'
         required: true
-        default: '1.3.9'
+        default: '1.9.7'
       modulePath:
         type: string
         description: 'Path to the Terraform module'
diff --git a/scenarios/shared/terraform-modules/sql-database/README.md b/scenarios/shared/terraform-modules/sql-database/README.md
index 5e82cdc3..018f0719 100644
--- a/scenarios/shared/terraform-modules/sql-database/README.md
+++ b/scenarios/shared/terraform-modules/sql-database/README.md
@@ -1,17 +1,19 @@
 # sql-database
 
-<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- BEGIN_TF_DOCS -->
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >=4.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azuread"></a> [azuread](#provider\_azuread) | 2.47.0 |
-| <a name="provider_azurecaf"></a> [azurecaf](#provider\_azurecaf) | 1.2.27 |
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.92.0 |
+| <a name="provider_azuread"></a> [azuread](#provider\_azuread) | 3.0.2 |
+| <a name="provider_azurecaf"></a> [azurecaf](#provider\_azurecaf) | 1.2.28 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.5.0 |
 
 ## Modules
 
@@ -34,8 +36,8 @@ No modules.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_application_name"></a> [application\_name](#input\_application\_name) | The name of your application | `string` | n/a | yes |
-| <a name="input_entra_admin_group_name"></a> [entra\_admin\_group\_name](#input\_entra\_admin\_group\_name) | n/a | `string` | n/a | yes |
-| <a name="input_entra_admin_group_object_id"></a> [entra\_admin\_group\_object\_id](#input\_entra\_admin\_group\_object\_id) | n/a | `string` | n/a | yes |
+| <a name="input_entra_admin_group_name"></a> [entra\_admin\_group\_name](#input\_entra\_admin\_group\_name) | n/a | `string` | `null` | no |
+| <a name="input_entra_admin_group_object_id"></a> [entra\_admin\_group\_object\_id](#input\_entra\_admin\_group\_object\_id) | n/a | `string` | `null` | no |
 | <a name="input_environment"></a> [environment](#input\_environment) | The environment (dev, test, prod...) | `string` | `"dev"` | no |
 | <a name="input_global_settings"></a> [global\_settings](#input\_global\_settings) | Global settings for the naming convention module. | `any` | n/a | yes |
 | <a name="input_location"></a> [location](#input\_location) | The Azure region where all resources in this example should be created | `string` | `"westus2"` | no |
@@ -54,4 +56,4 @@ No modules.
 | <a name="output_sql_db_connection_string"></a> [sql\_db\_connection\_string](#output\_sql\_db\_connection\_string) | n/a |
 | <a name="output_sql_db_name"></a> [sql\_db\_name](#output\_sql\_db\_name) | n/a |
 | <a name="output_sql_server_name"></a> [sql\_server\_name](#output\_sql\_server\_name) | n/a |
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END_TF_DOCS -->
diff --git a/scenarios/shared/terraform-modules/sql-database/variables.tf b/scenarios/shared/terraform-modules/sql-database/variables.tf
index 26c4a181..cc5c2667 100644
--- a/scenarios/shared/terraform-modules/sql-database/variables.tf
+++ b/scenarios/shared/terraform-modules/sql-database/variables.tf
@@ -31,11 +31,13 @@ variable "tenant_id" {
 }
 
 variable "entra_admin_group_object_id" {
-  type = string
+  type    = string
+  default = null
 }
 
 variable "entra_admin_group_name" {
-  type = string
+  type    = string
+  default = null
 }
 
 variable "private_link_subnet_id" {
diff --git a/scenarios/shared/terraform-modules/windows-vm-ext/README.md b/scenarios/shared/terraform-modules/windows-vm-ext/README.md
index 55f0d3b0..02b3068f 100644
--- a/scenarios/shared/terraform-modules/windows-vm-ext/README.md
+++ b/scenarios/shared/terraform-modules/windows-vm-ext/README.md
@@ -1,6 +1,6 @@
 # windows-vm-ext
 
-<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- BEGIN_TF_DOCS -->
 ## Requirements
 
 No requirements.
@@ -9,7 +9,7 @@ No requirements.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 3.59.0 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | n/a |
 
 ## Modules
 
@@ -19,7 +19,7 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [azurerm_virtual_machine_extension.entra](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/virtual_machine_extension) | resource |
+| [azurerm_virtual_machine_extension.aad](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/virtual_machine_extension) | resource |
 | [azurerm_virtual_machine_extension.install_ssms](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/virtual_machine_extension) | resource |
 
 ## Inputs
@@ -36,4 +36,4 @@ No modules.
 ## Outputs
 
 No outputs.
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END_TF_DOCS -->
diff --git a/scenarios/shared/terraform-modules/windows-vm-ext/main.tf b/scenarios/shared/terraform-modules/windows-vm-ext/main.tf
index 2d0bf743..86dc4d1c 100644
--- a/scenarios/shared/terraform-modules/windows-vm-ext/main.tf
+++ b/scenarios/shared/terraform-modules/windows-vm-ext/main.tf
@@ -1,5 +1,5 @@
-resource "azurerm_virtual_machine_extension" "entra" {
-  count = var.enable_microsoft_entra_join ? 1 : 0
+resource "azurerm_virtual_machine_extension" "aad" {
+  count = var.enable_azure_ad_join ? 1 : 0
 
   name                       = "aad-login-for-windows"
   publisher                  = "Microsoft.Azure.ActiveDirectory"