diff --git a/.circleci/config.yml b/.circleci/config.yml
index fa19642e9a1..cdd732c0368 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1344,7 +1344,7 @@ jobs:
       - run: cd packaging/docker && ./build-deploy.sh "master-${CIRCLE_SHA1}"
       - run: rm packaging/docker/grafana-latest.linux-*.tar.gz
       - run: cp enterprise-dist/grafana-enterprise-*.linux-amd64-musl.tar.gz packaging/docker/grafana-latest.linux-x64-musl.tar.gz
-      - run: cd packaging/docker && ./build-enterprise.sh "master"
+      - run: cd packaging/docker && ./build-enterprise.sh "master-${CIRCLE_SHA1}"
       - run:
           name: ci job failed
           command: './scripts/ci-job-failed.sh'
@@ -1370,7 +1370,7 @@ jobs:
       - run: cd packaging/docker && ./build-deploy.sh --ubuntu "master-${CIRCLE_SHA1}"
       - run: rm packaging/docker/grafana-latest.linux-*.tar.gz
       - run: cp enterprise-dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz
-      - run: cd packaging/docker && ./build-enterprise.sh --ubuntu "master"
+      - run: cd packaging/docker && ./build-enterprise.sh --ubuntu "master-${CIRCLE_SHA1}"
       - run:
           name: ci job failed
           command: './scripts/ci-job-failed.sh'
diff --git a/packaging/docker/build-enterprise.sh b/packaging/docker/build-enterprise.sh
index 7070f9d2157..0d02d926759 100755
--- a/packaging/docker/build-enterprise.sh
+++ b/packaging/docker/build-enterprise.sh
@@ -22,6 +22,8 @@ _docker_repo=${2:-grafana/grafana-enterprise}
 
 if echo "$_raw_grafana_tag" | grep -q "^v"; then
   _grafana_tag=$(echo "${_raw_grafana_tag}" | cut -d "v" -f 2)
+elif echo "$_raw_grafana_tag" | grep -q "^master-"; then
+  _grafana_tag="master"
 else
   _grafana_tag="${_raw_grafana_tag}"
 fi
@@ -48,3 +50,10 @@ if echo "$_raw_grafana_tag" | grep -q "^v" && echo "$_raw_grafana_tag" | grep -q
   docker tag "${_docker_repo}:${_grafana_tag}${TAG_SUFFIX}" "${_docker_repo}:latest${TAG_SUFFIX}"
   docker push "${_docker_repo}:latest${TAG_SUFFIX}"
 fi
+
+
+if echo "${_raw_grafana_tag}" | grep -q "^master-" && [ ${UBUNTU_BASE} = "1" ]; then
+  docker tag "${_docker_repo}:${_grafana_tag}${TAG_SUFFIX}" "grafana/grafana-enterprise-dev:${_raw_grafana_tag}"
+  docker push "grafana/grafana-enterprise-dev:${_raw_grafana_tag}"
+fi
+