diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 8f5a27a..979a085 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -49,10 +49,7 @@
           - "92-unattended-upgrades"
           - "95-hwe-eol"
           - "97-overlayroot"
-      when: ansible_os_family == "Debian"
+      when: ansible_distribution == "Ubuntu"
     - name: Configure Ansible user
       include_tasks: ansibleuser.yml
-    - name: Configure services
-      include_tasks: services.yml
-      when: ansible_os_family == "Debian"
   become: yes
diff --git a/roles/common/tasks/packages.yml b/roles/common/tasks/packages.yml
index 6260812..df137a6 100644
--- a/roles/common/tasks/packages.yml
+++ b/roles/common/tasks/packages.yml
@@ -30,6 +30,11 @@
         install_recommends: no
         name:
           - smartmontools
+    - name: Remove packages
+      apt:
+        state: absent
+        name:
+          - unattended-upgrades
   become: yes
   when: ansible_os_family == "Debian"
 - name: Install packages via APK
diff --git a/roles/common/tasks/services.yml b/roles/common/tasks/services.yml
deleted file mode 100644
index 9498793..0000000
--- a/roles/common/tasks/services.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/ansible-playbook
-# vim:ft=ansible:
----
-- name: Configure services
-  systemd:
-    name: "{{ item.name }}"
-    state: "{{ item.state }}"
-    enabled: "{{ item.enabled }}"
-  loop:
-    - { name: "unattended-upgrades", state: "stopped", enabled: no }
-  become: yes