diff --git a/Dockerfile b/Dockerfile
index 526bec4..49a4e55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,8 @@ run	pip install --install-option="--prefix=/var/lib/graphite" --install-option="
 
 # graphana
 run     cd ~ &&\
-	wget https://grafanarel.s3.amazonaws.com/builds/grafana_2.0.0-beta1_amd64.deb &&\
-        dpkg -i grafana_2.0.0-beta1_amd64.deb && rm grafana_2.0.0-beta1_amd64.deb
+	wget https://grafanarel.s3.amazonaws.com/builds/grafana_2.0.0-beta3_amd64.deb &&\
+        dpkg -i grafana_2.0.0-beta3_amd64.deb && rm grafana_2.0.0-beta3_amd64.deb
 
 # statsd
 add	./statsd/config.js /src/statsd/config.js
diff --git a/grafana/config.ini b/grafana/config.ini
index 08a530a..e2474cd 100644
--- a/grafana/config.ini
+++ b/grafana/config.ini
@@ -71,4 +71,6 @@ org_role = Admin
 ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"
 level = Info
 mode = console, file
-root_path = /var/log/grafana
+
+[paths]
+logs = /var/log/grafana
diff --git a/supervisord.conf b/supervisord.conf
index 0d8267a..dfb3b25 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -33,5 +33,5 @@ autorestart = true
 
 [program:grafana]
 user=grafana
-directory = /opt/grafana/current
-command = /opt/grafana/current/grafana --config=/etc/grafana/config.ini web
+directory = /usr/share/grafana
+command = /usr/sbin/grafana-server --config=/etc/grafana/config.ini