diff --git a/canned/kubernetes_node.json b/canned/kubernetes_node.json
new file mode 100644
index 0000000000..8e63e002d7
--- /dev/null
+++ b/canned/kubernetes_node.json
@@ -0,0 +1,39 @@
+ {
+  "id": "4a1efaec-57cf-4aeb-8dea-8a015f8ec3c5",
+  "measurement": "kubernetes_node",
+  "app": "k8s node container metrics",
+  "cells": [
+    {
+      "x": 0,
+      "y": 0,
+      "w": 10,
+      "h": 10,
+      "i": "5f406919-14b8-4c01-b0ce-f8ed75310805",
+      "name": "Node cpu usage millicores",
+      "queries": [
+        {
+          "query": "select \"cpu_usage_nanocores\" / 1000000  from kubernetes_node",
+          "db": "telegraf",
+          "rp": "autogen",
+          "groupbys": ["node_name"]
+        }
+      ]
+    },
+    {
+      "x": 10,
+      "y": 0,
+      "w": 10,
+      "h": 10,
+      "i": "042d47cc-fcfd-4b26-a690-d81c0321d408",
+      "name": "Node memory usage bytes",
+      "queries": [
+        {
+          "query": "select \"memory_usage_bytes\" from kubernetes_node",
+          "db": "telegraf",
+          "rp": "autogen",
+          "groupbys": ["node_name"]
+        }
+      ]
+    }
+  ]
+}
diff --git a/canned/kubernetes_pod_container.json b/canned/kubernetes_pod_container.json
new file mode 100644
index 0000000000..1e5e497f00
--- /dev/null
+++ b/canned/kubernetes_pod_container.json
@@ -0,0 +1,43 @@
+{
+  "id": "50a14fed-6d0c-4c8a-a142-ad9276bee245",
+  "measurement": "kubernetes_pod_container",
+  "app": "k8s pod container metrics",
+  "cells": [
+    {
+      "x": 0,
+      "y": 0,
+      "w": 10,
+      "h": 10,
+      "i": "e2427235-c81b-42a1-afdf-80d340fc01f8",
+      "name": "Pod cpu usage millicores",
+      "queries": [
+        {
+          "query": "select \"cpu_usage_nanocores\" / 1000000 from kubernetes_pod_container",
+          "db": "telegraf",
+          "rp": "autogen",
+          "groupbys": [
+            "pod_name"
+          ]
+        }
+      ]
+    },
+    {
+      "x": 0,
+      "y": 0,
+      "w": 10,
+      "h": 10,
+      "i": "6edb8c61-f723-47ce-a7eb-904fc6fe066e",
+      "name": "Pod memory usage bytes",
+      "queries": [
+        {
+          "query": "select \"memory_usage_bytes\" from kubernetes_pod_container",
+          "db": "telegraf",
+          "rp": "autogen",
+          "groupbys": [
+            "pod_name"
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/canned/kubernetes_pod_network.json b/canned/kubernetes_pod_network.json
new file mode 100644
index 0000000000..c1a8f44078
--- /dev/null
+++ b/canned/kubernetes_pod_network.json
@@ -0,0 +1,39 @@
+{
+  "id": "45845136-bcb7-41ad-a02e-c63e9d3452de",
+  "measurement": "kubernetes_pod_network",
+  "app": "k8s system network metrics",
+  "cells": [
+    {
+      "x": 0,
+      "y": 0,
+      "w": 10,
+      "h": 10,
+      "i": "0e06ddcd-05dd-493f-9dba-a382300a7190",
+      "name": "TX bytes/second",
+      "queries": [
+        {
+          "query": "select non_negative_derivative(last(\"tx_bytes\"), 10) from kubernetes_pod_network where namespace=\"kube-system\"",
+          "db": "telegraf",
+          "rp": "autogen",
+          "groupbys": ["time"]
+        }
+      ]
+    },
+    {
+      "x": 10,
+      "y": 0,
+      "w": 10,
+      "h": 10,
+      "i": "cc062b4c-70ca-4bd7-b372-398e734feb49",
+      "name": "RX bytes/second ",
+      "queries": [
+        {
+          "query": "select non_negative_derivative(last(\"rx_bytes\"), 10) from kubernetes_pod_network where namespace=\"kube-system\"",
+          "db": "telegraf",
+          "rp": "autogen",
+          "groupbys": ["time"]
+        }
+      ]
+    }
+  ]
+}
diff --git a/canned/kubernetes_system_container.json b/canned/kubernetes_system_container.json
new file mode 100644
index 0000000000..3587175228
--- /dev/null
+++ b/canned/kubernetes_system_container.json
@@ -0,0 +1,39 @@
+{
+  "id": "05dde59a-a52f-4ede-81fa-0c6011f29287",
+  "measurement": "kubernetes_system_container",
+  "app": "k8s system container metrics",
+  "cells": [
+    {
+      "x": 0,
+      "y": 0,
+      "w": 10,
+      "h": 10,
+      "i": "64cf0f60-e157-4c03-9d7e-c280a7e2695f",
+      "name": "Kubelet cpu usage millicores",
+      "queries": [
+        {
+          "query": "select \"cpu_usage_nanocores\" / 1000000  from kubernetes_system_container where \"container_name\" = 'kubelet'",
+          "db": "telegraf",
+          "rp": "autogen",
+          "groupbys": []
+        }
+      ]
+    },
+    {
+      "x": 10,
+      "y": 0,
+      "w": 10,
+      "h": 10,
+      "i": "4a7454d1-4d60-4077-9e7b-8c915a00fe66",
+      "name": "Kubelet memory usage bytes",
+      "queries": [
+        {
+          "query": "select \"memory_usage_bytes\" from kubernetes_system_container where \"container_name\" = 'kubelet'",
+          "db": "telegraf",
+          "rp": "autogen",
+          "groupbys": []
+        }
+      ]
+    }
+  ]
+}
diff --git a/circle.yml b/circle.yml
index 08b558b3e9..c63488b3c0 100644
--- a/circle.yml
+++ b/circle.yml
@@ -15,8 +15,6 @@ dependencies:
         - ln -sf ${HOME}/chronograf ${HOME}/.go_workspace/src/github.com/influxdata
         - "make":
             pwd: ../.go_workspace/src/github.com/influxdata/chronograf
-    cache_directories:
-        - ../../../../../chronograf/ui/node_modules
 
 test:
     override:
@@ -24,7 +22,7 @@ test:
 
 deployment:
     heroku:
-        branch: develop
+        branch: master
         commands:
             - make docker
             - docker login -e $HEROKU_EMAIL -u $HEROKU_EMAIL -p $HEROKU_PASS registry.heroku.com