diff --git a/tasks/never-sleep.yml b/tasks/never-sleep.yml
index 56aad23..73dbdb5 100644
--- a/tasks/never-sleep.yml
+++ b/tasks/never-sleep.yml
@@ -2,17 +2,16 @@
 - name: Never Sleep Mode
   command: "{{ item }}"
   with_items:
+    - pmset -a standbydelay 0
+    - pmset -a displaysleep 0
+    - pmset -a disablesleep 1
+    - pmset -a disksleep 0
+    - pmset -a hibernatemode 0
+    - pmset disablesleep 1
+    #  Not sure the stuff below works
     - systemsetup -setsleep Never
     - systemsetup -setharddisksleep Never
     - systemsetup -setcomputersleep Never
     - systemsetup -setdisplaysleep Never
   changed_when: false
   become: true
-
-- name: Additiona cleanups for never sleep mode
-  include_role:
-    name: feffi.macos-standby
-  vars:
-    standby_delay: false
-    hibernate_mode: 0
-    remove_sleepimage: true