diff --git a/.circleci/config.yml b/.circleci/config.yml
index c293ea26a9db5..79879b1a3866b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -206,6 +206,9 @@ jobs:
       - run: docker info
       - run: cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
       - run: cd packaging/docker && ./build-deploy.sh "master-${CIRCLE_SHA1}"
+      - run: cp dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz
+      - run: cd packaging/docker && ./build-enterprise.sh "master"
+
 
   grafana-docker-pr:
     docker:
@@ -409,6 +412,7 @@ workflows:
       - grafana-docker-master:
           requires:
             - build-all
+            - build-all-enterprise
             - test-backend
             - test-frontend
             - codespell
diff --git a/packaging/docker/build-enterprise.sh b/packaging/docker/build-enterprise.sh
new file mode 100755
index 0000000000000..f716a1f44f166
--- /dev/null
+++ b/packaging/docker/build-enterprise.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+_grafana_tag=$1
+_docker_repo=${2:-grafana/grafana-enterprise}
+
+docker build \
+  --tag "${_docker_repo}:${_grafana_tag}"\
+  --no-cache=true \
+  .