diff --git a/defaults/main.yml b/defaults/main.yml
new file mode 100644
index 0000000..280261c
--- /dev/null
+++ b/defaults/main.yml
@@ -0,0 +1,2 @@
+docker_swarm_worker: false
+docker_swarm_manager: false
\ No newline at end of file
diff --git a/meta/main.yml b/meta/main.yml
new file mode 100644
index 0000000..b32a44c
--- /dev/null
+++ b/meta/main.yml
@@ -0,0 +1,2 @@
+---
+galaxy_info:
diff --git a/tasks/main.yml b/tasks/main.yml
index 5bcc27a..4a1569c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -8,7 +8,6 @@
       - curl
       - gnupg-agent 
       - software-properties-common 
-      - nfs-common
     state: present
 
 - name: Trust dockers GPG key
@@ -18,7 +17,7 @@
 
 - name: Ensure docker repository is available
   apt_repository:
-    repo: deb https://download.docker.com/linux/debian buster stable
+    repo: deb https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable
     state: present
   notify: Update apt cache
 
@@ -31,6 +30,7 @@
       - docker-ce
       - docker-ce-cli
       - containerd.io
+      - docker-compose-plugin
     state: present
 
 - name: Configure docker daemon
@@ -41,16 +41,6 @@
     group: root
     mode: 0644
 
-#- hosts: swarm:!NAS
-#  tasks:
-#    - name: Mount NFS
-#      mount:
-#        path: /mnt/nfs
-#        src: grace.lan:/
-#        fstype: nfs4
-#        opts: rw,nosuid,fsc
-#        state: mounted
-
 - name: Install docker python module
   pip:
     executable: pip3
@@ -60,15 +50,13 @@
 - name: Join swarm as manager
   docker_swarm:
     state: join
-    advertise_addr: "{{ ansible_default_ipv4.address }}"
     join_token:  "{{ docker_swarm_join_token_manager }}"
-    remote_addrs: ['192.168.168.200:2377']
+    remote_addrs: ["{{ docker_swarm_address }}"]
   when: docker_swarm_manager
 
 - name: Join swarm as worker
   docker_swarm:
     state: join
-    advertise_addr: "{{ ansible_default_ipv4.address }}"
     join_token: "{{ docker_swarm_join_token_worker }}" 
-    remote_addrs: ['192.168.168.200:2377']
+    remote_addrs: ["{{ docker_swarm_address }}"]
   when: not docker_swarm_manager