diff --git a/notcompute.yaml b/notcompute.yaml
index 2ad5b30bfc..5a4d9d21d0 100644
--- a/notcompute.yaml
+++ b/notcompute.yaml
@@ -84,6 +84,11 @@ Parameters:
     NoEcho: true
   notcomputeImage:
     Type: String
+  HeatStackDomainAdminPassword:
+    Description: Password for heat_domain_admin user.
+    Type: String
+    Default: ''
+    NoEcho: true
 Resources:
   AccessPolicy:
     Properties:
@@ -163,6 +168,7 @@ Resources:
           region:
             Ref: AWS::Region
         auth_encryption_key: unset
+        stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
       interfaces:
         control:
           Ref: NovaInterfaces
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 42fc07a6be..90543bbe58 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -140,6 +140,11 @@ Parameters:
     Type: String
     Default: unset
     Description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change.
+  HeatStackDomainAdminPassword:
+    Description: Password for heat_domain_admin user.
+    Type: String
+    Default: ''
+    NoEcho: true
 Resources:
   RabbitCookie:
     Type: OS::Heat::RandomString
@@ -326,6 +331,7 @@ Resources:
         admin_user: heat
         auth_encryption_key: unset___________
         db: mysql://heat:unset@localhost/heat
+        stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
         watch_server_url:
           Fn::Join:
             - ''
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 4fe2976c02..f18612c87b 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -67,6 +67,11 @@ Parameters:
     Type: String
     Default: unset
     Description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change.
+  HeatStackDomainAdminPassword:
+    Description: Password for heat_domain_admin user.
+    Type: String
+    Default: ''
+    NoEcho: true
 Resources:
   RabbitCookie:
     Type: OS::Heat::RandomString
@@ -142,6 +147,7 @@ Resources:
         admin_user: heat
         auth_encryption_key: unset___________
         db: mysql://heat:unset@localhost/heat
+        stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
         watch_server_url:
           Fn::Join:
             - ''