diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index 2421a12c5..1bef0ceae 100644
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -8,10 +8,8 @@
 - name: include check_mandatory_vars.yml
   include: check_mandatory_vars.yml
 
-- name: include misc/system_tuning.yml
+- name: include system_tuning.yml
   include: system_tuning.yml
-  when:
-    - osd_group_name in group_names
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
diff --git a/roles/ceph-osd/tasks/system_tuning.yml b/roles/ceph-osd/tasks/system_tuning.yml
index f9663cce6..b900c9ac7 100644
--- a/roles/ceph-osd/tasks/system_tuning.yml
+++ b/roles/ceph-osd/tasks/system_tuning.yml
@@ -62,3 +62,12 @@
     sysctl_set: yes
     ignoreerrors: yes
   with_items: "{{ os_tuning_params }}"
+
+- name: increase aio-max-nr for bluestore
+  sysctl:
+    name: fs.aio-max-nr
+    value: 1048576
+    sysctl_file: /etc/sysctl.d/ceph-tuning.conf
+    sysctl_set: yes
+  when:
+    - osd_objectstore == 'bluestore'