diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json b/arm/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
index d95cd78497..de787fa3bb 100644
--- a/arm/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
+++ b/arm/Microsoft.Automation/automationAccounts/.parameters/encr.parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "<<namePrefix>>-wd-aut-encr-001"
+            "value": "<<namePrefix>>-az-aut-encr-001"
         },
         "encryptionKeySource": {
             "value": "Microsoft.Keyvault"
diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json b/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
index 36d11228da..c76e891806 100644
--- a/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
+++ b/arm/Microsoft.Automation/automationAccounts/.parameters/min.parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "<<namePrefix>>-wd-aut-min-001"
+            "value": "<<namePrefix>>-az-aut-min-001"
         }
     }
 }
diff --git a/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json b/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json
index 4b1dc95b56..ae5e51517b 100644
--- a/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json
+++ b/arm/Microsoft.Automation/automationAccounts/.parameters/parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "<<namePrefix>>-wd-aut-x-001"
+            "value": "<<namePrefix>>-az-aut-x-001"
         },
         "lock": {
             "value": "CanNotDelete"
diff --git a/arm/Microsoft.Automation/automationAccounts/readme.md b/arm/Microsoft.Automation/automationAccounts/readme.md
index 11fff4a2e2..b95992ee0c 100644
--- a/arm/Microsoft.Automation/automationAccounts/readme.md
+++ b/arm/Microsoft.Automation/automationAccounts/readme.md
@@ -357,7 +357,7 @@ userAssignedIdentities: {
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "<<namePrefix>>-wd-aut-encr-001"
+            "value": "<<namePrefix>>-az-aut-encr-001"
         },
         "encryptionKeySource": {
             "value": "Microsoft.Keyvault"
@@ -374,7 +374,6 @@ userAssignedIdentities: {
         "keyVersion": {
             "value": "9917c14be51d4d93b37218de7d326f60"
         },
-        
         "userAssignedIdentities": {
             "value": {
                 "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001": {}
@@ -395,7 +394,7 @@ userAssignedIdentities: {
 module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bicep' = {
   name: '${uniqueString(deployment().name)}-automationAccounts'
   params: {
-    name: '<<namePrefix>>-wd-aut-encr-001'
+    name: '<<namePrefix>>-az-aut-encr-001'
     encryptionKeySource: 'Microsoft.Keyvault'
     encryptionUserAssignedIdentity: '/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<<namePrefix>>-az-msi-x-001'
     keyName: 'keyEncryptionKey'
@@ -422,7 +421,7 @@ module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bice
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "<<namePrefix>>-wd-aut-min-001"
+            "value": "<<namePrefix>>-az-aut-min-001"
         }
     }
 }
@@ -439,7 +438,7 @@ module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bice
 module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bicep' = {
   name: '${uniqueString(deployment().name)}-automationAccounts'
   params: {
-    name: '<<namePrefix>>-wd-aut-min-001'
+    name: '<<namePrefix>>-az-aut-min-001'
   }
 ```
 
@@ -458,7 +457,7 @@ module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bice
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "<<namePrefix>>-wd-aut-x-001"
+            "value": "<<namePrefix>>-az-aut-x-001"
         },
         "lock": {
             "value": "CanNotDelete"
@@ -665,7 +664,7 @@ module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bice
 module automationAccounts './Microsoft.Automation/automationAccounts/deploy.bicep' = {
   name: '${uniqueString(deployment().name)}-automationAccounts'
   params: {
-    name: '<<namePrefix>>-wd-aut-x-001'
+    name: '<<namePrefix>>-az-aut-x-001'
     lock: 'CanNotDelete'
     schedules: [
       {
diff --git a/arm/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json b/arm/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
index 0220489395..97fc2fafe4 100644
--- a/arm/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
+++ b/arm/Microsoft.OperationalInsights/workspaces/.parameters/min.parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "<<namePrefix>>-az-la-min-001"
+            "value": "<<namePrefix>>-az-law-min-001"
         }
     }
 }
diff --git a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json
index 17ebcd712b..e69b24d3ff 100644
--- a/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json
+++ b/arm/Microsoft.OperationalInsights/workspaces/.parameters/parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "<<namePrefix>>-az-la-x-001"
+            "value": "<<namePrefix>>-az-law-x-001"
         },
         "lock": {
             "value": "CanNotDelete"
@@ -34,7 +34,7 @@
             "value": [
                 {
                     "name": "Automation",
-                    "resourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<<namePrefix>>-wd-aut-x-001"
+                    "resourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<<namePrefix>>-az-aut-x-001"
                 }
             ]
         },
diff --git a/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep b/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep
index ffe87f3fae..ef5d91997d 100644
--- a/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep
+++ b/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep
@@ -192,7 +192,7 @@ module logAnalyticsWorkspace_linkedServices 'linkedServices/deploy.bicep' = [for
   params: {
     logAnalyticsWorkspaceName: logAnalyticsWorkspace.name
     name: linkedService.name
-    resourceId: linkedService.resourceId
+    resourceId: contains(linkedService, 'resourceId') ? linkedService.resourceId : ''
     writeAccessResourceId: contains(linkedService, 'writeAccessResourceId') ? linkedService.writeAccessResourceId : ''
     enableDefaultTelemetry: enableReferencedModulesTelemetry
   }
diff --git a/arm/Microsoft.OperationalInsights/workspaces/readme.md b/arm/Microsoft.OperationalInsights/workspaces/readme.md
index ca794e10bd..90c8ddfcb0 100644
--- a/arm/Microsoft.OperationalInsights/workspaces/readme.md
+++ b/arm/Microsoft.OperationalInsights/workspaces/readme.md
@@ -452,7 +452,7 @@ tags: {
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "<<namePrefix>>-az-la-min-001"
+            "value": "<<namePrefix>>-az-law-min-001"
         }
     }
 }
@@ -469,7 +469,7 @@ tags: {
 module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = {
   name: '${uniqueString(deployment().name)}-workspaces'
   params: {
-    name: '<<namePrefix>>-az-la-min-001'
+    name: '<<namePrefix>>-az-law-min-001'
   }
 ```
 
@@ -488,7 +488,7 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = {
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "<<namePrefix>>-az-la-x-001"
+            "value": "<<namePrefix>>-az-law-x-001"
         },
         "lock": {
             "value": "CanNotDelete"
@@ -519,7 +519,7 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = {
             "value": [
                 {
                     "name": "Automation",
-                    "resourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<<namePrefix>>-wd-aut-x-001"
+                    "resourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<<namePrefix>>-az-aut-x-001"
                 }
             ]
         },
@@ -667,7 +667,7 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = {
 module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = {
   name: '${uniqueString(deployment().name)}-workspaces'
   params: {
-    name: '<<namePrefix>>-az-la-x-001'
+    name: '<<namePrefix>>-az-law-x-001'
     lock: 'CanNotDelete'
     publicNetworkAccessForIngestion: 'Disabled'
     publicNetworkAccessForQuery: 'Disabled'
@@ -686,7 +686,7 @@ module workspaces './Microsoft.OperationalInsights/workspaces/deploy.bicep' = {
     linkedServices: [
       {
         name: 'Automation'
-        resourceId: '/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<<namePrefix>>-wd-aut-x-001'
+        resourceId: '/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Automation/automationAccounts/adp-<<namePrefix>>-az-aut-x-001'
       }
     ]
     savedSearches: [
diff --git a/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/parameters.json b/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/parameters.json
index 2f53ae1738..7feb8576e2 100644
--- a/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/parameters.json
+++ b/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "adp-<<namePrefix>>-wd-aut-x-001"
+            "value": "adp-<<namePrefix>>-az-aut-x-001"
         }
     }
 }