diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml
index bb412a947a..8a8ac5aa28 100644
--- a/deployment/ceph-ansible/ceph-base.yaml
+++ b/deployment/ceph-ansible/ceph-base.yaml
@@ -560,6 +560,7 @@ outputs:
     value:
       service_name: ceph_base
       upgrade_tasks: []
+      post_upgrade_tasks: []
       puppet_config:
         config_image: ''
         config_volume: ''
diff --git a/deployment/ceph-ansible/ceph-mds.yaml b/deployment/ceph-ansible/ceph-mds.yaml
index b8a53539c4..0604c834df 100644
--- a/deployment/ceph-ansible/ceph-mds.yaml
+++ b/deployment/ceph-ansible/ceph-mds.yaml
@@ -70,7 +70,8 @@ outputs:
                 - dashboard_enabled
                 - - '9100'
                 - []
-      upgrade_tasks: []
+      upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
+      post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
       puppet_config:
         config_image: ''
         config_volume: ''
diff --git a/deployment/ceph-ansible/ceph-mon.yaml b/deployment/ceph-ansible/ceph-mon.yaml
index 2801719e1f..c893af1239 100644
--- a/deployment/ceph-ansible/ceph-mon.yaml
+++ b/deployment/ceph-ansible/ceph-mon.yaml
@@ -79,12 +79,13 @@ outputs:
                 - dashboard_enabled
                 - - '9100'
                 - []
-      upgrade_tasks: []
       service_config_settings:
         collectd:
           tripleo.collectd.plugins.ceph_osd:
             - ceph
           collectd::plugin::ceph::daemons: []
+      upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
+      post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
       puppet_config:
         config_image: ''
         config_volume: ''
diff --git a/deployment/ceph-ansible/ceph-osd.yaml b/deployment/ceph-ansible/ceph-osd.yaml
index 5dab5dcf6a..0fccf8fa7e 100644
--- a/deployment/ceph-ansible/ceph-osd.yaml
+++ b/deployment/ceph-ansible/ceph-osd.yaml
@@ -78,16 +78,58 @@ outputs:
                 - dashboard_enabled
                 - - '9100'
                 - []
-      upgrade_tasks:
-        - name: Check legacy Ceph hieradata
-          tags: validation
-          when: step|int == 0
-          shell: test "nil" == "$(hiera -c /etc/puppet/hiera.yaml ceph::profile::params::osds)"
       service_config_settings:
         collectd:
           tripleo.collectd.plugins.ceph_osd:
             - ceph
           collectd::plugin::ceph::daemons: []
+      upgrade_tasks:
+        list_concat:
+        - {get_attr: [CephBase, role_data, upgrade_tasks]}
+        - - block:
+              - name: Check for docker cli
+                stat:
+                  path: "/var/run/docker.sock"
+                register: check_docker_cli
+                check_mode: false
+              - name: Set noout flag
+                shell: "{{ container_client }} exec -u root ceph-mon-${HOSTNAME} ceph osd set {{ item }}"
+                become: true
+                with_items:
+                  - noout
+                  - norecover
+                  - nobackfill
+                  - norebalance
+                  - nodeep-scrub
+                vars:
+                  container_client: |-
+                    {% set container_client = 'podman' %}
+                    {%   if check_docker_cli.stat.exists|bool %}
+                    {%     set container_client = 'docker' %}
+                    {%   endif %}
+                    {{ container_client }}
+            delegate_to: "{{ ceph_mon_short_bootstrap_node_name }}"
+            tags:
+              - never
+              - system_upgrade
+              - system_upgrade_prepare
+            when:
+              - step|int == 1
+              - upgrade_leapp_enabled
+      post_upgrade_tasks:
+        list_concat:
+        - {get_attr: [CephBase, role_data, post_upgrade_tasks]}
+        - - name: Unset noout flag
+            shell: "{{ container_cli }} exec -u root ceph-mon-${HOSTNAME} ceph osd unset {{ item }}"
+            with_items:
+              - noout
+              - norecover
+              - nobackfill
+              - norebalance
+              - nodeep-scrub
+            when: step|int == 2
+            become: true
+            delegate_to: "{{ ceph_mon_short_bootstrap_node_name }}"
       puppet_config:
         config_image: ''
         config_volume: ''
diff --git a/deployment/ceph-ansible/ceph-rgw.yaml b/deployment/ceph-ansible/ceph-rgw.yaml
index 901da651ac..7d25235a26 100644
--- a/deployment/ceph-ansible/ceph-rgw.yaml
+++ b/deployment/ceph-ansible/ceph-rgw.yaml
@@ -129,7 +129,8 @@ outputs:
             - member
             - ResellerAdmin
             - swiftoperator
-      upgrade_tasks: []
+      upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
+      post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
       puppet_config:
         config_image: ''
         config_volume: ''