diff --git a/roles/ceph-client/tasks/main.yml b/roles/ceph-client/tasks/main.yml
index 18cab7ea6..eb0f272cb 100644
--- a/roles/ceph-client/tasks/main.yml
+++ b/roles/ceph-client/tasks/main.yml
@@ -4,4 +4,6 @@
 
 - name: include create_users_keys.yml
   include_tasks: create_users_keys.yml
-  when: user_config | bool
+  when:
+    - user_config | bool
+    - not rolling_update | default(False) | bool