diff --git a/ansible/roles/swarm/defaults/main.yml b/ansible/roles/swarm/defaults/main.yml
index 743c230..7a73a2e 100644
--- a/ansible/roles/swarm/defaults/main.yml
+++ b/ansible/roles/swarm/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-cont_image: 'statusteam/swarm:latest'
+cont_image: 'ethdevops/swarm:latest'
 cont_name: 'swarm-node'
 cont_state: started
 cont_recreate: false
@@ -13,6 +13,7 @@ cont_port: 30399
 cont_addr: '0.0.0.0'
 
 # Geth settings
+geth_image: 'ethdevops/geth:v1.8.14'
 geth_name: 'swarm-geth'
 geth_vol: '/docker/{{ geth_name }}'
 geth_keys: '{{ geth_vol }}/keys'
diff --git a/ansible/roles/swarm/tasks/geth.yml b/ansible/roles/swarm/tasks/geth.yml
index 2e25098..349ccec 100644
--- a/ansible/roles/swarm/tasks/geth.yml
+++ b/ansible/roles/swarm/tasks/geth.yml
@@ -2,14 +2,14 @@
 - name: Run Geth container
   docker_container:
     name: '{{ geth_name }}'
-    image: '{{ cont_image }}'
+    image: '{{ geth_image }}'
     user: root
     pull: true
     restart_policy: always
     state: '{{ cont_state }}'
     recreate: '{{ cont_recreate }}'
     restart: '{{ cont_restart }}'
-    entrypoint: '/bin/geth'
+    entrypoint: '/geth'
     ports:
       - '{{ geth_port }}:{{ geth_port }}'
       - '{{ geth_rpc_port }}:{{ geth_rpc_port }}'
@@ -23,8 +23,6 @@
       --rpcaddr={{ geth_rpc_addr }}
       --rpcport={{ geth_rpc_port }}
       --rpcapi=db,eth,net,web3,admin
-      --nodiscover
-      --bootnodes={{ bootnodes | join(",") }}
     volumes:
       - '{{ geth_vol }}/keys:/keys:rw'
       - '{{ geth_vol }}/data:/data:rw'
diff --git a/ansible/roles/swarm/tasks/main.yml b/ansible/roles/swarm/tasks/main.yml
index 929ce7b..0f80a25 100644
--- a/ansible/roles/swarm/tasks/main.yml
+++ b/ansible/roles/swarm/tasks/main.yml
@@ -10,7 +10,6 @@
     - '{{ cont_vol }}/store'
 
 - include_tasks: account.yml
-- include_tasks: bootnodes.yml
 - include_tasks: geth.yml
 - include_tasks: swarm.yml
 - include_tasks: consul.yml
diff --git a/ansible/roles/swarm/tasks/swarm.yml b/ansible/roles/swarm/tasks/swarm.yml
index 7a045ab..59ad4bc 100644
--- a/ansible/roles/swarm/tasks/swarm.yml
+++ b/ansible/roles/swarm/tasks/swarm.yml
@@ -9,6 +9,7 @@
     state: '{{ cont_state }}'
     recreate: '{{ cont_recreate }}'
     restart: '{{ cont_restart }}'
+    entrypoint: '/swarm'
     ports:
       - '{{ cont_port }}:{{ cont_port }}'
       - '{{ swarm_port }}:8500'
@@ -23,6 +24,7 @@
       --keystore=/keys
       --password=/keys/password
       --store.path=/store
+      --corsdomain='*'
       --ens-api='http://geth:{{ geth_rpc_port }}'
     volumes:
       - '{{ geth_vol }}/keys:/keys:rw'