diff --git a/docs/reference/bastionhost/portal.json b/docs/reference/bastionhost/portal.json
index be2e3828..47c7d41e 100644
--- a/docs/reference/bastionhost/portal.json
+++ b/docs/reference/bastionhost/portal.json
@@ -218,21 +218,17 @@
                                         "password": "Password",
                                         "confirmPassword": "Confirm password"
                                     },
-                                    "type": "Microsoft.Compute.CredentialsCombo",
+                                    "type": "Microsoft.Common.PasswordBox",
                                     "visible": true,
-                                    "defaultValue": "",
-                                    "toolTip": {
-                                        "password": "Specify an administrator password for the Virtual Machine."
-                                    },
+                                    "toolTip": "Specify an administrator password for the Virtual Machine.",
                                     "constraints": {
                                         "required": true,
-                                        "customPasswordRegex": "^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,128}$",
-                                        "customValidationMessage": "The password must be alphanumeric, contain at least 8 characters, and have at least 1 letter, 1 number and one special character."
+                                        "regex": "^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,128}$",
+                                        "validationMessage": "The password must be alphanumeric, contain at least 8 characters, and have at least 1 letter, 1 number and one special character."
                                     },
                                     "options": {
                                         "hideConfirmation": false
-                                    },
-                                    "osPlatform": "Windows"
+                                    }
                                 },
                                 {
                                     "name": "virtualMachineSku",
@@ -517,7 +513,7 @@
                 "virtualMachineSku": "[if(empty(steps('generalSettings').virtualMachineSettings.virtualMachineSku), '', steps('generalSettings').virtualMachineSettings.virtualMachineSku)]",
                 "virtualMachineImage": "[if(empty(steps('generalSettings').virtualMachineSettings.virtualMachineImage), '', steps('generalSettings').virtualMachineSettings.virtualMachineImage)]",
                 "administratorUsername": "[if(empty(steps('generalSettings').virtualMachineSettings.administratorUsername), '', steps('generalSettings').virtualMachineSettings.administratorUsername)]",
-                "administratorPassword": "[if(empty(steps('generalSettings').virtualMachineSettings.administratorPassword.password), '', steps('generalSettings').virtualMachineSettings.administratorPassword.password)]"
+                "administratorPassword": "[if(empty(steps('generalSettings').virtualMachineSettings.administratorPassword), '', steps('generalSettings').virtualMachineSettings.administratorPassword)]"
             }
         }
     }
diff --git a/docs/reference/buildagents/portal.json b/docs/reference/buildagents/portal.json
index 1553834b..776d3310 100644
--- a/docs/reference/buildagents/portal.json
+++ b/docs/reference/buildagents/portal.json
@@ -252,21 +252,17 @@
                                         "password": "Password",
                                         "confirmPassword": "Confirm password"
                                     },
-                                    "type": "Microsoft.Compute.CredentialsCombo",
+                                    "type": "Microsoft.Common.PasswordBox",
                                     "visible": true,
-                                    "defaultValue": "",
-                                    "toolTip": {
-                                        "password": "Specify an administrator password for the Virtual Machine."
-                                    },
+                                    "toolTip": "Specify an administrator password for the Virtual Machine.",
                                     "constraints": {
                                         "required": true,
-                                        "customPasswordRegex": "^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,128}$",
-                                        "customValidationMessage": "The password must be alphanumeric, contain at least 8 characters, and have at least 1 letter, 1 number and one special character."
+                                        "regex": "^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,128}$",
+                                        "validationMessage": "The password must be alphanumeric, contain at least 8 characters, and have at least 1 letter, 1 number and one special character."
                                     },
                                     "options": {
                                         "hideConfirmation": false
-                                    },
-                                    "osPlatform": "Windows"
+                                    }
                                 },
                                 {
                                     "name": "virtualMachineSku",
@@ -431,7 +427,7 @@
                 "subnetId": "[if(empty(steps('connectivitySettings').virtualNetworkConfiguration.subnetId), '', steps('connectivitySettings').virtualNetworkConfiguration.subnetId)]",
                 "virtualMachineSku": "[if(empty(steps('generalSettings').virtualMachineScaleSetSettings.virtualMachineSku), '', steps('generalSettings').virtualMachineScaleSetSettings.virtualMachineSku)]",
                 "administratorUsername": "[if(empty(steps('generalSettings').virtualMachineScaleSetSettings.administratorUsername), '', steps('generalSettings').virtualMachineScaleSetSettings.administratorUsername)]",
-                "administratorPassword": "[if(empty(steps('generalSettings').virtualMachineScaleSetSettings.administratorPassword.password), '', steps('generalSettings').virtualMachineScaleSetSettings.administratorPassword.password)]"
+                "administratorPassword": "[if(empty(steps('generalSettings').virtualMachineScaleSetSettings.administratorPassword), '', steps('generalSettings').virtualMachineScaleSetSettings.administratorPassword)]"
             }
         }
     }
diff --git a/docs/reference/portal.dataManagementAnalytics.json b/docs/reference/portal.dataManagementAnalytics.json
index 0af20605..0f4f45c2 100644
--- a/docs/reference/portal.dataManagementAnalytics.json
+++ b/docs/reference/portal.dataManagementAnalytics.json
@@ -665,21 +665,17 @@
                                         "password": "Password",
                                         "confirmPassword": "Confirm password"
                                     },
-                                    "type": "Microsoft.Compute.CredentialsCombo",
+                                    "type": "Microsoft.Common.PasswordBox",
                                     "visible": true,
-                                    "defaultValue": "",
-                                    "toolTip": {
-                                        "password": "Specify an administrator password for the Synapse workspaces and Self-hosted integration runtimes hosted on VMSS."
-                                    },
+                                    "toolTip": "Specify an administrator password for the Synapse workspaces and Self-hosted integration runtimes hosted on VMSS.",
                                     "constraints": {
                                         "required": true,
-                                        "customPasswordRegex": "^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,128}$",
-                                        "customValidationMessage": "The password must be alphanumeric, contain at least 8 characters, and have at least 1 letter, 1 number and one special character."
+                                        "regex": "^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,128}$",
+                                        "validationMessage": "The password must be alphanumeric, contain at least 8 characters, and have at least 1 letter, 1 number and one special character."
                                     },
                                     "options": {
                                         "hideConfirmation": false
-                                    },
-                                    "osPlatform": "Windows"
+                                    }
                                 }
                             ]
                         },
@@ -778,7 +774,7 @@
                 "dataManagementZonePrefix": "[steps('dataManagementZoneSettings').dataManagementZonesName.dataManagementZonesPrefix]",
                 "dataManagementZoneLocation": "[steps('dataManagementZoneSettings').deploymentDetails.locationName]",
                 "administratorUsername": "SuperMainUser",
-                "administratorPassword": "[steps('dataLandingZoneSettings').dataLandingZonesServicesSettings.administratorPassword.password]",
+                "administratorPassword": "[steps('dataLandingZoneSettings').dataLandingZonesServicesSettings.administratorPassword]",
                 "dataLandingZoneDetails": "[steps('dataLandingZoneSettings').deploymentDetails.dataLandingZones]",
                 "dataLandingZonePrefix": "[steps('dataLandingZoneSettings').dataLandingZonesName.dataLandingZonesPrefix]",
                 "enableBastionHostDeployment": "[steps('dataLandingZoneSettings').azureBastionSettings.azureBastionCheckbox]",