diff --git a/grafana/Dockerfile b/grafana/Dockerfile
index 67020e9..6fbadc6 100644
--- a/grafana/Dockerfile
+++ b/grafana/Dockerfile
@@ -5,7 +5,7 @@
 FROM debian:jessie
 MAINTAINER kev <noreply@easypi.info>
 
-ENV GRAFANA_VERSION=3.1.0-1468321182
+ENV GRAFANA_VERSION=4.0.1-1480694114
 ENV GRAFANA_FILE=grafana_${GRAFANA_VERSION}_amd64.deb
 ENV GRAFANA_URL=https://grafanarel.s3.amazonaws.com/builds/${GRAFANA_FILE}
 
diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml
index b44864b..09dff14 100644
--- a/grafana/docker-compose.yml
+++ b/grafana/docker-compose.yml
@@ -1,5 +1,5 @@
 grafana:
-  image: vimagick/grafana
+  image: grafana/grafana
   ports:
     - "3000:3000"
   environment: