diff --git a/templates/eventstore/0/docker-compose.yml b/templates/eventstore/0/docker-compose.yml
index 8886a12..eca06e1 100644
--- a/templates/eventstore/0/docker-compose.yml
+++ b/templates/eventstore/0/docker-compose.yml
@@ -3,28 +3,25 @@ services:
   eventstore:
     image: eventstore/eventstore
     entrypoint: /bin/bash
-    command: ['-c', 'grep -q -F "IntIpAdvertiseAs: $$(hostname -i)" /etc/eventstore/eventstore.conf  || echo "IntIpAdvertiseAs: $$(hostname -i)" >> /etc/eventstore/eventstore.conf && grep -q -F "ExtIpAdvertiseAs: $$(hostname -i)" /etc/eventstore/eventstore.conf  || echo "ExtIpAdvertiseAs: $$(hostname -i)" >> /etc/eventstore/eventstore.conf && /entrypoint.sh']
-    environment:
-      - EVENTSTORE_CLUSTER_SIZE=3
-      - EVENTSTORE_CLUSTER_DNS=eventstore
-      - EVENTSTORE_CLUSTER_GOSSIP_PORT=2112
-      - EVENTSTORE_EXT_HTTP_PREFIXES=http://*:${load_balancer_external_http_port}/
-      - EVENTSTORE_EXT_HTTP_PORT=${load_balancer_external_http_port}
-      - EVENTSTORE_EXT_TCP_PORT=${load_balancer_external_tcp_port}
-    
-    expose:
-      - "${load_balancer_external_http_port}"
-      - "${load_balancer_external_tcp_port}"
+    command:
+    - -c
+    - 'grep -q -F "IntIpAdvertiseAs: $$(hostname -i)" /etc/eventstore/eventstore.conf  ||
+      echo "IntIpAdvertiseAs: $$(hostname -i)" >> /etc/eventstore/eventstore.conf &&
+      grep -q -F "ExtIpAdvertiseAs: $$(hostname -i)" /etc/eventstore/eventstore.conf  ||
+      echo "ExtIpAdvertiseAs: $$(hostname -i)" >> /etc/eventstore/eventstore.conf &&
+      /entrypoint.sh'
 
-  eventstore-lb:
-    image: rancher/lb-service-haproxy:v0.5.9
+    environment:
+    - EVENTSTORE_CLUSTER_SIZE=3
+    - EVENTSTORE_CLUSTER_DNS=eventstore
+    - EVENTSTORE_CLUSTER_GOSSIP_PORT=2112
+    - EVENTSTORE_EXT_HTTP_PREFIXES=http://*:${load_balancer_external_http_port}/
+    - EVENTSTORE_EXT_HTTP_PORT=${load_balancer_external_http_port}
+    - EVENTSTORE_EXT_TCP_PORT=${load_balancer_external_tcp_port}
+    
     ports:
-      - ${load_balancer_external_http_port}:${load_balancer_external_http_port}/tcp
-      - ${load_balancer_external_tcp_port}:${load_balancer_external_tcp_port}/tcp
-    labels:
-      io.rancher.container.agent.role: environmentAdmin
-      io.rancher.container.create_agent: 'true'
-      io.rancher.scheduler.global: 'true'
+    - ${load_balancer_external_http_port}:${load_balancer_external_http_port}/tcp
+    - ${load_balancer_external_tcp_port}:${load_balancer_external_tcp_port}/tcp
 
 
 #more /etc/eventstore/eventstore.conf
diff --git a/templates/eventstore/0/rancher-compose.yml b/templates/eventstore/0/rancher-compose.yml
index 0893549..28868b5 100644
--- a/templates/eventstore/0/rancher-compose.yml
+++ b/templates/eventstore/0/rancher-compose.yml
@@ -8,14 +8,14 @@ version: '2'
   maintainer: "Jérôme Rx <jerome@rouaix.eu>"
   uuid: ges-0
   questions:
-    - variable: "load_balancer_external_http_port"
-      description: "External load balancer http port"
+    - variable: "external_http_port"
+      description: "External http port"
       label: "LB http port"
       required: true
       default: 2113
       type: "int"
-    - variable: "load_balancer_external_tcp_port"
-      description: "External load balancer tcp port"
+    - variable: "external_tcp_port"
+      description: "External tcp port"
       label: "LB tcp port"
       required: true
       default: 1113
@@ -25,29 +25,4 @@ services:
   eventstore:
     scale: 3
     start_on_create: true
-  eventstore-lb:
-    start_on_create: true
-    lb_config:
-      certs: []
-      port_rules:
-      - hostname: ''
-        path: ''
-        priority: 1
-        protocol: http
-        service: eventstore
-        source_port: ${load_balancer_external_http_port}
-        target_port: ${load_balancer_external_http_port}
-      - hostname: ''
-        path: ''
-        priority: 2
-        protocol: tcp
-        service: eventstore
-        source_port: ${load_balancer_external_tcp_port}
-        target_port: ${load_balancer_external_tcp_port}
-    health_check:
-      response_timeout: 2000
-      healthy_threshold: 2
-      port: 42
-      unhealthy_threshold: 3
-      interval: 2000