diff --git a/releasenotes/notes/Update_heat_deprecation_references-649da9a605fb40de.yaml b/releasenotes/notes/Update_heat_deprecation_references-649da9a605fb40de.yaml
new file mode 100644
index 000000000..bdcf9b03f
--- /dev/null
+++ b/releasenotes/notes/Update_heat_deprecation_references-649da9a605fb40de.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    The references to the Heat command are deprecated from Mitaka release and
+    we should now be using the OpenStack CLI instead.
diff --git a/roles/overcloud-deploy/templates/overcloud-deploy-post.sh.j2 b/roles/overcloud-deploy/templates/overcloud-deploy-post.sh.j2
index 8235f9ae3..4c0773527 100644
--- a/roles/overcloud-deploy/templates/overcloud-deploy-post.sh.j2
+++ b/roles/overcloud-deploy/templates/overcloud-deploy-post.sh.j2
@@ -26,10 +26,11 @@ sudo sed -i '/^## BEGIN OVERCLOUD HOSTS/,/^## END OVERCLOUD HOSTS/ d' $HOSTFILE
 
 cat <<EOF | sudo tee -a $HOSTFILE
 ## BEGIN OVERCLOUD HOSTS  #nodocs
-$(heat output-show -F raw overcloud HostsEntry)
+$(openstack stack output show overcloud HostsEntry -f value -c output_value)
 
 {% if enable_pacemaker|bool and release == 'mitaka' %}
-$(heat output-show -F raw overcloud PublicVip) overcloud-public-vip
+$(openstack stack output show overcloud PublicVip \
+            -f value -c output_value) overcloud-public-vip
 {% endif %}
 ## END OVERCLOUD HOSTS    #nodocs
 EOF
diff --git a/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2 b/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2
index fc4e97dbc..d894253e4 100644
--- a/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2
+++ b/roles/overcloud-deploy/templates/overcloud-deploy.sh.j2
@@ -69,15 +69,15 @@ openstack overcloud deploy \
 
 ### --stop_docs
 # We don't always get a useful error code from the openstack deploy command,
-# so check `heat stack-list` for a CREATE_FAILED status.
-if heat stack-list | grep -q 'CREATE_FAILED'; then
+# so check `openstack stack list` for a CREATE_FAILED status.
+if openstack stack list | grep -q 'CREATE_FAILED'; then
     {%if release not in ['mitaka', 'liberty'] %}
     # get the failures list
     openstack stack failures list overcloud > failed_deployment_list.log || true
     {% endif %}
 
     # get any puppet related errors
-    for failed in $(heat resource-list \
+    for failed in $(openstack stack resource list \
         --nested-depth 5 overcloud | grep FAILED |
         grep 'StructuredDeployment ' | cut -d '|' -f3)
     do
diff --git a/roles/overcloud-deploy/templates/overcloud-status.sh.j2 b/roles/overcloud-deploy/templates/overcloud-status.sh.j2
index d80ec4c55..91d0fb43b 100644
--- a/roles/overcloud-deploy/templates/overcloud-status.sh.j2
+++ b/roles/overcloud-deploy/templates/overcloud-status.sh.j2
@@ -1,2 +1,2 @@
 source $HOME/stackrc
-heat resource-list -n5 overcloud | grep -v COMPLETE
+openstack stack resource list -n5 overcloud | grep -v COMPLETE