diff --git a/main.yaml b/main.yaml
index c8d09a9..b39f90f 100644
--- a/main.yaml
+++ b/main.yaml
@@ -2,27 +2,8 @@
 - hosts: all
   become: yes
 
-  vars_files:
-    - vars/services.yml
-    - vars/environment.yml
-    - vars/databases.yml
-
-  roles:
-    - geerlingguy.docker
-    - geerlingguy.pip
-    - geerlingguy.mysql
-    - kadet.docker-swarm
-
-  tasks:
-    - name: "Add '{{ ansible_user }}' to docker group"
-      user:
-        user: "{{ ansible_user }}"
-        groups: docker
-        append: yes
-    - name: "Add acl package"
-      apt: 
-        name: acl
-        state: present
+- name: Setup server
+  import_playbook: setup.yaml
 
 - name: Deploy services
   import_playbook: deploy.yaml
diff --git a/setup.yaml b/setup.yaml
new file mode 100644
index 0000000..8367b28
--- /dev/null
+++ b/setup.yaml
@@ -0,0 +1,26 @@
+---
+- hosts: all
+  become: yes
+
+  vars_files:
+    - vars/services.yml
+    - vars/environment.yml
+    - vars/databases.yml
+
+  roles:
+    - geerlingguy.docker
+    - geerlingguy.pip
+    - geerlingguy.mysql
+    - kadet.docker-swarm
+
+  tasks:
+    - name: "Add '{{ ansible_user }}' to docker group"
+      user:
+        user: "{{ ansible_user }}"
+        groups: docker
+        append: yes
+
+    - name: "Add acl package"
+      apt: 
+        name: acl
+        state: present