diff --git a/home.yml b/home.yml
index 8f467c6..5ebfcd4 100644
--- a/home.yml
+++ b/home.yml
@@ -6,48 +6,54 @@
     - vars/users.yml
     - vars/home.yml
     - vars/nas.yml
-  tasks:
+
+  pre_tasks:
     - name: Update
       apt:
         update_cache: true
         upgrade: true
 
-          # - name: Install core admin tools
-          #   include_role:
-          #     name: core
+  roles:
+    - role: core
 
-          # - name: Include user
-          #   include_role:
-          #     name: "user"
-          #   loop:
-          #     - "{{ admin }}"
-          #   loop_control:
-          #     loop_var: user
+    - role: ssh
+      tags:
+        - ssh
 
-          # - name: Remove firstboot user
-          #   ansible.builtin.user:
-          #     name: foo
-          #     state: absent
-          #     remove: yes
+    - role: samba_server
+      tags:
+        - samba_server
 
-          # - name: Secure ssh
-          #   include_role:
-          #     name: ssh
-    - name: Set up nuts
+    - role: nfs_server
+      tags:
+        - nfs_server
+
+    - role: nut
+      tags:
+        - nut
+
+    - role: geerlingguy.docker
+      tags:
+        - docker
+
+  tasks:
+    - name: Include user
       include_role:
-        name: nut
+        name: "user"
+      loop:
+        - "{{ admin }}"
+      loop_control:
+        loop_var: user
+      tags:
+        - user
 
-          # - name: Set up nfs network shares server
-          #   include_role:
-          #     name: nfs_server
-
-          # - name: Set up samba network shares
-          #   include_role:
-          #     name: samba_server
-
-    - name: Install docker
-      debug:
-        msg: Todo
+    - name: Remove firstboot user
+      ansible.builtin.user:
+        name: foo
+        state: absent
+        remove: yes
+      tags:
+        - user
 
     - name: Set up monitoring server
       debug:
diff --git a/vars/nas.yml b/vars/nas.yml
index 25319df..98e718c 100644
--- a/vars/nas.yml
+++ b/vars/nas.yml
@@ -1,4 +1,11 @@
 ---
+
+docker_apt_arch: arm64
+docker_compose_version: "v2.6.0"
+docker_compose_arch: armv6
+docker_users: 
+  - "{{ admin.username }}"
+
 upss:
   - name: eaton650
     driver: usbhid-ups