diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 56950b58eec..d21866ee03e 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -27,14 +27,14 @@ COPY packages packages
 RUN yarn install --pure-lockfile
 
 COPY Gruntfile.js tsconfig.json tslint.json .browserslistrc ./
-COPY public public 
+COPY public public
 COPY scripts scripts
 COPY emails emails
 
 ENV NODE_ENV production
 RUN ./node_modules/.bin/grunt build
 
-FROM ubuntu:18.10
+FROM ubuntu:18.04
 
 LABEL maintainer="Grafana team <hello@grafana.com>"
 EXPOSE 3000
diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh
index 890154c4087..b030eab0967 100755
--- a/packaging/docker/build.sh
+++ b/packaging/docker/build.sh
@@ -64,7 +64,7 @@ docker_build () {
   else
     libc=""
     dockerfile="ubuntu.Dockerfile"
-    base_image="${base_arch}ubuntu:18.10"
+    base_image="${base_arch}ubuntu:18.04"
   fi
 
   grafana_tgz="grafana-latest.linux-${arch}${libc}.tar.gz"
diff --git a/packaging/docker/ubuntu.Dockerfile b/packaging/docker/ubuntu.Dockerfile
index 009e4441302..98aa97b33a7 100644
--- a/packaging/docker/ubuntu.Dockerfile
+++ b/packaging/docker/ubuntu.Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=ubuntu:18.10
+ARG BASE_IMAGE=ubuntu:18.04
 FROM ${BASE_IMAGE} AS grafana-builder
 
 ARG GRAFANA_TGZ="grafana-latest.linux-x64.tar.gz"