diff --git a/templates/grafana/2/docker-compose.yml b/templates/grafana/2/docker-compose.yml
new file mode 100644
index 0000000..70bd59e
--- /dev/null
+++ b/templates/grafana/2/docker-compose.yml
@@ -0,0 +1,9 @@
+grafana:
+    image: grafana/grafana:4.2.0
+    ports:
+        - ${http_port}:3000
+    environment:
+        GF_SECURITY_ADMIN_USER: ${admin_username}
+        GF_SECURITY_ADMIN_PASSWORD: ${admin_password}
+        GF_SECURITY_SECRET_KEY: ${secret_key}
+        GF_INSTALL_PLUGINS: ${install_plugins}
diff --git a/templates/grafana/2/rancher-compose.yml b/templates/grafana/2/rancher-compose.yml
new file mode 100644
index 0000000..a3b7b6e
--- /dev/null
+++ b/templates/grafana/2/rancher-compose.yml
@@ -0,0 +1,38 @@
+.catalog:
+  name: "Grafana"
+  version: "4.2.0-rancher2"
+  description: |
+      (Experimental) Grafana: Beautiful metric & analytic dashboards
+  questions:
+    - variable: http_port
+      description: "http port to access Grafana"
+      label: "Http Port"
+      required: true
+      default: "3000"
+      type: "int"
+    - variable: admin_username
+      description: "Grafana admin username"
+      label: "Admin Username"
+      required: true
+      default: "admin"
+      type: "string"
+    - variable: admin_password
+      description: "Grafana admin password"
+      label: "Admin Password"
+      required: true
+      default: "password"
+      type: "string"
+    - variable: secret_key
+      description: "Signing secret key"
+      label: "Secret Key"
+      required: true
+      default: "su2Tong2zoocie"
+      type: "string"
+    - variable: install_plugins
+      description: "Include/Install Grafana Plugins (comma-separated plugin-ids)"
+      label: "Install Plugins"
+      required: false
+      default: "grafana-clock-panel"
+      type: "string"
+      
+grafana:
diff --git a/templates/grafana/config.yml b/templates/grafana/config.yml
index b4a14f8..9e813d6 100644
--- a/templates/grafana/config.yml
+++ b/templates/grafana/config.yml
@@ -1,4 +1,4 @@
 name: "Grafana"
 description: "Visualization dashboard"
-version: "4.1.2-rancher1"
+version: "4.2.0-rancher2"
 category: Monitoring
\ No newline at end of file