diff --git a/tasks/portainer.yml b/tasks/portainer.yml
index c77b043..cc7cc51 100644
--- a/tasks/portainer.yml
+++ b/tasks/portainer.yml
@@ -15,9 +15,8 @@
         - /srv/portainer/portainer-agent-stack.yml
     run_once: True
 
-  - name: Connect the portainer service to the haproxy-public network
-    shell: docker service update --network-add haproxy-public portainer_portainer --update-delay 30s --update-parallelism 1
-    ignore_errors: True
+  # - name: Connect the portainer service to the haproxy-public network
+  #   shell: docker service update --network-add haproxy-public portainer_portainer --update-delay 30s --update-parallelism 1 || true
 
   when: docker_swarm_manager_main_node | bool
   tags: [ 'portainer', 'docker_portainer', 'docker_swarm', 'docker' ]
diff --git a/templates/portainer-agent-stack.yml.j2 b/templates/portainer-agent-stack.yml.j2
index aae2cf7..4b46a79 100644
--- a/templates/portainer-agent-stack.yml.j2
+++ b/templates/portainer-agent-stack.yml.j2
@@ -1,5 +1,13 @@
 version: '3.2'
 
+volumes:
+  portainer_data:
+
+networks:
+  {{ haproxy_docker_overlay_network }}:
+    external: true
+  {{ docker_swarm_portainer_network }}:
+
 services:
   agent:
     image: portainer/agent
@@ -27,6 +35,7 @@ services:
       - portainer_data:/data
     networks:
       - {{ docker_swarm_portainer_network }}
+      - {{ haproxy_docker_overlay_network }}
     deploy:
       mode: replicated
       replicas: 1
@@ -47,8 +56,3 @@ services:
       driver: 'journald'
 {% endif %}
 
-volumes:
-  portainer_data:
-
-networks:
-  {{ docker_swarm_portainer_network }}: