diff --git a/templates/eventstore/0/docker-compose.yml b/templates/eventstore/0/docker-compose.yml
index bd75000..b56f462 100644
--- a/templates/eventstore/0/docker-compose.yml
+++ b/templates/eventstore/0/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   eventstore:
-    image: eventstore/eventstore
+    image: eventstore/eventstore:4.0.3
     entrypoint: /bin/bash
     command:
     - -c
@@ -15,7 +15,7 @@ services:
       /entrypoint.sh'
 
     environment:
-    - EVENTSTORE_CLUSTER_SIZE=3
+    - EVENTSTORE_CLUSTER_SIZE=${number_of_nodes}
     - EVENTSTORE_CLUSTER_DNS=eventstore
     - EVENTSTORE_CLUSTER_GOSSIP_PORT=${internal_http_port}
     - EVENTSTORE_INT_HTTP_PREFIXES=http://*:${internal_http_port}/
diff --git a/templates/eventstore/0/rancher-compose.yml b/templates/eventstore/0/rancher-compose.yml
index f98dca3..482d6c7 100644
--- a/templates/eventstore/0/rancher-compose.yml
+++ b/templates/eventstore/0/rancher-compose.yml
@@ -1,9 +1,9 @@
 version: '2'
 .catalog:
   name: GES
-  version: 0.0.1.0-ges
+  version: 0.0.2.0-ges
   description: |
-    (Experimental) GES Cluster.
+    (Experimental) GES
   minimum_rancher_version: v0.59.0
   maintainer: "Jérôme Rx <jerome@rouaix.eu>"
   uuid: ges-0
@@ -28,9 +28,24 @@ version: '2'
       required: true
       default: 1113
       type: "int"
+    - variable: "number_of_nodes"
+      label: "Number of nodes"
+      required: true
+      default: 1
+      type: "int"
 
 services:
   eventstore:
-    scale: 3
+    scale: ${number_of_nodes}
     start_on_create: true
+    health_check:      
+      port: ${external_http_port}      
+      request_line: OPTIONS /gossip HTTP/1.0      
+      interval: 2000
+      initializing_timeout: 60000
+      reinitializing_timeout: 60000
+      unhealthy_threshold: 3      
+      strategy: none
+      healthy_threshold: 2      
+      response_timeout: 2000