diff --git a/tasks/main.yml b/tasks/main.yml
index ace1dd4..4a1569c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -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