diff --git a/playbook.yml b/playbook.yml
index 58d22ea..9b0172c 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -1,8 +1,34 @@
 - hosts: newsreader
   become: true
   become_method: sudo
+  pre_tasks:
+    - name: install packages
+      apt:
+        name: '{{ packages }}'
+        state: present
+      notify:
+        - restart postfix
+    - include_role:
+        name: common
+        tasks_from: 'network.yml'
+    - include_role:
+        name: common
+        tasks_from: 'host.yml'
+    - include_role:
+        name: common
+        tasks_from: 'sudoers.yml'
+      loop:
+        - { src: '../../templates/sudoers.j2', dest: '/etc/sudoers.d/30-ansible-extra' }
+  roles:
+    - common
   tasks:
     - import_tasks: 'tasks/main.yml'
+    - include_role:
+        name: common
+        tasks_from: 'ssl.yml'
+    - include_role:
+        name: common
+        tasks_from: 'nginx.yml'
     - import_tasks: 'tasks/setup.yml'
     - import_tasks: 'tasks/poetry.yml'
     - import_tasks: 'tasks/project.yml'
diff --git a/tasks/main.yml b/tasks/main.yml
index 267c344..de1f4b2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,22 +1,3 @@
-- include_role:
-    name: common
-    tasks_from: 'network.yml'
-- include_role:
-    name: common
-    tasks_from: 'host.yml'
-- include_role:
-    name: common
-    tasks_from: 'sudoers.yml'
-  loop:
-    - { src: '../../templates/sudoers.j2', dest: '/etc/sudoers.d/30-ansible-extra' }
-
-- name: install packages
-  apt:
-    name: '{{ packages }}'
-    state: present
-  notify:
-    - restart postfix
-
 - name: copy firewall templates
   template:
     src: '{{ item.src }}'
@@ -93,13 +74,6 @@
       }
   notify: restart rabbitmq
 
-- include_role:
-    name: common
-    tasks_from: 'ssl.yml'
-- include_role:
-    name: common
-    tasks_from: 'nginx.yml'
-
 - name: copy nginx config
   template:
     src: 'templates/nginx.j2'