diff --git a/group_vars/all/services.yml b/group_vars/all/services.yml
index f5b2045..2ea9c39 100644
--- a/group_vars/all/services.yml
+++ b/group_vars/all/services.yml
@@ -1,6 +1,14 @@
 ---
-services_system:
+services_system_enabled:
   - dnf-automatic.timer
+  - btrfs-balance.timer
+  - btrfs-scrub.timer
+  - btrbk.timer
+  - tailscaled
 
-services_user:
+services_user_enabled:
   - psd
+
+services_system_disabled:
+  - qemu-guest-agent
+  - raid-check.timer
diff --git a/group_vars/laptop/services.yml b/group_vars/laptop/services.yml
new file mode 100644
index 0000000..34f001e
--- /dev/null
+++ b/group_vars/laptop/services.yml
@@ -0,0 +1,2 @@
+services_system_enabled_group:
+  - keyd
\ No newline at end of file
diff --git a/group_vars/workstation/services.yml b/group_vars/workstation/services.yml
new file mode 100644
index 0000000..ee59be9
--- /dev/null
+++ b/group_vars/workstation/services.yml
@@ -0,0 +1,2 @@
+services_system_group:
+  - pwrstatd
\ No newline at end of file
diff --git a/group_vars/workstation/software.yml b/group_vars/workstation/software.yml
new file mode 100644
index 0000000..1fc6b81
--- /dev/null
+++ b/group_vars/workstation/software.yml
@@ -0,0 +1,2 @@
+dnf_install_group:
+  - "https://dl4jz3rbrsfum.cloudfront.net/software/PPL_64bit_v1.4.1.rpm"
\ No newline at end of file
diff --git a/roles/services/tasks/main.yml b/roles/services/tasks/main.yml
index 09b8ccb..80e3221 100644
--- a/roles/services/tasks/main.yml
+++ b/roles/services/tasks/main.yml
@@ -5,9 +5,17 @@
     enabled: true
     state: started
     scope: system
-  loop: "{{ services_system }}"
+  loop: "{{ (services_system_enabled | default([])) + (services_system_enabled_group | default([])) }}"
+  become: true
+
+- name: Disable and stop system services
+  ansible.builtin.systemd:
+    name: "{{ item }}"
+    enabled: false
+    state: stopped
+    scope: system
+  loop: "{{ (services_system_disabled | default([])) + (services_system_disabled_group | default([])) }}"
   become: true
-  when: services_system is defined and services_system | length > 0
 
 - name: Enable and start user services
   ansible.builtin.systemd:
@@ -15,5 +23,12 @@
     enabled: true
     state: started
     scope: user
-  loop: "{{ services_user }}"
-  when: services_user is defined and services_user | length > 0
+  loop: "{{ (services_user_enabled | default([])) + (services_user_enabled_group | default([])) }}"
+
+- name: Disable and stop user services
+  ansible.builtin.systemd:
+    name: "{{ item }}"
+    enabled: false
+    state: stopped
+    scope: system
+  loop: "{{ (services_user_disabled | default([])) + (services_user_disabled_group | default([])) }}"