diff --git a/tasks/personal/xps.yml b/tasks/personal/xps.yml
index 8bef201..b1eb784 100644
--- a/tasks/personal/xps.yml
+++ b/tasks/personal/xps.yml
@@ -1,8 +1,12 @@
 - name: Provision powertop systemd service
   become: true
-  ansible.builtin.file:
-    path: /etc/systemd/system/powertop.service
-    state: absent
+  ansible.builtin.template:
+    src: templates/personal/xps/powertop.service.j2
+    dest: /etc/systemd/system/powertop.service
+    owner: root
+    group: root
+    mode: '0644'
+  notify: restart powertop
 
 - name: Provision python pa-dlna
   block:
diff --git a/templates/personal/xps/cmdline.j2 b/templates/personal/xps/cmdline.j2
index e23cec7..90371ba 100644
--- a/templates/personal/xps/cmdline.j2
+++ b/templates/personal/xps/cmdline.j2
@@ -1 +1 @@
-rd.luks.name=4483183a-4881-4bf6-b20c-3ba918642cc4=cryptlvm root=/dev/VolumeGroup/root rw resume=/dev/VolumeGroup/swap pcie_port_pm=off acpi_rev_override=1
+rd.luks.name=4483183a-4881-4bf6-b20c-3ba918642cc4=cryptlvm root=/dev/VolumeGroup/root rw resume=/dev/VolumeGroup/swap pcie_aspm=nommconf acpi_rev_override=1 bgrt_disable
diff --git a/templates/personal/xps/powertop.service.j2 b/templates/personal/xps/powertop.service.j2
new file mode 100644
index 0000000..c614bcf
--- /dev/null
+++ b/templates/personal/xps/powertop.service.j2
@@ -0,0 +1,12 @@
+# {{ ansible_managed }}
+
+[Unit]
+Description=Powertop tunings
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/bin/powertop --auto-tune
+
+[Install]
+WantedBy=multi-user.target