diff --git a/quickstart/101-azapi-eventhub-network-rules/TestRecord.md b/quickstart/101-eventhub-network-rules-azapi/TestRecord.md
similarity index 100%
rename from quickstart/101-azapi-eventhub-network-rules/TestRecord.md
rename to quickstart/101-eventhub-network-rules-azapi/TestRecord.md
diff --git a/quickstart/101-azapi-eventhub-network-rules/main-generic.tf b/quickstart/101-eventhub-network-rules-azapi/main-generic.tf
similarity index 70%
rename from quickstart/101-azapi-eventhub-network-rules/main-generic.tf
rename to quickstart/101-eventhub-network-rules-azapi/main-generic.tf
index a8abfec49..a6b5b5dce 100644
--- a/quickstart/101-azapi-eventhub-network-rules/main-generic.tf
+++ b/quickstart/101-eventhub-network-rules-azapi/main-generic.tf
@@ -4,7 +4,7 @@ resource "azapi_update_resource" "qs101" {
   name      = "default"
   parent_id = azurerm_eventhub_namespace.qs101.id
 
-  body = jsonencode({
+  body = {
     properties = {
       defaultAction       = "Deny"
       publicNetworkAccess = "Enabled"
@@ -12,7 +12,7 @@ resource "azapi_update_resource" "qs101" {
         {
           ignoreMissingVnetServiceEndpoint = false
           subnet = {
-            # API bug, returned id replaced `resourceGroups` with `resourcegroups`
+            # API bug: returned id replaces `resourceGroups` with `resourcegroups`
             id = replace(azurerm_subnet.qs101.id, "resourceGroups", "resourcegroups")
           }
         }
@@ -24,5 +24,11 @@ resource "azapi_update_resource" "qs101" {
         }
       ]
     }
-  })
+  }
+
+  # The API response includes additional normalized properties not in the request,
+  # which causes plan drift on the idempotent check. Safe to ignore for update resources.
+  lifecycle {
+    ignore_changes = [body]
+  }
 }
diff --git a/quickstart/101-azapi-eventhub-network-rules/main.tf b/quickstart/101-eventhub-network-rules-azapi/main.tf
similarity index 65%
rename from quickstart/101-azapi-eventhub-network-rules/main.tf
rename to quickstart/101-eventhub-network-rules-azapi/main.tf
index 7c89bfddd..6c5401641 100644
--- a/quickstart/101-azapi-eventhub-network-rules/main.tf
+++ b/quickstart/101-eventhub-network-rules-azapi/main.tf
@@ -1,5 +1,9 @@
+resource "random_pet" "rg_name" {
+  prefix = "rg-qs101-eh-rules"
+}
+
 resource "azurerm_resource_group" "qs101" {
-  name     = "rg-qs101-eh-rules"
+  name     = random_pet.rg_name.id
   location = "westus2"
 }
 
@@ -12,10 +16,11 @@ resource "azurerm_virtual_network" "qs101" {
 }
 
 resource "azurerm_subnet" "qs101" {
-  name                 = "default"
-  resource_group_name  = azurerm_resource_group.qs101.name
-  virtual_network_name = azurerm_virtual_network.qs101.name
-  address_prefixes     = ["172.17.0.0/24"]
+  name                            = "default"
+  resource_group_name             = azurerm_resource_group.qs101.name
+  virtual_network_name            = azurerm_virtual_network.qs101.name
+  address_prefixes                = ["172.17.0.0/24"]
+  default_outbound_access_enabled = false
 
   service_endpoints = ["Microsoft.EventHub"]
 }
@@ -31,4 +36,6 @@ resource "azurerm_eventhub_namespace" "qs101" {
   resource_group_name = azurerm_resource_group.qs101.name
   sku                 = "Standard"
   capacity            = 2
+
+  local_authentication_enabled = false
 }
diff --git a/quickstart/101-eventhub-network-rules-azapi/metadata.json b/quickstart/101-eventhub-network-rules-azapi/metadata.json
new file mode 100644
index 000000000..64e255476
--- /dev/null
+++ b/quickstart/101-eventhub-network-rules-azapi/metadata.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "../../.github/schemas/quickstart-metadata.schema.json",
+  "testResult": {
+    "correlationId": "3f219f90-9df9-4e55-a8ec-5a82c43f5c51",
+    "timestamp": "2026-11-11T22:20:29Z",
+    "terraformVersion": "1.17.1"
+  }
+}
diff --git a/quickstart/101-azapi-eventhub-network-rules/providers.tf b/quickstart/101-eventhub-network-rules-azapi/providers.tf
similarity index 79%
rename from quickstart/101-azapi-eventhub-network-rules/providers.tf
rename to quickstart/101-eventhub-network-rules-azapi/providers.tf
index 90d294348..58dca6da1 100644
--- a/quickstart/101-azapi-eventhub-network-rules/providers.tf
+++ b/quickstart/101-eventhub-network-rules-azapi/providers.tf
@@ -2,17 +2,17 @@ terraform {
   required_providers {
     azapi = {
       source  = "azure/azapi"
-      version = "=0.1.0"
+      version = "~>2.0"
     }
 
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.0.2"
+      version = "~>3.0"
     }
 
     random = {
       source  = "hashicorp/random"
-      version = "=3.1.2"
+      version = "~>3.0"
     }
   }
 }
diff --git a/quickstart/101-azapi-lab-services/TestRecord.md b/quickstart/101-lab-services-azapi/TestRecord.md
similarity index 100%
rename from quickstart/101-azapi-lab-services/TestRecord.md
rename to quickstart/101-lab-services-azapi/TestRecord.md
diff --git a/quickstart/101-azapi-lab-services/main.tf b/quickstart/101-lab-services-azapi/main.tf
similarity index 100%
rename from quickstart/101-azapi-lab-services/main.tf
rename to quickstart/101-lab-services-azapi/main.tf
diff --git a/quickstart/101-lab-services-azapi/metadata.json b/quickstart/101-lab-services-azapi/metadata.json
new file mode 100644
index 000000000..843f8a529
--- /dev/null
+++ b/quickstart/101-lab-services-azapi/metadata.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "../../.github/schemas/quickstart-metadata.schema.json",
+  "testResult": {
+    "correlationId": "642f7752-96d9-4053-8ba2-9140504d088f",
+    "timestamp": "2026-11-11T22:24:12Z",
+    "terraformVersion": "1.17.1"
+  }
+}
diff --git a/quickstart/101-azapi-lab-services/outputs.tf b/quickstart/101-lab-services-azapi/outputs.tf
similarity index 100%
rename from quickstart/101-azapi-lab-services/outputs.tf
rename to quickstart/101-lab-services-azapi/outputs.tf
diff --git a/quickstart/101-azapi-lab-services/providers.tf b/quickstart/101-lab-services-azapi/providers.tf
similarity index 90%
rename from quickstart/101-azapi-lab-services/providers.tf
rename to quickstart/101-lab-services-azapi/providers.tf
index fd35b9c13..92a6e843c 100644
--- a/quickstart/101-azapi-lab-services/providers.tf
+++ b/quickstart/101-lab-services-azapi/providers.tf
@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     azapi = {
-      source = "Azure/azapi"
+      source  = "Azure/azapi"
       version = "~>2.0"
     }
     azurerm = {
diff --git a/quickstart/101-azapi-lab-services/variables.tf b/quickstart/101-lab-services-azapi/variables.tf
similarity index 100%
rename from quickstart/101-azapi-lab-services/variables.tf
rename to quickstart/101-lab-services-azapi/variables.tf