diff --git a/avm/res/automation/automation-account/README.md b/avm/res/automation/automation-account/README.md
index 3951118bca..7453918030 100644
--- a/avm/res/automation/automation-account/README.md
+++ b/avm/res/automation/automation-account/README.md
@@ -233,6 +233,18 @@ module automationAccount 'br/public:avm/res/automation/automation-account:<versi
           Role: 'DeploymentValidation'
         }
       }
+      {
+        privateDnsZoneResourceIds: [
+          '<privateDNSZoneResourceId>'
+        ]
+        service: 'Webhook'
+        subnetResourceId: '<subnetResourceId>'
+        tags: {
+          Environment: 'Non-Prod'
+          'hidden-title': 'This is visible in the resource name'
+          Role: 'DeploymentValidation'
+        }
+      }
       {
         privateDnsZoneResourceIds: [
           '<privateDNSZoneResourceId>'
@@ -467,6 +479,18 @@ module automationAccount 'br/public:avm/res/automation/automation-account:<versi
             "Role": "DeploymentValidation"
           }
         },
+        {
+          "privateDnsZoneResourceIds": [
+            "<privateDNSZoneResourceId>"
+          ],
+          "service": "Webhook",
+          "subnetResourceId": "<subnetResourceId>",
+          "tags": {
+            "Environment": "Non-Prod",
+            "hidden-title": "This is visible in the resource name",
+            "Role": "DeploymentValidation"
+          }
+        },
         {
           "privateDnsZoneResourceIds": [
             "<privateDNSZoneResourceId>"
diff --git a/avm/res/batch/batch-account/README.md b/avm/res/batch/batch-account/README.md
index 696eaef654..1ea59e9346 100644
--- a/avm/res/batch/batch-account/README.md
+++ b/avm/res/batch/batch-account/README.md
@@ -231,7 +231,7 @@ module batchAccount 'br/public:avm/res/batch/batch-account:<version>' = {
           {
             fqdn: 'abc.batch.com'
             ipAddresses: [
-              '10.0.0.10'
+              '10.0.16.10'
             ]
           }
         ]
@@ -241,7 +241,7 @@ module batchAccount 'br/public:avm/res/batch/batch-account:<version>' = {
             properties: {
               groupId: 'batchAccount'
               memberName: 'batchAccount'
-              privateIPAddress: '10.0.0.10'
+              privateIPAddress: '10.0.16.10'
             }
           }
         ]
@@ -268,6 +268,18 @@ module batchAccount 'br/public:avm/res/batch/batch-account:<version>' = {
           Role: 'DeploymentValidation'
         }
       }
+      {
+        privateDnsZoneResourceIds: [
+          '<privateDNSZoneResourceId>'
+        ]
+        service: 'batchAccount'
+        subnetResourceId: '<subnetResourceId>'
+        tags: {
+          Environment: 'Non-Prod'
+          'hidden-title': 'This is visible in the resource name'
+          Role: 'DeploymentValidation'
+        }
+      }
       {
         privateDnsZoneResourceIds: [
           '<privateDNSZoneResourceId>'
@@ -379,7 +391,7 @@ module batchAccount 'br/public:avm/res/batch/batch-account:<version>' = {
             {
               "fqdn": "abc.batch.com",
               "ipAddresses": [
-                "10.0.0.10"
+                "10.0.16.10"
               ]
             }
           ],
@@ -389,7 +401,7 @@ module batchAccount 'br/public:avm/res/batch/batch-account:<version>' = {
               "properties": {
                 "groupId": "batchAccount",
                 "memberName": "batchAccount",
-                "privateIPAddress": "10.0.0.10"
+                "privateIPAddress": "10.0.16.10"
               }
             }
           ],
@@ -416,6 +428,18 @@ module batchAccount 'br/public:avm/res/batch/batch-account:<version>' = {
             "Role": "DeploymentValidation"
           }
         },
+        {
+          "privateDnsZoneResourceIds": [
+            "<privateDNSZoneResourceId>"
+          ],
+          "service": "batchAccount",
+          "subnetResourceId": "<subnetResourceId>",
+          "tags": {
+            "Environment": "Non-Prod",
+            "hidden-title": "This is visible in the resource name",
+            "Role": "DeploymentValidation"
+          }
+        },
         {
           "privateDnsZoneResourceIds": [
             "<privateDNSZoneResourceId>"
diff --git a/avm/res/databricks/workspace/README.md b/avm/res/databricks/workspace/README.md
index b82707c649..63b97e72a1 100644
--- a/avm/res/databricks/workspace/README.md
+++ b/avm/res/databricks/workspace/README.md
@@ -152,6 +152,17 @@ module workspace 'br/public:avm/res/databricks/workspace:<version>' = {
           Role: 'DeploymentValidation'
         }
       }
+      {
+        privateDnsZoneResourceIds: [
+          '<privateDNSZoneResourceId>'
+        ]
+        service: 'databricks_ui_api'
+        subnetResourceId: '<subnetResourceId>'
+        tags: {
+          Environment: 'Non-Prod'
+          Role: 'DeploymentValidation'
+        }
+      }
       {
         privateDnsZoneResourceIds: [
           '<privateDNSZoneResourceId>'
@@ -295,6 +306,17 @@ module workspace 'br/public:avm/res/databricks/workspace:<version>' = {
             "Role": "DeploymentValidation"
           }
         },
+        {
+          "privateDnsZoneResourceIds": [
+            "<privateDNSZoneResourceId>"
+          ],
+          "service": "databricks_ui_api",
+          "subnetResourceId": "<subnetResourceId>",
+          "tags": {
+            "Environment": "Non-Prod",
+            "Role": "DeploymentValidation"
+          }
+        },
         {
           "privateDnsZoneResourceIds": [
             "<privateDNSZoneResourceId>"
diff --git a/avm/res/document-db/database-account/tests/e2e/sqldb/main.test.bicep b/avm/res/document-db/database-account/tests/e2e/sqldb/main.test.bicep
index 5bd1596abb..5ddc19855d 100644
--- a/avm/res/document-db/database-account/tests/e2e/sqldb/main.test.bicep
+++ b/avm/res/document-db/database-account/tests/e2e/sqldb/main.test.bicep
@@ -111,11 +111,6 @@ module testDeployment '../../../main.bicep' = {
         ]
         service: 'Sql'
         subnetResourceId: nestedDependencies.outputs.customSubnet2ResourceId
-        tags: {
-          'hidden-title': 'This is visible in the resource name'
-          Environment: 'Non-Prod'
-          Role: 'DeploymentValidation'
-        }
       }
     ]
     roleAssignments: [
diff --git a/avm/res/storage/storage-account/README.md b/avm/res/storage/storage-account/README.md
index a6cdb6c333..8617bfe51c 100644
--- a/avm/res/storage/storage-account/README.md
+++ b/avm/res/storage/storage-account/README.md
@@ -439,6 +439,13 @@ module storageAccount 'br/public:avm/res/storage/storage-account:<version>' = {
           Role: 'DeploymentValidation'
         }
       }
+      {
+        privateDnsZoneResourceIds: [
+          '<privateDNSZoneResourceId>'
+        ]
+        service: 'blob'
+        subnetResourceId: '<subnetResourceId>'
+      }
       {
         privateDnsZoneResourceIds: [
           '<privateDNSZoneResourceId>'
@@ -865,6 +872,13 @@ module storageAccount 'br/public:avm/res/storage/storage-account:<version>' = {
             "Role": "DeploymentValidation"
           }
         },
+        {
+          "privateDnsZoneResourceIds": [
+            "<privateDNSZoneResourceId>"
+          ],
+          "service": "blob",
+          "subnetResourceId": "<subnetResourceId>"
+        },
         {
           "privateDnsZoneResourceIds": [
             "<privateDNSZoneResourceId>"
diff --git a/avm/res/storage/storage-account/tests/e2e/max/main.test.bicep b/avm/res/storage/storage-account/tests/e2e/max/main.test.bicep
index 09d13f832d..86a30c9ea9 100644
--- a/avm/res/storage/storage-account/tests/e2e/max/main.test.bicep
+++ b/avm/res/storage/storage-account/tests/e2e/max/main.test.bicep
@@ -96,11 +96,6 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem'
         privateDnsZoneResourceIds: [
           nestedDependencies.outputs.privateDNSZoneResourceId
         ]
-        tags: {
-          'hidden-title': 'This is visible in the resource name'
-          Environment: 'Non-Prod'
-          Role: 'DeploymentValidation'
-        }
       }
       {
         privateDnsZoneResourceIds: [
diff --git a/avm/res/synapse/workspace/README.md b/avm/res/synapse/workspace/README.md
index 3ec58eab1e..ac0814390f 100644
--- a/avm/res/synapse/workspace/README.md
+++ b/avm/res/synapse/workspace/README.md
@@ -394,7 +394,7 @@ module workspace 'br/public:avm/res/synapse/workspace:<version>' = {
         privateDnsZoneResourceIds: [
           '<privateDNSZoneResourceId>'
         ]
-        service: 'SqlOnDemand'
+        service: 'SQL'
         subnetResourceId: '<subnetResourceId>'
         tags: {
           Environment: 'Non-Prod'
@@ -406,7 +406,7 @@ module workspace 'br/public:avm/res/synapse/workspace:<version>' = {
         privateDnsZoneResourceIds: [
           '<privateDNSZoneResourceId>'
         ]
-        service: 'Dev'
+        service: 'SqlOnDemand'
         subnetResourceId: '<subnetResourceId>'
         tags: {
           Environment: 'Non-Prod'
@@ -414,6 +414,13 @@ module workspace 'br/public:avm/res/synapse/workspace:<version>' = {
           Role: 'DeploymentValidation'
         }
       }
+      {
+        privateDnsZoneResourceIds: [
+          '<privateDNSZoneResourceId>'
+        ]
+        service: 'Dev'
+        subnetResourceId: '<subnetResourceId>'
+      }
     ]
     roleAssignments: [
       {
@@ -523,7 +530,7 @@ module workspace 'br/public:avm/res/synapse/workspace:<version>' = {
           "privateDnsZoneResourceIds": [
             "<privateDNSZoneResourceId>"
           ],
-          "service": "SqlOnDemand",
+          "service": "SQL",
           "subnetResourceId": "<subnetResourceId>",
           "tags": {
             "Environment": "Non-Prod",
@@ -535,13 +542,20 @@ module workspace 'br/public:avm/res/synapse/workspace:<version>' = {
           "privateDnsZoneResourceIds": [
             "<privateDNSZoneResourceId>"
           ],
-          "service": "Dev",
+          "service": "SqlOnDemand",
           "subnetResourceId": "<subnetResourceId>",
           "tags": {
             "Environment": "Non-Prod",
             "hidden-title": "This is visible in the resource name",
             "Role": "DeploymentValidation"
           }
+        },
+        {
+          "privateDnsZoneResourceIds": [
+            "<privateDNSZoneResourceId>"
+          ],
+          "service": "Dev",
+          "subnetResourceId": "<subnetResourceId>"
         }
       ]
     },
diff --git a/avm/res/synapse/workspace/tests/e2e/max/main.test.bicep b/avm/res/synapse/workspace/tests/e2e/max/main.test.bicep
index 19f94147e6..61960dca1e 100644
--- a/avm/res/synapse/workspace/tests/e2e/max/main.test.bicep
+++ b/avm/res/synapse/workspace/tests/e2e/max/main.test.bicep
@@ -136,11 +136,6 @@ module testDeployment '../../../main.bicep' = [for iteration in [ 'init', 'idem'
         ]
         service: 'Dev'
         subnetResourceId: nestedDependencies.outputs.customSubnet1ResourceId
-        tags: {
-          'hidden-title': 'This is visible in the resource name'
-          Environment: 'Non-Prod'
-          Role: 'DeploymentValidation'
-        }
       }
     ]
     managedVirtualNetwork: true