diff --git a/ansible/roles/base/tasks/linux.yaml b/ansible/roles/base/tasks/linux.yaml
index d710f1e..ef3b6a7 100644
--- a/ansible/roles/base/tasks/linux.yaml
+++ b/ansible/roles/base/tasks/linux.yaml
@@ -21,7 +21,7 @@
     value: "{{ item.value }}"
     state: present
     sysctl_file: /etc/sysctl.d/swap.conf
-  with_items:
+  loop:
     - name: vm.swappiness
       value: 10
 
@@ -35,3 +35,23 @@
   loop:
     - src: mount_disk_image
       dest: /usr/local/bin/mount_disk_image
+
+- name: Configure sysctls
+  sysctl:
+    name: "{{ item.name }}"
+    value: "{{ item.value }}"
+    state: present
+    sysctl_file: /etc/sysctl.d/dirty.conf
+  loop:
+    - name: vm.dirty_writeback_centisecs
+      value: 2000 # Default is 500 (5 seconds)
+
+- name: Configure sysctls
+  sysctl:
+    name: "{{ item.name }}"
+    value: "{{ item.value }}"
+    state: present
+    sysctl_file: /etc/sysctl.d/laptop.conf
+  loop:
+    - name: vm.laptop_mode
+      value: 5
diff --git a/ansible/roles/nvme/tasks/common.yaml b/ansible/roles/nvme/tasks/common.yaml
index fef1101..9123c18 100644
--- a/ansible/roles/nvme/tasks/common.yaml
+++ b/ansible/roles/nvme/tasks/common.yaml
@@ -1,3 +1,10 @@
+# TODO: Enable period trim, this could be via systemctl enable zfs-trim-weekly@zroot.timer and fstrim.timer on linux. Need to find FreeBSD solution.
+- name: Install packages
+  package:
+    name:
+      - nvme-cli
+    state: present
+
 - import_tasks: tasks/freebsd.yaml
   when: 'os_flavor == "freebsd"'
 
diff --git a/ansible/roles/nvme/tasks/linux.yaml b/ansible/roles/nvme/tasks/linux.yaml
index 1278db7..46e2054 100644
--- a/ansible/roles/nvme/tasks/linux.yaml
+++ b/ansible/roles/nvme/tasks/linux.yaml
@@ -14,8 +14,8 @@
 #     state: present
 #     update_cache: true
 
-- name: Install packages
-  package:
-    name:
-      - nvme-cli
-    state: present
+# - name: Install packages
+#   package:
+#     name:
+#       - foo
+#     state: present