diff --git a/roles/overcloud-deploy/templates/overcloud-deploy-post.sh.j2 b/roles/overcloud-deploy/templates/overcloud-deploy-post.sh.j2
index 8ea249e23..c358a54fb 100644
--- a/roles/overcloud-deploy/templates/overcloud-deploy-post.sh.j2
+++ b/roles/overcloud-deploy/templates/overcloud-deploy-post.sh.j2
@@ -38,21 +38,4 @@ $(openstack stack output show {{ stack_name }} PublicVip \
 ## END OVERCLOUD HOSTS    #nodocs
 EOF
 {% endif -%}
-
-## * Create the `heat_stack_owner` role if it doesn't already exist.
-## ::
-
-if openstack stack output show {{ stack_name }} EnabledServices \
-        -f value -c output_value | grep -q keystone; then
-
-    ## * Source in the {{ stack_name }} credentials.
-    ## ::
-
-    . {{ working_dir }}/{{ stack_name }}rc
-
-    if ! openstack role show heat_stack_owner > /dev/null 2>&1; then
-        openstack role create heat_stack_owner
-        openstack role add --project admin --user admin heat_stack_owner
-    fi
-fi
 ### --stop_docs
diff --git a/roles/validate-tempest/files/tempest-undercloud-config.conf b/roles/validate-tempest/files/tempest-undercloud-config.conf
index 908ee6e38..e06b8faab 100644
--- a/roles/validate-tempest/files/tempest-undercloud-config.conf
+++ b/roles/validate-tempest/files/tempest-undercloud-config.conf
@@ -4,9 +4,6 @@ console_output = false
 [object-storage]
 operator_role = swiftoperator
 
-[orchestration]
-stack_owner_role = heat_stack_owner
-
 [volume]
 backend1_name = tripleo_iscsi