diff --git a/grafana/rootfs/Dockerfile b/grafana/rootfs/Dockerfile
index 1160da0..e65f5f4 100644
--- a/grafana/rootfs/Dockerfile
+++ b/grafana/rootfs/Dockerfile
@@ -1,12 +1,15 @@
 FROM grafana/grafana:7.3.4
-
+USER root
 COPY . /
-
-RUN curl -fsSL -o /usr/share/grafana/envtpl https://github.com/arschles/envtpl/releases/download/0.2.3/envtpl_linux_amd64 \
+RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
+    && apk add --update bash fontconfig curl \
+    && curl -fsSL -o /usr/share/grafana/envtpl https://github.com/arschles/envtpl/releases/download/0.2.3/envtpl_linux_amd64 \
 	&& chmod +x /usr/share/grafana/envtpl \
 	&& chmod +x /usr/share/grafana/start-grafana \
-	&& chmod 644 /usr/share/grafana/grafana.ini.tpl
+	&& chmod 644 /usr/share/grafana/grafana.ini.tpl \
+	&& chmod +x /usr/share/grafana/entrypoint.sh
 
 WORKDIR /usr/share/grafana
+ENTRYPOINT ["/usr/share/grafana/entrypoint.sh"]
 CMD ["./start-grafana"]
 EXPOSE 3000
diff --git a/grafana/rootfs/usr/share/grafana/start-grafana b/grafana/rootfs/usr/share/grafana/start-grafana
index dfe27d6..1ecb684 100755
--- a/grafana/rootfs/usr/share/grafana/start-grafana
+++ b/grafana/rootfs/usr/share/grafana/start-grafana
@@ -65,7 +65,7 @@ fi
 
 set -m
 echo "Starting Grafana in the background"
-exec /usr/sbin/grafana-server -config /usr/share/grafana/grafana.ini -homepath /usr/share/grafana &
+exec grafana-server -config /usr/share/grafana/grafana.ini -homepath /usr/share/grafana &
 echo "Waiting for Grafana to come up..."
 until curl -q --fail --output /dev/null --silent "http://${GRAFANA_USER}:${GRAFANA_PASSWD}@localhost:${GRAFANA_PORT}/api/org"; do
   printf "."