diff --git a/roles/mastodon/tasks/main.yml b/roles/mastodon/tasks/main.yml
index 4732140..025a2ef 100644
--- a/roles/mastodon/tasks/main.yml
+++ b/roles/mastodon/tasks/main.yml
@@ -5,12 +5,13 @@
 - include_vars: "{{ ansible_fqdn }}.yml"
   ignore_errors: True
 
-- include_tasks: system_setup/prepare_packagemanager.yml
 
 - block:
-  - include_tasks: system_setup/packages.yml
+  - include_tasks: system_setup/base_packages.yml
+  - include_tasks: system_setup/prepare_packagemanager.yml
   - include_role: name=database
   - include_tasks: system_setup/prepare_database.yml
+  - include_tasks: system_setup/packages.yml
   - include_role: name=webserver
   - include_tasks: system_setup/nginx.yml
   - include_tasks: system_setup/user.yml