diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 508e864d17..9a1f36c618 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -20,6 +20,7 @@
 {% set deploy_steps_max = 6 -%}
 {% set update_steps_max = 6 -%}
 {% set upgrade_steps_max = 6 -%}
+{% set post_upgrade_steps_max = 2 -%}
 
 heat_template_version: queens
 
@@ -553,3 +554,15 @@ outputs:
               with_sequence: start=0 end={{upgrade_steps_max-1}}
               loop_control:
                 loop_var: step
+      post_upgrade_steps_tasks: |
+{%- for role in roles %}
+            - include: {{role.name}}/post_upgrade_tasks.yaml
+              when: role_name == '{{role.name}}'
+{%- endfor %}
+      post_upgrade_steps_playbook: |
+        - hosts: overcloud
+          tasks:
+            - include: post_upgrade_steps_tasks.yaml
+              with_sequence: start=0 end={{post_upgrade_steps_max-1}}
+              loop_control:
+                loop_var: step