diff --git a/public/v2/apps/elasticsearch.json b/public/v2/apps/elasticsearch.json
index d742fe1..9e78b89 100644
--- a/public/v2/apps/elasticsearch.json
+++ b/public/v2/apps/elasticsearch.json
@@ -15,26 +15,27 @@
                 "environment": {
                     "ES_JAVA_OPTS": "-Xms512m -Xmx512m",
                     "cluster.name": "$$cap_elasticsearch_cluster_name",
+                    "cluster.initial_master_nodes": "$$cap_elasticsearch_cluster_initial_master_nodes",
                     "http.port": "$$cap_container_port",
+                    "node.name": "$$cap_appname",
                     "node.master": "$$cap_elasticsearch_node_master",
                     "node.data": "$$cap_elasticsearch_node_data",
-                    "discovery.zen.minimum_master_nodes": "$$cap_elasticsearch_minimum_master_nodes",
-                    "discovery.zen.ping.unicast.hosts": "$$cap_elasticsearch_unicast_hosts"
+                    "discovery.seed_hosts": "$$cap_elasticsearch_discovery_seed_hosts"
                 },
                 "containerHttpPort": "$$cap_container_port"
             }
         }
     },
     "instructions": {
-        "start": "Elasticsearch is a distributed, RESTful search and analytics engine. This image can be used for single nodes and cluster setups. Be sure to extend the virtual memory on all your hosts! (increase \"echo 'vm.max_map_count=262144' >> /etc/sysctl.conf\" and restart \"sysctl -p\")",
-        "end": "Deployment of Elasticsearch is finished. You might see 502 errors for the next 2 minutes. Goto <YOUR-APP-URL>/_cat/health to check the health of your cluster."
+        "start": "Elasticsearch is a distributed, RESTful search and analytics engine. This image can be used for single nodes and cluster setups. IMPORTANT: Be sure to extend the virtual memory on all your hosts! (increase \"echo 'vm.max_map_count=262144' >> /etc/sysctl.conf\" and restart \"sysctl -p\")",
+        "end": "Deployment of Elasticsearch is finished. You might see 502 errors for the next 2 minutes. Goto <YOUR-APP-URL>/_cat/health to check the health of your cluster. IMPORTANT: Be sure to extend the virtual memory on all your hosts! (increase \"echo 'vm.max_map_count=262144' >> /etc/sysctl.conf\" and restart \"sysctl -p\")"
     },
     "variables": [
         {
             "id": "$$cap_elasticsearch_version",
             "label": "Elasticsearch Version Tag ",
             "description": "Checkout the releases overview: https://www.elastic.co/de/downloads/elasticsearch",
-            "defaultValue": "6.7.1",
+            "defaultValue": "7.8.0",
             "validRegex": "/^([^\\s^\\/])+$/"
         },
         {
@@ -45,10 +46,10 @@
             "validRegex": "/^([^\\s^\\/])+$/"
         },
         {
-            "id": "$$cap_elasticsearch_unicast_hosts",
-            "label": "Unicasts hosts",
-            "description": "References to other node to attach to. (for example: srv-captain--XXX)",
-            "defaultValue": "false",
+            "id": "$$cap_elasticsearch_cluster_initial_master_nodes",
+            "label": "Cluster Initial Master Nodes",
+            "description": "Nodes to be used as master nodes. If this is the master node, put the 'App Name' selected above",
+            "defaultValue": "",
             "validRegex": "/^([^\\s^\\/])+$/"
         },
         {
@@ -61,16 +62,16 @@
         {
             "id": "$$cap_elasticsearch_node_master",
             "label": "Node Master",
-            "description": "Define node as master-eligible (usual first node YES, others NO).",
+            "description": "Define node as master-eligible (usual first node TRUE, others FALSE).",
             "defaultValue": "true",
             "validRegex": "/^([^\\s^\\/])+$/"
         },
         {
-            "id": "$$cap_elasticsearch_minimum_master_nodes",
-            "label": "Minimum Master Nodes",
-            "description": "Define minimum amount of master (N) ( best practice: ceil(N/2 + 1) ).",
-            "defaultValue": "1",
-            "validRegex": "/^([0-9])+$/"
+            "id": "$$cap_elasticsearch_discovery_seed_hosts",
+            "label": "Discovery seed hosts",
+            "defaultValue": "srv-captain--XXX",
+            "description": "Domains to start the discovery of other nodes",
+            "validRegex": "/^([^\\s^\\/])+$/"
         },
         {
             "id": "$$cap_container_port",