diff --git a/templates/kibana/3/docker-compose.yml b/templates/kibana/3/docker-compose.yml
new file mode 100644
index 0000000..066e42e
--- /dev/null
+++ b/templates/kibana/3/docker-compose.yml
@@ -0,0 +1,33 @@
+kibana-vip:
+  ports:
+  - "${public_port}:80"
+  restart: always
+  tty: true
+  image: rancher/load-balancer-service
+  links:
+  - nginx-proxy:kibana5
+  stdin_open: true
+nginx-proxy-conf:
+  image: rancher/nginx-conf:v0.2.0
+  command: "-backend=rancher --prefix=/2015-07-25"
+  labels:
+    io.rancher.container.hostname_override: container_name
+nginx-proxy:
+  image: rancher/nginx:v1.9.4-3
+  volumes_from:
+    - nginx-proxy-conf
+  labels:
+    io.rancher.container.hostname_override: container_name
+    io.rancher.sidekicks: nginx-proxy-conf,kibana5
+  external_links:
+    - ${elasticsearch_source}:elasticsearch
+kibana5:
+  restart: always
+  tty: true
+  image: kibana:5.3.0
+  net: "container:nginx-proxy"
+  stdin_open: true
+  environment:
+    ELASTICSEARCH_URL: "http://elasticsearch:9200"
+  labels:
+    io.rancher.container.hostname_override: container_name
diff --git a/templates/kibana/3/rancher-compose.yml b/templates/kibana/3/rancher-compose.yml
new file mode 100644
index 0000000..66479a4
--- /dev/null
+++ b/templates/kibana/3/rancher-compose.yml
@@ -0,0 +1,24 @@
+.catalog:
+  name: "Kibana"
+  version: "5.3.0-rancher1"
+  description: "Kibana: Explore & Visualize Your Data"
+  questions:
+    - variable: "elasticsearch_source"
+      description: "Link to elasticsearch service or stack/service"
+      label: "Elasticsearch source"
+      type: "service"
+      required: true
+      default: "es/elasticsearch-clients"
+    - variable: "public_port"
+      label: "Public Port"
+      description: "Unique public port for Kibana"
+      type: "int"
+      default: 80
+      required: true
+
+nginx-proxy:
+  metadata:
+    nginx:
+      conf:
+        servername: "kibana"
+        upstream_port: 5601