diff --git a/avm/res/azure-stack-hci/cluster/README.md b/avm/res/azure-stack-hci/cluster/README.md
index 4cb635ad3f..3576848736 100644
--- a/avm/res/azure-stack-hci/cluster/README.md
+++ b/avm/res/azure-stack-hci/cluster/README.md
@@ -49,7 +49,7 @@ module cluster 'br/public:avm/res/azure-stack-hci/cluster:<version>' = {
     deploymentSettings: {
       clusterNodeNames: '<clusterNodeNames>'
       clusterWitnessStorageAccountName: '<clusterWitnessStorageAccountName>'
-      customLocationName: 'ashc2nmin-location'
+      customLocationName: 'ashcmin-location'
       defaultGateway: '172.20.0.1'
       deploymentPrefix: '<deploymentPrefix>'
       dnsServers: [
@@ -181,7 +181,7 @@ module cluster 'br/public:avm/res/azure-stack-hci/cluster:<version>' = {
       "value": {
         "clusterNodeNames": "<clusterNodeNames>",
         "clusterWitnessStorageAccountName": "<clusterWitnessStorageAccountName>",
-        "customLocationName": "ashc2nmin-location",
+        "customLocationName": "ashcmin-location",
         "defaultGateway": "172.20.0.1",
         "deploymentPrefix": "<deploymentPrefix>",
         "dnsServers": [
@@ -309,7 +309,7 @@ param name = '<name>'
 param deploymentSettings = {
   clusterNodeNames: '<clusterNodeNames>'
   clusterWitnessStorageAccountName: '<clusterWitnessStorageAccountName>'
-  customLocationName: 'ashc2nmin-location'
+  customLocationName: 'ashcmin-location'
   defaultGateway: '172.20.0.1'
   deploymentPrefix: '<deploymentPrefix>'
   dnsServers: [
@@ -442,7 +442,7 @@ module cluster 'br/public:avm/res/azure-stack-hci/cluster:<version>' = {
       bitlockerDataVolumes: true
       clusterNodeNames: '<clusterNodeNames>'
       clusterWitnessStorageAccountName: '<clusterWitnessStorageAccountName>'
-      customLocationName: 'ashc2nwaf-location'
+      customLocationName: 'ashcwaf-location'
       defaultGateway: '172.20.0.1'
       deploymentPrefix: '<deploymentPrefix>'
       dnsServers: [
@@ -585,7 +585,7 @@ module cluster 'br/public:avm/res/azure-stack-hci/cluster:<version>' = {
         "bitlockerDataVolumes": true,
         "clusterNodeNames": "<clusterNodeNames>",
         "clusterWitnessStorageAccountName": "<clusterWitnessStorageAccountName>",
-        "customLocationName": "ashc2nwaf-location",
+        "customLocationName": "ashcwaf-location",
         "defaultGateway": "172.20.0.1",
         "deploymentPrefix": "<deploymentPrefix>",
         "dnsServers": [
@@ -726,7 +726,7 @@ param deploymentSettings = {
   bitlockerDataVolumes: true
   clusterNodeNames: '<clusterNodeNames>'
   clusterWitnessStorageAccountName: '<clusterWitnessStorageAccountName>'
-  customLocationName: 'ashc2nwaf-location'
+  customLocationName: 'ashcwaf-location'
   defaultGateway: '172.20.0.1'
   deploymentPrefix: '<deploymentPrefix>'
   dnsServers: [
diff --git a/avm/res/azure-stack-hci/cluster/deployment-setting/main.json b/avm/res/azure-stack-hci/cluster/deployment-setting/main.json
index 2edb982bfa..de60f2e4ac 100644
--- a/avm/res/azure-stack-hci/cluster/deployment-setting/main.json
+++ b/avm/res/azure-stack-hci/cluster/deployment-setting/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.33.93.31351",
-      "templateHash": "7982158538530558379"
+      "version": "0.33.13.18514",
+      "templateHash": "10232132824907554113"
     },
     "name": "Azure Stack HCI Cluster Deployment Settings",
     "description": "This module deploys an Azure Stack HCI Cluster Deployment Settings resource."
diff --git a/avm/res/azure-stack-hci/cluster/main.json b/avm/res/azure-stack-hci/cluster/main.json
index f082101b8d..0a2481719a 100644
--- a/avm/res/azure-stack-hci/cluster/main.json
+++ b/avm/res/azure-stack-hci/cluster/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.33.93.31351",
-      "templateHash": "2661952410917464461"
+      "version": "0.33.13.18514",
+      "templateHash": "2800706656796817324"
     },
     "name": "Azure Stack HCI Cluster",
     "description": "This module deploys an Azure Stack HCI Cluster on the provided Arc Machines."
@@ -837,8 +837,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.93.31351",
-              "templateHash": "7982158538530558379"
+              "version": "0.33.13.18514",
+              "templateHash": "10232132824907554113"
             },
             "name": "Azure Stack HCI Cluster Deployment Settings",
             "description": "This module deploys an Azure Stack HCI Cluster Deployment Settings resource."
diff --git a/avm/res/azure-stack-hci/cluster/tests/e2e/defaults/main.test.bicep b/avm/res/azure-stack-hci/cluster/tests/e2e/defaults/main.test.bicep
index e9f5b6771e..4bd69b5dcf 100644
--- a/avm/res/azure-stack-hci/cluster/tests/e2e/defaults/main.test.bicep
+++ b/avm/res/azure-stack-hci/cluster/tests/e2e/defaults/main.test.bicep
@@ -8,7 +8,7 @@ metadata description = 'This test deploys an Azure VM to host a 2 node switched
 param resourceGroupName string = 'dep-${namePrefix}-azure-stack-hci.cluster-${serviceShort}-rg'
 
 @description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'ashc2nmin'
+param serviceShort string = 'ashcmin'
 
 @description('Optional. A token to inject into the name of each resource.')
 param namePrefix string = '#_namePrefix_#'
@@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = {
   name: '${uniqueString(deployment().name, enforcedLocation)}-test-nestedDependencies-${serviceShort}'
   scope: resourceGroup
   params: {
-    clusterName: '${namePrefix}${serviceShort}001'
+    clusterName: '${namePrefix}${serviceShort}1'
     clusterWitnessStorageAccountName: 'dep${namePrefix}wst${serviceShort}'
     keyVaultDiagnosticStorageAccountName: 'dep${namePrefix}st${serviceShort}'
     keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}'
diff --git a/avm/res/azure-stack-hci/cluster/tests/e2e/waf-aligned/main.test.bicep b/avm/res/azure-stack-hci/cluster/tests/e2e/waf-aligned/main.test.bicep
index 5fd4a0c051..131c3d6769 100644
--- a/avm/res/azure-stack-hci/cluster/tests/e2e/waf-aligned/main.test.bicep
+++ b/avm/res/azure-stack-hci/cluster/tests/e2e/waf-aligned/main.test.bicep
@@ -8,7 +8,7 @@ metadata description = 'This test deploys an Azure VM to host a 2 node switched
 param resourceGroupName string = 'dep-${namePrefix}-azure-stack-hci.cluster-${serviceShort}-rg'
 
 @description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'ashc2nwaf'
+param serviceShort string = 'ashcwaf'
 
 @description('Optional. A token to inject into the name of each resource.')
 param namePrefix string = '#_namePrefix_#'
@@ -49,7 +49,7 @@ module nestedDependencies 'dependencies.bicep' = {
   name: '${uniqueString(deployment().name, enforcedLocation)}-test-nestedDependencies-${serviceShort}'
   scope: resourceGroup
   params: {
-    clusterName: '${namePrefix}${serviceShort}001'
+    clusterName: '${namePrefix}${serviceShort}1'
     clusterWitnessStorageAccountName: 'dep${namePrefix}wst${serviceShort}'
     keyVaultDiagnosticStorageAccountName: 'dep${namePrefix}st${serviceShort}'
     keyVaultName: 'dep-${namePrefix}-kv-${serviceShort}'