diff --git a/avm/ptn/ai-platform/baseline/README.md b/avm/ptn/ai-platform/baseline/README.md
index 4a14390bbe..f34badc550 100644
--- a/avm/ptn/ai-platform/baseline/README.md
+++ b/avm/ptn/ai-platform/baseline/README.md
@@ -107,7 +107,7 @@ module baseline 'br/public:avm/ptn/ai-platform/baseline:<version>' = {
     // Non-required parameters
     virtualMachineConfiguration: {
       adminPassword: '<adminPassword>'
-      adminUsername: '<adminUsername>'
+      adminUsername: 'localAdminUser'
     }
   }
 }
@@ -133,7 +133,7 @@ module baseline 'br/public:avm/ptn/ai-platform/baseline:<version>' = {
     "virtualMachineConfiguration": {
       "value": {
         "adminPassword": "<adminPassword>",
-        "adminUsername": "<adminUsername>"
+        "adminUsername": "localAdminUser"
       }
     }
   }
@@ -197,7 +197,7 @@ module baseline 'br/public:avm/ptn/ai-platform/baseline:<version>' = {
     }
     virtualMachineConfiguration: {
       adminPassword: '<adminPassword>'
-      adminUsername: '<adminUsername>'
+      adminUsername: 'localAdminUser'
       enableAadLoginExtension: true
       enableAzureMonitorAgent: true
       enabled: true
@@ -338,7 +338,7 @@ module baseline 'br/public:avm/ptn/ai-platform/baseline:<version>' = {
     "virtualMachineConfiguration": {
       "value": {
         "adminPassword": "<adminPassword>",
-        "adminUsername": "<adminUsername>",
+        "adminUsername": "localAdminUser",
         "enableAadLoginExtension": true,
         "enableAzureMonitorAgent": true,
         "enabled": true,
@@ -551,7 +551,7 @@ module baseline 'br/public:avm/ptn/ai-platform/baseline:<version>' = {
     }
     virtualMachineConfiguration: {
       adminPassword: '<adminPassword>'
-      adminUsername: '<adminUsername>'
+      adminUsername: 'localAdminUser'
       enableAadLoginExtension: true
       enableAzureMonitorAgent: true
       maintenanceConfigurationResourceId: '<maintenanceConfigurationResourceId>'
@@ -601,7 +601,7 @@ module baseline 'br/public:avm/ptn/ai-platform/baseline:<version>' = {
     "virtualMachineConfiguration": {
       "value": {
         "adminPassword": "<adminPassword>",
-        "adminUsername": "<adminUsername>",
+        "adminUsername": "localAdminUser",
         "enableAadLoginExtension": true,
         "enableAzureMonitorAgent": true,
         "maintenanceConfigurationResourceId": "<maintenanceConfigurationResourceId>",
diff --git a/avm/ptn/ai-platform/baseline/tests/e2e/defaults/main.test.bicep b/avm/ptn/ai-platform/baseline/tests/e2e/defaults/main.test.bicep
index 8ca6ce833f..6bbf94c845 100644
--- a/avm/ptn/ai-platform/baseline/tests/e2e/defaults/main.test.bicep
+++ b/avm/ptn/ai-platform/baseline/tests/e2e/defaults/main.test.bicep
@@ -23,10 +23,6 @@ param baseTime string = utcNow('u')
 @description('Optional. A token to inject into the name of each resource.')
 param namePrefix string = '#_namePrefix_#'
 
-@description('Generated. The username to leverage for the login.')
-@secure()
-param username string = uniqueString(newGuid())
-
 @description('Generated. The password to leverage for the login.')
 @secure()
 param password string = newGuid()
@@ -54,7 +50,7 @@ module testDeployment '../../../main.bicep' = [
     params: {
       name: '${namePrefix}${serviceShort}${substring(uniqueString(baseTime), 0, 3)}'
       virtualMachineConfiguration: {
-        adminUsername: username
+        adminUsername: 'localAdminUser'
         adminPassword: password
       }
     }
diff --git a/avm/ptn/ai-platform/baseline/tests/e2e/max/main.test.bicep b/avm/ptn/ai-platform/baseline/tests/e2e/max/main.test.bicep
index f7fefabb86..240496050a 100644
--- a/avm/ptn/ai-platform/baseline/tests/e2e/max/main.test.bicep
+++ b/avm/ptn/ai-platform/baseline/tests/e2e/max/main.test.bicep
@@ -23,10 +23,6 @@ param baseTime string = utcNow('u')
 @description('Optional. A token to inject into the name of each resource.')
 param namePrefix string = '#_namePrefix_#'
 
-@description('Generated. The username to leverage for the login.')
-@secure()
-param username string = uniqueString(newGuid())
-
 @description('Generated. The password to leverage for the login.')
 @secure()
 param password string = newGuid()
@@ -116,7 +112,7 @@ module testDeployment '../../../main.bicep' = [
         name: take('${namePrefix}-vm-${serviceShort}', 15)
         zone: 0
         size: 'Standard_DS1_v2'
-        adminUsername: username
+        adminUsername: 'localAdminUser'
         adminPassword: password
         nicConfigurationConfiguration: {
           name: '${namePrefix}-nic-${serviceShort}'
@@ -152,7 +148,7 @@ module testDeployment '../../../main.bicep' = [
         computes: [
           {
             computeType: 'ComputeInstance'
-            name: 'compute-${substring(uniqueString(baseTime), 0, 3)}'
+            name: 'c-${substring(uniqueString(baseTime), 0, 3)}-${serviceShort}'
             description: 'Default'
             location: resourceLocation
             properties: {
diff --git a/avm/ptn/ai-platform/baseline/tests/e2e/waf-aligned/main.test.bicep b/avm/ptn/ai-platform/baseline/tests/e2e/waf-aligned/main.test.bicep
index daadf0911c..21d1ba8934 100644
--- a/avm/ptn/ai-platform/baseline/tests/e2e/waf-aligned/main.test.bicep
+++ b/avm/ptn/ai-platform/baseline/tests/e2e/waf-aligned/main.test.bicep
@@ -24,10 +24,6 @@ param baseTime string = utcNow('u')
 @description('Optional. A token to inject into the name of each resource.')
 param namePrefix string = '#_namePrefix_#'
 
-@description('Generated. The username to leverage for the login.')
-@secure()
-param username string = uniqueString(newGuid())
-
 @description('Generated. The password to leverage for the login.')
 @secure()
 param password string = newGuid()
@@ -65,7 +61,7 @@ module testDeployment '../../../main.bicep' = [
     params: {
       name: '${namePrefix}${serviceShort}${substring(uniqueString(baseTime), 0, 3)}'
       virtualMachineConfiguration: {
-        adminUsername: username
+        adminUsername: 'localAdminUser'
         adminPassword: password
         enableAadLoginExtension: true
         enableAzureMonitorAgent: true