diff --git a/templates/es-cluster/0/README.md b/templates/es-cluster/0/README.md
index f6452e4..6b474e0 100644
--- a/templates/es-cluster/0/README.md
+++ b/templates/es-cluster/0/README.md
@@ -1,3 +1,3 @@
 # Elasticsearch Cluster
 
-A scalable Elasticsearch cluster with Kibana
\ No newline at end of file
+A scalable Elasticsearch cluster
\ No newline at end of file
diff --git a/templates/es-cluster/0/docker-compose.yml b/templates/es-cluster/0/docker-compose.yml
index 6fd55ea..0107695 100644
--- a/templates/es-cluster/0/docker-compose.yml
+++ b/templates/es-cluster/0/docker-compose.yml
@@ -97,22 +97,6 @@ services:
         volumes: 
             - es-storage-volume:/usr/share/elasticsearch/data
 
-    kibana:
-        labels: 
-            - io.rancher.container.hostname_override=container_name
-        image: docker.elastic.co/kibana/kibana:5.3.0
-        environment: 
-            - "bootstrap.memory_lock=true"
-            - "xpack.security.enabled=false"
-            - "ELASTICSEARCH_URL=http://es-master:9200"
-            - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-        mem_limit: 1073741824
-        mem_swappiness: 0
-        ports:
-            - "${kibana_port}:5601"
-        depends_on:
-            - es-master
-
 volumes:
   es-storage-volume:
     driver: local
diff --git a/templates/es-cluster/0/rancher-compose.yml b/templates/es-cluster/0/rancher-compose.yml
index 0516a7a..aec490c 100644
--- a/templates/es-cluster/0/rancher-compose.yml
+++ b/templates/es-cluster/0/rancher-compose.yml
@@ -1,7 +1,7 @@
 .catalog:
     name: Elasticsearch Cluster
     version: 5.3.0-rancher1
-    description: Scalable Elasticsearch Cluster with Kibana
+    description: Scalable Elasticsearch Cluster
 
     questions:
         - variable: "cluster_name"
@@ -52,13 +52,6 @@
           label: "Memory limit in byte (client nodes)"
           description: "Memory limit in Byte per elasticsearch container. AT LEAST double the heap size! (client nodes)"
           default: 1073741824
-        
-        - variable: "kibana_port"
-          type: "int"
-          required: true
-          label: "Public kibana port"
-          description: "Public port where kibana will be accessible"
-          default: 5601
 
         - variable: "minimum_master_nodes"
           type: "int"