diff --git a/doc/source/index.rst b/doc/source/index.rst
index 437f78e23..bf83f0d25 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -30,6 +30,16 @@ Existing validations:
    validations-openshift-on-openstack-details
    validations-pre-upgrade-details
    validations-post-upgrade-details
+   validations-pre-system-upgrade-details
+   validations-post-system-upgrade-details
+   validations-pre-undercloud-upgrade-details
+   validations-post-undercloud-upgrade-details
+   validations-pre-overcloud-prepare-details
+   validations-post-overcloud-prepare-details
+   validations-pre-overcloud-upgrade-details
+   validations-post-overcloud-upgrade-details
+   validations-pre-overcloud-converge-details
+   validations-post-overcloud-converge-details
    validations-pre-ceph-details
    validations-post-ceph-details
 
diff --git a/groups.yaml b/groups.yaml
index 088a7d0b8..07a3d7fd3 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -32,6 +32,46 @@ post-upgrade:
   - description: >-
       Validations which try to validate your OpenStack deployment after you
       upgrade it.
+pre-system-upgrade:
+  - description: >-
+      Validations which verify that the operating system can be upgraded in
+      the target node
+post-system-upgrade:
+  - description: >-
+      Validations which verify that the operating system upgrade went fine
+      in the target node.
+pre-undercloud-upgrade:
+  - description: >-
+      Validations which verify that the undercloud is in a correct state
+      before upgrading.
+post-undercloud-upgrade:
+  - description: >-
+      Validations which verify that the undercloud is in a correct state
+      after upgrading.
+pre-overcloud-prepare:
+  - description: >-
+      Set of validations that check the right content for the templates passed
+      to the overcloud upgrade prepare step.
+post-overcloud-prepare:
+  - description: >-
+      Validations which verify that the overcloud is in a correct state
+      after running overcloud upgrade  prepare step.
+pre-overcloud-upgrade:
+  - description: >-
+      Validations which verify that the overcloud is in a correct state
+      before running overcloud upgrade run command.
+post-overcloud-upgrade:
+  - description: >-
+      Validations which verify that the overcloud is in a correct state
+      before running overcloud upgrade run command.
+pre-overcloud-converge:
+  - description: >-
+      Set of validations that check the right content for the templates passed
+      to the overcloud upgrad converge step.
+post-overcloud-converge:
+  - description: >-
+      Validations which verify that the overcloud is in a correct state
+      after running overcloud upgrade converge command.
 pre-ceph:
   - description: >-
       Validations to run on undercloud before deploying OpenStack
diff --git a/role-addition.yml b/role-addition.yml
index 08b70bc31..baa94fd6e 100644
--- a/role-addition.yml
+++ b/role-addition.yml
@@ -116,6 +116,16 @@
                   - openshift-on-openstack
                   - pre-upgrade
                   - post-upgrade
+                  - pre-system-upgrade
+                  - post-system-upgrade
+                  - pre-undercloud-upgrade
+                  - post-undercloud-upgrade
+                  - pre-overcloud-prepare
+                  - post-overcloud-prepare
+                  - pre-overcloud-upgrade
+                  - post-overcloud-upgrade
+                  - pre-overcloud-converge
+                  - post-overcloud-converge
                   - pre-ceph
                   - post-ceph
               {{ role_name | replace('-', '_') }}_debug: false