diff --git a/arm/Microsoft.CognitiveServices/accounts/parameters/parameters.json b/arm/Microsoft.CognitiveServices/accounts/parameters/parameters.json
index e05961834a..eacf82aac4 100644
--- a/arm/Microsoft.CognitiveServices/accounts/parameters/parameters.json
+++ b/arm/Microsoft.CognitiveServices/accounts/parameters/parameters.json
@@ -12,7 +12,7 @@
       "value": "F0"
     },
     "diagnosticStorageAccountId": {
-      "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/dependencies-rg/providers/Microsoft.Storage/storageAccounts/sxxazsaweux003"
+      "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaweux001"
     },
     "workspaceId": {
       "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-sxx-az-la-weu-x-001"
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/parameters/linux.parameters.json b/arm/Microsoft.Compute/virtualMachineScaleSets/parameters/linux.parameters.json
index 266743d158..49af34766f 100644
--- a/arm/Microsoft.Compute/virtualMachineScaleSets/parameters/linux.parameters.json
+++ b/arm/Microsoft.Compute/virtualMachineScaleSets/parameters/linux.parameters.json
@@ -44,7 +44,7 @@
             "value": true
         },
         "bootDiagnosticStorageAccountName": {
-            "value": "sxxazsaweux003"
+            "value": "adpsxxazsaweux001"
         },
         "osType": {
             "value": "Linux"
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/parameters/windows.parameters.json b/arm/Microsoft.Compute/virtualMachineScaleSets/parameters/windows.parameters.json
index 650b623ea4..791f3984f8 100644
--- a/arm/Microsoft.Compute/virtualMachineScaleSets/parameters/windows.parameters.json
+++ b/arm/Microsoft.Compute/virtualMachineScaleSets/parameters/windows.parameters.json
@@ -76,8 +76,8 @@
         // "windowsScriptExtensionFileData": {
         //     "value": [
         //         {
-        //             "uri": "https://sxxazsaweux003.blob.core.windows.net/avdscripts/testscript.ps1",
-        //             "storageAccountId": "/subscriptions/<placeholder>/resourceGroups/dependencies-rg/providers/Microsoft.Storage/storageAccounts/sxxazsaweux003"
+        //             "uri": "https://adpsxxazsaweux001.blob.core.windows.net/avdscripts/testscript.ps1",
+        //             "storageAccountId": "/subscriptions/<placeholder>/resourceGroups/dependencies-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaweux001"
         //         }
         //     ]
         // },
diff --git a/arm/Microsoft.Compute/virtualMachines/parameters/parameters.json b/arm/Microsoft.Compute/virtualMachines/parameters/parameters.json
index 0328c36139..fde4b554ed 100644
--- a/arm/Microsoft.Compute/virtualMachines/parameters/parameters.json
+++ b/arm/Microsoft.Compute/virtualMachines/parameters/parameters.json
@@ -64,13 +64,13 @@
         //     "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-sxx-az-la-weu-x-001"
         // },
         // "diagnosticStorageAccountId": {
-        //     "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/dependencies-rg/providers/Microsoft.Storage/storageAccounts/sxxazsaweux003"
+        //     "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaweux001"
         // },
         // "enableWindowsMMAAgent": {
         //     "value": true
         // },
         // "bootDiagnosticStorageAccountName": {
-        //     "value": "sxxazsaweux003"
+        //     "value": "adpsxxazsaweux001"
         // }
         // "roleAssignments": {
         //     "value": [
diff --git a/arm/Microsoft.DataFactory/factories/parameters/parameters.json b/arm/Microsoft.DataFactory/factories/parameters/parameters.json
index affd53c573..cb1a8fad60 100644
--- a/arm/Microsoft.DataFactory/factories/parameters/parameters.json
+++ b/arm/Microsoft.DataFactory/factories/parameters/parameters.json
@@ -66,7 +66,7 @@
     //   "value": 1
     // },
     // "diagnosticStorageAccountId": {
-    //   "value": "/subscriptions/xxx-xxx-xxx-xxx-xxx/resourceGroups/dependencies-rg/providers/Microsoft.Storage/storageAccounts/sxxazsaweux003"
+    //   "value": "/subscriptions/xxx-xxx-xxx-xxx-xxx/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaweux001"
     // }
   }
 }
\ No newline at end of file
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/parameters/parameters.json b/arm/Microsoft.MachineLearningServices/workspaces/parameters/parameters.json
index c50703ab88..1214ee6140 100644
--- a/arm/Microsoft.MachineLearningServices/workspaces/parameters/parameters.json
+++ b/arm/Microsoft.MachineLearningServices/workspaces/parameters/parameters.json
@@ -9,7 +9,7 @@
       "value": "Basic"
     },
     "associatedStorageAccountResourceId": {
-      "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/dependencies-rg/providers/Microsoft.Storage/storageAccounts/sxxazsaweux003"
+      "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaweux001"
     },
     "associatedKeyVaultResourceId": {
       "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.KeyVault/vaults/adp-sxx-az-kv-weu-x-001"
diff --git a/arm/Microsoft.Network/networkSecurityGroups/parameters/parameters.json b/arm/Microsoft.Network/networkSecurityGroups/parameters/parameters.json
index 00bc4ef99c..4de64e7cda 100644
--- a/arm/Microsoft.Network/networkSecurityGroups/parameters/parameters.json
+++ b/arm/Microsoft.Network/networkSecurityGroups/parameters/parameters.json
@@ -73,7 +73,7 @@
         //     "value": "NetworkWatcher_westeurope"
         // },
         "diagnosticStorageAccountId": {
-            "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/dependencies-rg/providers/Microsoft.Storage/storageAccounts/sxxazsaweux003"
+            "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaweux001"
         },
         "retentionEnabled": {
             "value": false
diff --git a/arm/Microsoft.Network/networkWatcherFlowLogs/parameters/parameters.json b/arm/Microsoft.Network/networkWatcherFlowLogs/parameters/parameters.json
index 4293af8a70..818128c777 100644
--- a/arm/Microsoft.Network/networkWatcherFlowLogs/parameters/parameters.json
+++ b/arm/Microsoft.Network/networkWatcherFlowLogs/parameters/parameters.json
@@ -9,7 +9,7 @@
       "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/dependencies-rg/providers/Microsoft.Network/networkSecurityGroups/sxx-az-nsg-weu-x-003"
     },
     "diagnosticStorageAccountId": {
-      "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/dependencies-rg/providers/Microsoft.Storage/storageAccounts/sxxazsaweux003"
+      "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaweux001"
     },
     "retentionEnabled": {
       "value": false
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/parameters/expressRoute.parameters.json b/arm/Microsoft.Network/virtualNetworkGateways/parameters/expressRoute.parameters.json
index 00783b3e71..ff65b60432 100644
--- a/arm/Microsoft.Network/virtualNetworkGateways/parameters/expressRoute.parameters.json
+++ b/arm/Microsoft.Network/virtualNetworkGateways/parameters/expressRoute.parameters.json
@@ -24,16 +24,16 @@
             "value": 365
         },
         "diagnosticStorageAccountId": {
-            "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/dependencies-rg/providers/Microsoft.Storage/storageAccounts/sxxazsaweux003"
+            "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adpsxxazsaweux001"
         },
         "workspaceId": {
             "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-sxx-az-la-weu-x-001"
         },
         "eventHubAuthorizationRuleId": {
-            "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/dependencies-rg/providers/Microsoft.EventHub/namespaces/sxx-az-evhns-weu-x-003/AuthorizationRules/RootManageSharedAccessKey"
+            "value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-sxx-az-evhns-weu-x-001/AuthorizationRules/RootManageSharedAccessKey"
         },
         "eventHubName": {
-            "value": "sxx-az-evhns-weu-x-003"
+            "value": "adp-sxx-az-evh-weu-x-001"
         },
         "lockForDeletion": {
             "value": false
diff --git a/arm/Microsoft.Web/sites/parameters/function.parameters.json b/arm/Microsoft.Web/sites/parameters/function.parameters.json
index e205d7921d..ebcc3d2bb1 100644
--- a/arm/Microsoft.Web/sites/parameters/function.parameters.json
+++ b/arm/Microsoft.Web/sites/parameters/function.parameters.json
@@ -29,10 +29,10 @@
             }
         },
         "storageAccountName": {
-            "value": "sxxazsaweux003"
+            "value": "adpsxxazsaweux002"
         },
         "storageAccountResourceGroupName": {
-            "value": "dependencies-rg"
+            "value": "validation-rg"
         },
         "functionsWorkerRuntime": {
             "value": "powershell"