diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 949e6b75d3..44e7196fee 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -412,6 +412,16 @@ parameters:
     description: The name of the stack/plan.
     type: string
 
+  AdminPassword:
+    description: The password for the keystone admin account, used for monitoring, querying neutron etc.
+    type: string
+    hidden: true
+
+  KeystoneRegion:
+    type: string
+    default: 'regionOne'
+    description: Keystone region for endpoint
+
 {% for role in roles %}
 {%- if role.deprecated_param_scheduler_hints is defined or role.deprecated_param_extraconfig is defined %}
 {%- if not parameter_groups_defined|default(false) %}
@@ -1370,3 +1380,9 @@ outputs:
     value:
       roles_data: {{ roles }}
       networks_data: {{ networks }}
+  AdminPassword:
+    description: The password for the keystone admin account, used for monitoring, querying neutron etc.
+    value: {get_param: AdminPassword}
+  KeystoneRegion:
+    description: Keystone region for endpoint
+    value: {get_param: KeystoneRegion}