diff --git a/Dockerfile b/Dockerfile
index 03ab9dd..23fa976 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,16 @@
-FROM ubuntu:bionic
+FROM ubuntu:focal
 
-RUN apt-get update && \
-    apt-get install -y wget libfontconfig1 && \
-    wget -O /tmp/grafana.deb https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.2.2_amd64.deb && \
-    dpkg -i /tmp/grafana.deb && \
-    rm /tmp/grafana.deb
+RUN set -x && apt-get update -qq && \
+    apt-get install -yqq gnupg wget apt-transport-https && \
+    wget -q -O - https://packages.grafana.com/gpg.key | apt-key add - && \
+    echo "deb https://packages.grafana.com/oss/deb stable main" | tee -a /etc/apt/sources.list.d/grafana.list && \
+    apt-get update -qq && \
+    apt-get install -yqq grafana=7.1.5 && \
+    apt-get remove -y gnupg && \
+    apt-get autoremove -y && \
+    apt-get clean && \
+    rm -rf /var/lib/{apt,dpkg,cache,log}/ && \
+    install -o grafana -g grafana -d /usr/share/grafana/data/log
 
 WORKDIR /usr/share/grafana