diff --git a/defaults/main.yml b/defaults/main.yml
index 46bf3f0..69b3e87 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -20,8 +20,8 @@ shinyproxy_log_retention: 10
 shinyproxy_default_apps: True
 # Shinyproxy as docker service
 shinyproxy_docker_image: 'adellamisti/shinyproxy:latest'
-shinyproxy_as_docker_src_dir: /srv/shinyproxy_service
 shinyproxy_as_docker_service_name: 'shinyproxy'
+shinyproxy_as_docker_src_dir: /srv/{{ shinyproxy_as_docker_service_name }}_service
 shinyproxy_docker_network: 'shinyproxy'
 shinyproxy_docker_swarm_replicas: 2
 shinyproxy_docker_log_to_journal: True
diff --git a/tasks/shinyproxy_docker_service.yml b/tasks/shinyproxy_docker_service.yml
index cb4db34..a689a04 100644
--- a/tasks/shinyproxy_docker_service.yml
+++ b/tasks/shinyproxy_docker_service.yml
@@ -34,12 +34,6 @@
 
 - name: Manage the composition of shinyproxy as a docker swarm stack
   block:
-  - name: Create the overlay network that will be used by shinyproxy
-    docker_network:
-      name: '{{ shinyproxy_docker_network }}'
-      driver: overlay
-      scope: swarm
-
   - name: Install the docker compose file
     template: src=shinyproxy-docker-compose.yml.j2 dest={{ shinyproxy_as_docker_src_dir }}/docker-shinyproxy-stack.yml
 
@@ -50,6 +44,11 @@
       compose:
         - '{{ shinyproxy_as_docker_src_dir }}/docker-shinyproxy-stack.yml'
 
+  - name: Connect haproxy to the external network
+    command: docker service update --network-add haproxy-public {{ shinyproxy_as_docker_service_name }}_{{ shinyproxy_docker_network }} --update-delay 30s --update-parallelism 1
+    run_once: True
+    ignore_errors: True
+
   run_once: True
   when:
     - docker_swarm_manager_main_node is defined and docker_swarm_manager_main_node | bool
diff --git a/templates/shinyproxy-2-conf.yml.j2 b/templates/shinyproxy-2-conf.yml.j2
index 3529234..be6134f 100644
--- a/templates/shinyproxy-2-conf.yml.j2
+++ b/templates/shinyproxy-2-conf.yml.j2
@@ -73,7 +73,7 @@ proxy:
   {% if shinyproxy_as_docker_service %}
   {% if shinyproxy_container_backend == 'docker-swarm' %}
 
-    container-network: {{ shinyproxy_docker_network }}
+    container-network: {{ shinyproxy_as_docker_service_name }}_{{ shinyproxy_docker_network }}
 
   {% else %}
 
diff --git a/templates/shinyproxy-docker-compose.yml.j2 b/templates/shinyproxy-docker-compose.yml.j2
index 746cc12..4de9d2b 100644
--- a/templates/shinyproxy-docker-compose.yml.j2
+++ b/templates/shinyproxy-docker-compose.yml.j2
@@ -14,7 +14,6 @@ services:
       - {{ shinyproxy_as_docker_src_dir }}/application.yml:/opt/shinyproxy/application.yml:ro
     networks:
       - {{ shinyproxy_docker_network }}
-      - haproxy-public
 {% if shinyproxy_container_backend == 'docker-swarm' %}
     deploy:
       mode: replicated
@@ -34,7 +33,4 @@ services:
 {% endif %}
 
 networks:
-  {{ shinyproxy_docker_network }}:
-  haproxy-public:
-    external:
-      name: haproxy-public
\ No newline at end of file
+  {{ shinyproxy_docker_network }}