diff --git a/tasks/ceph/enter-maint.yaml b/tasks/ceph/enter-maint.yaml
index 3ea2785..bedebc1 100644
--- a/tasks/ceph/enter-maint.yaml
+++ b/tasks/ceph/enter-maint.yaml
@@ -27,3 +27,11 @@
       changed_when: false
       failed_when: "ceph_norebalance_result.rc != 0"
       register: "ceph_norebalance_result"
+
+    # set ceph osd norecover settings
+    - name: "set ceph norecover"
+      ansible.builtin.shell:
+        cmd: "ceph osd set norecover"
+      changed_when: false
+      failed_when: "ceph_norecover_result.rc != 0"
+      register: "ceph_norecover_result"
diff --git a/tasks/ceph/exit-maint.yaml b/tasks/ceph/exit-maint.yaml
index ebed36c..38f6068 100644
--- a/tasks/ceph/exit-maint.yaml
+++ b/tasks/ceph/exit-maint.yaml
@@ -11,7 +11,6 @@
       changed_when: false
       failed_when: "ceph_noout_result.rc != 0"
       register: "ceph_noout_result"
-      tags: "cluster"
 
     # unset ceph osd nobackfill settings
     - name: "unset ceph nobackfill"
@@ -20,7 +19,6 @@
       changed_when: false
       failed_when: "ceph_nobackfill_result.rc != 0"
       register: "ceph_nobackfill_result"
-      tags: "cluster"
 
     # unset ceph osd norebalance settings
     - name: "unset ceph norebalance"
@@ -29,4 +27,11 @@
       changed_when: false
       failed_when: "ceph_norebalance_result.rc != 0"
       register: "ceph_norebalance_result"
-      tags: "cluster"
+
+    # unset ceph osd norecover settings
+    - name: "unset ceph norecover"
+      ansible.builtin.shell:
+        cmd: "ceph osd unset norecover"
+      changed_when: false
+      failed_when: "ceph_norecover_result.rc != 0"
+      register: "ceph_norecover_result"