diff --git a/tasks/main.yml b/tasks/main.yml
index e484b1c..5e21726 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -29,4 +29,7 @@
     regex: 'HostKey /etc/ssh/ssh_host_ed25519_key'
     line: 'HostKey /etc/ssh/ssh_host_ed25519_key'
     state: present
-  notify: restart ssh
\ No newline at end of file
+  notify: restart ssh
+
+- name: "Set up {{ ansible_os_family }}-based systems"
+  include_tasks: "setup-{{ ansible_os_family }}.yml"
diff --git a/tasks/setup-Arch.yml b/tasks/setup-Arch.yml
deleted file mode 100644
index e4ecb28..0000000
--- a/tasks/setup-Arch.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- name: Set timezone to UTC
-  community.general.timezone:
-    name: UTC
diff --git a/tasks/setup-Archlinux.yml b/tasks/setup-Archlinux.yml
new file mode 100644
index 0000000..f24ac26
--- /dev/null
+++ b/tasks/setup-Archlinux.yml
@@ -0,0 +1,10 @@
+---
+- name: Set timezone to UTC
+  community.general.timezone:
+    name: UTC
+
+- name: Update package database
+  community.general.pacman:
+    update_cache: yes
+    upgrade: yes
+  tags: upgrade
diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml
index 1e75e26..4221b45 100644
--- a/tasks/setup-Debian.yml
+++ b/tasks/setup-Debian.yml
@@ -3,7 +3,7 @@
   community.general.timezone:
     name: UTC
 
-- name: Let root authenticate via ssh pubkey, Ubuntu.
+- name: Let root authenticate via ssh pubkey, Ubuntu
   ansible.builtin.replace:
     path: /root/.ssh/authorized_keys
     regexp: '^no.*(ssh.*)$'
@@ -14,7 +14,7 @@
     path: /etc/apt/apt.conf.d/20auto-upgrades
   register: unattended_upgrade
 
-- name: Ensure apt automatic upgrades are not enabled.
+- name: Ensure apt automatic upgrades are not enabled
   lineinfile:
     path: /etc/apt/apt.conf.d/20auto-upgrades
     regexp: 'APT::Periodic::Unattended-Upgrade "1";'
@@ -33,21 +33,11 @@
   delay: 6
   retries: 10
 
-- name: Only run "update_cache=yes" if the last one is more than 3600 seconds ago
+- name: Upgrade all packages
   ansible.builtin.apt:
     update_cache: yes
     cache_valid_time: 3600
-
-#- name: Update Linux Kernel
-#  ansible.builtin.apt:
-#    name: linux-image-amd64
-#    state: latest
-#  register: kernel_version
-#
-#- name: Reboot a slow machine that might have lots of updates to apply
-#  ansible.builtin.reboot:
-#    reboot_timeout: 3600
-#  when: kernel_version is changed
+    upgrade: yes
 
 - name: Update sources.list to select a fast mirror on Ubuntu
   ansible.builtin.replace:
@@ -56,12 +46,6 @@
     replace: 'mirror://mirrors.ubuntu.com/mirrors.txt'
   when: ansible_distribution == 'Ubuntu'
 
-
-- name: Update all packages to their latest version
-  ansible.builtin.apt:
-    name: '*'
-    state: latest
-
 - name: Remove dependencies that are no longer required
   ansible.builtin.apt:
     autoremove: yes