diff --git a/provision/ansible/playbooks/roles/cassandra/defaults/main.yml b/provision/ansible/playbooks/roles/cassandra/defaults/main.yml
index fa7c410e8..6688c6640 100644
--- a/provision/ansible/playbooks/roles/cassandra/defaults/main.yml
+++ b/provision/ansible/playbooks/roles/cassandra/defaults/main.yml
@@ -4,11 +4,11 @@ tuned_profile: virtual-guest
 # In AWS, sda and xvda are used depending on virtualization types.
 # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/device_naming.html#available-ec2-device-names
 # In Azure, sda is used for OS.
-tuned_disk_devices: '!sda, !xvda'
+tuned_disk_devices: "!sda, !xvda, !nvme0n1"
 disk_read_ahead: 8
 CASSANDRA_MEMTABLE_THRESHOLD: 0.33
 CASSANDRA_STATE: stopped
 cassandra_dc_id: dc1
 cassandra_rack_id: rack1
 endpoint_snitch: GossipingPropertyFileSnitch
-vm_max_map_count: '1048575'
+vm_max_map_count: 1048575
diff --git a/provision/ansible/playbooks/roles/cassandra/handlers/main.yml b/provision/ansible/playbooks/roles/cassandra/handlers/main.yml
index c04f16f32..e8a6179fc 100644
--- a/provision/ansible/playbooks/roles/cassandra/handlers/main.yml
+++ b/provision/ansible/playbooks/roles/cassandra/handlers/main.yml
@@ -3,3 +3,8 @@
   systemd:
     name: cassandra
     state: restarted
+
+- name: restart tuned
+  systemd:
+    name: tuned
+    state: restarted
diff --git a/provision/ansible/playbooks/roles/cassandra/tasks/main.yml b/provision/ansible/playbooks/roles/cassandra/tasks/main.yml
index 01c24b142..a9e9e31a1 100644
--- a/provision/ansible/playbooks/roles/cassandra/tasks/main.yml
+++ b/provision/ansible/playbooks/roles/cassandra/tasks/main.yml
@@ -21,6 +21,15 @@
     path: /etc/tuned/cassandra
     state: directory
 
+# Tuned does not yet support nvme disk
+# https://github.com/redhat-performance/tuned/issues/101
+- name: Replace plugin_disk.py of tuned for supporting nvme disk
+  replace:
+    path: /usr/lib/python2.7/site-packages/tuned/plugins/plugin_disk.py
+    regexp: '^(\s*device.parent.subsystem in \["scsi", "virtio", "xen")\]\)$'
+    replace: '\1, "nvme"])'
+  notify: restart tuned
+
 - name: Add Cassandra Tuned Profile
   template:
     src: tuned.conf.j2