diff --git a/.circleci/config.yml b/.circleci/config.yml
index d5d1829cdde..e5bf6cdad6e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -342,7 +342,7 @@ jobs:
           name: Deploy to grafana.com
           command: |
             cd enterprise-dist
-            ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -enterprise -version "$(cat grafana.version)" --nightly
+            ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -enterprise -version "v$(cat grafana.version)" --nightly
 
 
   deploy-enterprise-release:
@@ -407,7 +407,7 @@ jobs:
           command: |
             rm dist/grafana-master-$(echo "${CIRCLE_SHA1}" | cut -b1-7).linux-x64.tar.gz
             rm dist/*latest*
-            cd dist && ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -version "$(cat grafana.version)" --nightly
+            cd dist && ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -version "v$(cat grafana.version)" --nightly
 
   deploy-release:
     docker:
diff --git a/scripts/build/build-all.sh b/scripts/build/build-all.sh
index 300b06c61df..2d71c21dc69 100755
--- a/scripts/build/build-all.sh
+++ b/scripts/build/build-all.sh
@@ -32,13 +32,6 @@ fi
 echo "Build arguments: $OPT"
 echo "current dir: $(pwd)"
 
-if [ -d "dist" ]; then
-  rm -rf dist
-fi
-
-mkdir dist
-go run build.go -gen-version ${OPT} > dist/grafana.version
-
 # build only amd64 for enterprise
 if echo "$EXTRA_OPTS" | grep -vq enterprise ; then
   go run build.go -goarch armv6 -cc ${CCARMV6} ${OPT} build
@@ -62,6 +55,13 @@ fi
 echo "Building frontend"
 go run build.go ${OPT} build-frontend
 
+if [ -d "dist" ]; then
+  rm -rf dist
+fi
+
+mkdir dist
+go run build.go -gen-version ${OPT} > dist/grafana.version
+
 # Load ruby, needed for packing with fpm
 source /etc/profile.d/rvm.sh
 
diff --git a/scripts/build/build.sh b/scripts/build/build.sh
index f3dcda8333f..f55a5f6ed92 100755
--- a/scripts/build/build.sh
+++ b/scripts/build/build.sh
@@ -31,13 +31,6 @@ fi
 echo "Build arguments: $OPT"
 echo "current dir: $(pwd)"
 
-if [ -d "dist" ]; then
-  rm -rf dist
-fi
-
-mkdir dist
-go run build.go -gen-version ${OPT} > dist/grafana.version
-
 go run build.go -goarch armv6 -cc ${CCARMV6} ${OPT} build
 go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build
 go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build
@@ -49,6 +42,13 @@ yarn install --pure-lockfile --no-progress
 echo "Building frontend"
 go run build.go ${OPT} build-frontend
 
+if [ -d "dist" ]; then
+  rm -rf dist
+fi
+
+mkdir dist
+go run build.go -gen-version ${OPT} > dist/grafana.version
+
 # Load ruby, needed for packing with fpm
 source /etc/profile.d/rvm.sh