diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml
index fc06d925a..ab2bca744 100644
--- a/roles/ceph-config/tasks/main.yml
+++ b/roles/ceph-config/tasks/main.yml
@@ -105,11 +105,6 @@
         - num_osds | default(0) | int > 0
         - ((ansible_facts['memtotal_mb'] * 1048576 * safety_factor | float) / num_osds | float) > osd_memory_target
 
-    - name: set osd_memory_target
-      command: "{{ ceph_cmd }} config set osd/host:{{ inventory_hostname }} osd_memory_target {{ _osd_memory_target | default(osd_memory_target) }}"
-      changed_when: false
-      delegate_to: "{{ groups[mon_group_name][0] }}"
-
 - name: create ceph conf directory
   file:
     path: "/etc/ceph"
diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index c224ae6b6..3dc1e2117 100644
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -112,4 +112,9 @@
     - not rolling_update | default(False) | bool
     - openstack_config | bool
     - inventory_hostname == groups[osd_group_name] | last
-  tags: wait_all_osds_up
\ No newline at end of file
+  tags: wait_all_osds_up
+
+- name: set osd_memory_target
+  command: "{{ ceph_cmd }} --cluster {{ cluster }} config set osd/host:{{ inventory_hostname }} osd_memory_target {{ _osd_memory_target | default(osd_memory_target) }}"
+  changed_when: false
+  delegate_to: "{{ groups[mon_group_name][0] }}"