diff --git a/.drone.yml b/.drone.yml
index 295dcc35e18..abcb6628b96 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,12 +9,12 @@ platform:
 
 steps:
 - name: identify-runner
-  image: alpine:3.12
+  image: alpine:3.13
   commands:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
@@ -28,7 +28,7 @@ steps:
     DOCKERIZE_VERSION: 0.6.1
 
 - name: lint-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl lint-backend --edition oss
   environment:
@@ -37,7 +37,7 @@ steps:
   - initialize
 
 - name: codespell
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -45,21 +45,21 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: check-dashboard-schemas
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - cue export --out openapi -o - ./dashboard-schemas/...
   depends_on:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition oss
@@ -69,7 +69,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -78,7 +78,7 @@ steps:
   - initialize
 
 - name: build-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --variants linux-x64,linux-x64-musl,osx64,win64 --no-pull-enterprise
   depends_on:
@@ -87,7 +87,7 @@ steps:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
@@ -95,7 +95,7 @@ steps:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps
   depends_on:
@@ -103,7 +103,7 @@ steps:
   - lint-backend
 
 - name: gen-version
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
@@ -117,14 +117,14 @@ steps:
   - check-dashboard-schemas
 
 - name: package
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - . scripts/build/gpg-test-vars.sh && ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --variants linux-x64,linux-x64-musl,osx64,win64
   depends_on:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   detach: true
   commands:
   - ./e2e/start-server
@@ -144,7 +144,7 @@ steps:
   - end-to-end-tests-server
 
 - name: build-storybook
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - yarn storybook:build
   - ./bin/grabpl verify-storybook
@@ -154,7 +154,7 @@ steps:
   - package
 
 - name: build-frontend-docs
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./scripts/ci-reference-docs-lint.sh ci
   depends_on:
@@ -171,7 +171,7 @@ steps:
   - build-frontend-docs
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -188,7 +188,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -205,7 +205,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -251,12 +251,12 @@ platform:
 
 steps:
 - name: identify-runner
-  image: alpine:3.12
+  image: alpine:3.13
   commands:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
@@ -282,7 +282,7 @@ steps:
       from_secret: drone_token
 
 - name: lint-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl lint-backend --edition oss
   environment:
@@ -291,7 +291,7 @@ steps:
   - initialize
 
 - name: codespell
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -299,21 +299,21 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: check-dashboard-schemas
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - cue export --out openapi -o - ./dashboard-schemas/...
   depends_on:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition oss
@@ -323,7 +323,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -332,7 +332,7 @@ steps:
   - initialize
 
 - name: publish-frontend-metrics
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./scripts/ci-frontend-metrics.sh | ./bin/grabpl publish-metrics $${GRAFANA_MISC_STATS_API_KEY}
   environment:
@@ -343,7 +343,7 @@ steps:
   - initialize
 
 - name: build-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
@@ -352,7 +352,7 @@ steps:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
@@ -360,7 +360,7 @@ steps:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin
   environment:
@@ -371,7 +371,7 @@ steps:
   - lint-backend
 
 - name: gen-version
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
@@ -385,7 +385,7 @@ steps:
   - check-dashboard-schemas
 
 - name: package
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --sign
   environment:
@@ -403,7 +403,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   detach: true
   commands:
   - ./e2e/start-server
@@ -423,7 +423,7 @@ steps:
   - end-to-end-tests-server
 
 - name: build-storybook
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - yarn storybook:build
   - ./bin/grabpl verify-storybook
@@ -446,14 +446,14 @@ steps:
   - end-to-end-tests
 
 - name: build-frontend-docs
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./scripts/ci-reference-docs-lint.sh ci
   depends_on:
   - build-frontend
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -484,7 +484,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -501,7 +501,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -517,7 +517,7 @@ steps:
   - test-frontend
 
 - name: release-canary-npm-packages
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./scripts/circle-release-canary-packages.sh
   environment:
@@ -633,12 +633,12 @@ platform:
 
 steps:
 - name: identify-runner
-  image: alpine:3.12
+  image: alpine:3.13
   commands:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
@@ -718,12 +718,12 @@ platform:
 
 steps:
 - name: identify-runner
-  image: alpine:3.12
+  image: alpine:3.13
   commands:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
@@ -738,7 +738,7 @@ steps:
     DOCKERIZE_VERSION: 0.6.1
 
 - name: lint-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl lint-backend --edition oss
   environment:
@@ -747,7 +747,7 @@ steps:
   - initialize
 
 - name: codespell
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -755,21 +755,21 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: check-dashboard-schemas
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - cue export --out openapi -o - ./dashboard-schemas/...
   depends_on:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition oss
@@ -779,7 +779,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -788,7 +788,7 @@ steps:
   - initialize
 
 - name: build-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise ${DRONE_TAG}
   environment:
@@ -800,7 +800,7 @@ steps:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition oss --no-pull-enterprise ${DRONE_TAG}
   depends_on:
@@ -808,7 +808,7 @@ steps:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin
   environment:
@@ -819,7 +819,7 @@ steps:
   - lint-backend
 
 - name: gen-version
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl gen-version ${DRONE_TAG}
   depends_on:
@@ -833,7 +833,7 @@ steps:
   - check-dashboard-schemas
 
 - name: package
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign ${DRONE_TAG}
   environment:
@@ -851,7 +851,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   detach: true
   commands:
   - ./e2e/start-server
@@ -871,7 +871,7 @@ steps:
   - end-to-end-tests-server
 
 - name: build-storybook
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - yarn storybook:build
   - ./bin/grabpl verify-storybook
@@ -881,7 +881,7 @@ steps:
   - package
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -912,7 +912,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -929,7 +929,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -982,7 +982,7 @@ steps:
   - end-to-end-tests
 
 - name: release-npm-packages
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./scripts/build/release-packages.sh ${DRONE_TAG}
   environment:
@@ -1076,12 +1076,12 @@ clone:
 
 steps:
 - name: identify-runner
-  image: alpine:3.12
+  image: alpine:3.13
   commands:
   - echo $DRONE_RUNNER_NAME
 
 - name: clone
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
@@ -1094,7 +1094,7 @@ steps:
       from_secret: github_token
 
 - name: initialize
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - mv bin/grabpl /tmp/
   - rmdir bin
@@ -1114,7 +1114,7 @@ steps:
   - clone
 
 - name: lint-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl lint-backend --edition enterprise
   environment:
@@ -1123,7 +1123,7 @@ steps:
   - initialize
 
 - name: codespell
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -1131,21 +1131,21 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: check-dashboard-schemas
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - cue export --out openapi -o - ./dashboard-schemas/...
   depends_on:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition enterprise
@@ -1155,7 +1155,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -1164,7 +1164,7 @@ steps:
   - initialize
 
 - name: build-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise ${DRONE_TAG}
   environment:
@@ -1176,7 +1176,7 @@ steps:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition enterprise --no-pull-enterprise ${DRONE_TAG}
   depends_on:
@@ -1184,7 +1184,7 @@ steps:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign --signing-admin
   environment:
@@ -1195,7 +1195,7 @@ steps:
   - lint-backend
 
 - name: lint-backend-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl lint-backend --edition enterprise2
   environment:
@@ -1204,7 +1204,7 @@ steps:
   - initialize
 
 - name: test-backend-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition enterprise2
@@ -1214,7 +1214,7 @@ steps:
   - lint-backend-enterprise2
 
 - name: build-backend-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise ${DRONE_TAG}
   environment:
@@ -1226,7 +1226,7 @@ steps:
   - test-backend-enterprise2
 
 - name: gen-version
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl gen-version ${DRONE_TAG}
   depends_on:
@@ -1242,7 +1242,7 @@ steps:
   - test-backend-enterprise2
 
 - name: package
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign ${DRONE_TAG}
   environment:
@@ -1260,7 +1260,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   detach: true
   commands:
   - ./e2e/start-server
@@ -1282,7 +1282,7 @@ steps:
   - end-to-end-tests-server
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -1313,7 +1313,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -1330,7 +1330,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -1369,7 +1369,7 @@ steps:
   - postgres-integration-tests
 
 - name: package-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign ${DRONE_TAG}
   environment:
@@ -1397,7 +1397,7 @@ steps:
   - package-enterprise2
 
 - name: end-to-end-tests-server-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   detach: true
   commands:
   - ./e2e/start-server
@@ -1532,12 +1532,12 @@ platform:
 
 steps:
 - name: identify-runner
-  image: alpine:3.12
+  image: alpine:3.13
   commands:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
@@ -1637,12 +1637,12 @@ platform:
 
 steps:
 - name: identify-runner
-  image: alpine:3.12
+  image: alpine:3.13
   commands:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
@@ -1657,7 +1657,7 @@ steps:
     DOCKERIZE_VERSION: 0.6.1
 
 - name: lint-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl lint-backend --edition oss
   environment:
@@ -1666,7 +1666,7 @@ steps:
   - initialize
 
 - name: codespell
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -1674,21 +1674,21 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: check-dashboard-schemas
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - cue export --out openapi -o - ./dashboard-schemas/...
   depends_on:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition oss
@@ -1698,7 +1698,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -1707,7 +1707,7 @@ steps:
   - initialize
 
 - name: build-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise v7.3.0-test
   environment:
@@ -1719,7 +1719,7 @@ steps:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition oss --no-pull-enterprise v7.3.0-test
   depends_on:
@@ -1727,7 +1727,7 @@ steps:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin
   environment:
@@ -1738,7 +1738,7 @@ steps:
   - lint-backend
 
 - name: gen-version
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl gen-version v7.3.0-test
   depends_on:
@@ -1752,7 +1752,7 @@ steps:
   - check-dashboard-schemas
 
 - name: package
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign v7.3.0-test
   environment:
@@ -1770,7 +1770,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   detach: true
   commands:
   - ./e2e/start-server
@@ -1790,7 +1790,7 @@ steps:
   - end-to-end-tests-server
 
 - name: build-storybook
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - yarn storybook:build
   - ./bin/grabpl verify-storybook
@@ -1800,7 +1800,7 @@ steps:
   - package
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -1825,7 +1825,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -1842,7 +1842,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -1892,7 +1892,7 @@ steps:
   - end-to-end-tests
 
 - name: release-npm-packages
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   environment:
     GITHUB_PACKAGE_TOKEN:
       from_secret: github_package_token
@@ -1984,12 +1984,12 @@ clone:
 
 steps:
 - name: identify-runner
-  image: alpine:3.12
+  image: alpine:3.13
   commands:
   - echo $DRONE_RUNNER_NAME
 
 - name: clone
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
@@ -2002,7 +2002,7 @@ steps:
       from_secret: github_token
 
 - name: initialize
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - mv bin/grabpl /tmp/
   - rmdir bin
@@ -2022,7 +2022,7 @@ steps:
   - clone
 
 - name: lint-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl lint-backend --edition enterprise
   environment:
@@ -2031,7 +2031,7 @@ steps:
   - initialize
 
 - name: codespell
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -2039,21 +2039,21 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: check-dashboard-schemas
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - cue export --out openapi -o - ./dashboard-schemas/...
   depends_on:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition enterprise
@@ -2063,7 +2063,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -2072,7 +2072,7 @@ steps:
   - initialize
 
 - name: build-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise v7.3.0-test
   environment:
@@ -2084,7 +2084,7 @@ steps:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition enterprise --no-pull-enterprise v7.3.0-test
   depends_on:
@@ -2092,7 +2092,7 @@ steps:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign --signing-admin
   environment:
@@ -2103,7 +2103,7 @@ steps:
   - lint-backend
 
 - name: lint-backend-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl lint-backend --edition enterprise2
   environment:
@@ -2112,7 +2112,7 @@ steps:
   - initialize
 
 - name: test-backend-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition enterprise2
@@ -2122,7 +2122,7 @@ steps:
   - lint-backend-enterprise2
 
 - name: build-backend-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise v7.3.0-test
   environment:
@@ -2134,7 +2134,7 @@ steps:
   - test-backend-enterprise2
 
 - name: gen-version
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl gen-version v7.3.0-test
   depends_on:
@@ -2150,7 +2150,7 @@ steps:
   - test-backend-enterprise2
 
 - name: package
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign v7.3.0-test
   environment:
@@ -2168,7 +2168,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   detach: true
   commands:
   - ./e2e/start-server
@@ -2190,7 +2190,7 @@ steps:
   - end-to-end-tests-server
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -2215,7 +2215,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -2232,7 +2232,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -2271,7 +2271,7 @@ steps:
   - postgres-integration-tests
 
 - name: package-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign v7.3.0-test
   environment:
@@ -2299,7 +2299,7 @@ steps:
   - package-enterprise2
 
 - name: end-to-end-tests-server-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   detach: true
   commands:
   - ./e2e/start-server
@@ -2434,12 +2434,12 @@ platform:
 
 steps:
 - name: identify-runner
-  image: alpine:3.12
+  image: alpine:3.13
   commands:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
@@ -2539,12 +2539,12 @@ platform:
 
 steps:
 - name: identify-runner
-  image: alpine:3.12
+  image: alpine:3.13
   commands:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
@@ -2558,7 +2558,7 @@ steps:
     DOCKERIZE_VERSION: 0.6.1
 
 - name: lint-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl lint-backend --edition oss
   environment:
@@ -2567,7 +2567,7 @@ steps:
   - initialize
 
 - name: codespell
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -2575,21 +2575,21 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: check-dashboard-schemas
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - cue export --out openapi -o - ./dashboard-schemas/...
   depends_on:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition oss
@@ -2599,7 +2599,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -2608,7 +2608,7 @@ steps:
   - initialize
 
 - name: build-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
@@ -2617,7 +2617,7 @@ steps:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
@@ -2625,7 +2625,7 @@ steps:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin
   environment:
@@ -2636,7 +2636,7 @@ steps:
   - lint-backend
 
 - name: gen-version
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
@@ -2650,7 +2650,7 @@ steps:
   - check-dashboard-schemas
 
 - name: package
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --sign
   environment:
@@ -2668,7 +2668,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   detach: true
   commands:
   - ./e2e/start-server
@@ -2688,7 +2688,7 @@ steps:
   - end-to-end-tests-server
 
 - name: build-storybook
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - yarn storybook:build
   - ./bin/grabpl verify-storybook
@@ -2698,7 +2698,7 @@ steps:
   - package
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -2723,7 +2723,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -2740,7 +2740,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -2857,12 +2857,12 @@ clone:
 
 steps:
 - name: identify-runner
-  image: alpine:3.12
+  image: alpine:3.13
   commands:
   - echo $DRONE_RUNNER_NAME
 
 - name: clone
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.43/grabpl
@@ -2875,7 +2875,7 @@ steps:
       from_secret: github_token
 
 - name: initialize
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - mv bin/grabpl /tmp/
   - rmdir bin
@@ -2894,7 +2894,7 @@ steps:
   - clone
 
 - name: lint-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl lint-backend --edition enterprise
   environment:
@@ -2903,7 +2903,7 @@ steps:
   - initialize
 
 - name: codespell
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -2911,21 +2911,21 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: check-dashboard-schemas
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - cue export --out openapi -o - ./dashboard-schemas/...
   depends_on:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition enterprise
@@ -2935,7 +2935,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -2944,7 +2944,7 @@ steps:
   - initialize
 
 - name: build-backend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
@@ -2953,7 +2953,7 @@ steps:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition enterprise --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
@@ -2961,7 +2961,7 @@ steps:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign --signing-admin
   environment:
@@ -2972,7 +2972,7 @@ steps:
   - lint-backend
 
 - name: lint-backend-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl lint-backend --edition enterprise2
   environment:
@@ -2981,7 +2981,7 @@ steps:
   - initialize
 
 - name: test-backend-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition enterprise2
@@ -2991,7 +2991,7 @@ steps:
   - lint-backend-enterprise2
 
 - name: build-backend-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} --variants linux-x64 --no-pull-enterprise
   depends_on:
@@ -3000,7 +3000,7 @@ steps:
   - test-backend-enterprise2
 
 - name: gen-version
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
@@ -3016,7 +3016,7 @@ steps:
   - test-backend-enterprise2
 
 - name: package
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --sign
   environment:
@@ -3034,7 +3034,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   detach: true
   commands:
   - ./e2e/start-server
@@ -3056,7 +3056,7 @@ steps:
   - end-to-end-tests-server
 
 - name: build-storybook
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - yarn storybook:build
   - ./bin/grabpl verify-storybook
@@ -3066,7 +3066,7 @@ steps:
   - package
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -3091,7 +3091,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -3108,7 +3108,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -3147,7 +3147,7 @@ steps:
   - postgres-integration-tests
 
 - name: package-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --variants linux-x64 --sign
   environment:
@@ -3175,7 +3175,7 @@ steps:
   - package-enterprise2
 
 - name: end-to-end-tests-server-enterprise2
-  image: grafana/build-container:1.3.2
+  image: grafana/build-container:1.4.0
   detach: true
   commands:
   - ./e2e/start-server
diff --git a/Dockerfile b/Dockerfile
index da5d72a9567..f373623dd45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14.15.1-alpine3.12 as js-builder
+FROM node:14.15.5-alpine3.13 as js-builder
 
 WORKDIR /usr/src/app/
 
@@ -16,7 +16,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build
 
-FROM golang:1.15.1-alpine3.12 as go-builder
+FROM golang:1.16.0-alpine3.13 as go-builder
 
 RUN apk add --no-cache gcc g++
 
@@ -32,7 +32,7 @@ COPY build.go package.json ./
 RUN go run build.go build
 
 # Final stage
-FROM alpine:3.12
+FROM alpine:3.13
 
 LABEL maintainer="Grafana team <hello@grafana.com>"
 
diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile
index a8e395b5ad2..8f515eca4af 100644
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.13
 
 USER root
 
diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh
index f6ac93bc83c..8b2dfddb983 100755
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh
@@ -18,16 +18,16 @@ apk add --no-cache curl 'nodejs-current=14.5.0-r0' npm yarn build-base openssh g
 # apk add --no-cache xvfb glib nss nspr gdk-pixbuf "gtk+3.0" pango atk cairo dbus-libs libxcomposite libxrender libxi libxtst libxrandr libxscrnsaver alsa-lib at-spi2-atk at-spi2-core cups-libs gcompat libc6-compat
 
 # Install Go
-filename="go1.15.7.linux-amd64.tar.gz"
-get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "0d142143794721bb63ce6c8a6180c4062bcf8ef4715e7d6d6609f3a8282629b3"
+filename="go1.16.linux-amd64.tar.gz"
+get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2"
 untar_file "/tmp/$filename"
 
 # Install golangci-lint
-GOLANGCILINT_VERSION=1.37.0
+GOLANGCILINT_VERSION=1.37.1
 filename="golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64"
 get_file "https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCILINT_VERSION}/$filename.tar.gz" \
     "/tmp/$filename.tar.gz" \
-    "5fe9852e754b621c5264fb8ac810a75033e7f18e972315a60c5c3f8a37b3cb88"
+    "1929425d7733d136b342395c77f171d459aa89b198933465ec4c854aa34c41a2"
 untar_file "/tmp/$filename.tar.gz"
 ln -s /usr/local/${filename}/golangci-lint /usr/local/bin/golangci-lint
 ln -s /usr/local/go/bin/go /usr/local/bin/go
diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh
index 86416681463..4c760830d36 100755
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh
@@ -22,16 +22,16 @@ source "/etc/profile"
 npm i -g yarn
 
 # Install Go
-filename="go1.15.7.linux-amd64.tar.gz"
-get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "0d142143794721bb63ce6c8a6180c4062bcf8ef4715e7d6d6609f3a8282629b3"
+filename="go1.16.linux-amd64.tar.gz"
+get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2"
 untar_file "/tmp/$filename"
 
 # Install golangci-lint
-GOLANGCILINT_VERSION=1.37.0
+GOLANGCILINT_VERSION=1.37.1
 filename="golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64"
 get_file "https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCILINT_VERSION}/$filename.tar.gz" \
     "/tmp/$filename.tar.gz" \
-    "5fe9852e754b621c5264fb8ac810a75033e7f18e972315a60c5c3f8a37b3cb88"
+    "1929425d7733d136b342395c77f171d459aa89b198933465ec4c854aa34c41a2"
 untar_file "/tmp/$filename.tar.gz"
 ln -s /usr/local/${filename}/golangci-lint /usr/local/bin/golangci-lint
 ln -s /usr/local/go/bin/go /usr/local/bin/go
diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh
index 3644bce14b9..bb85093b5be 100755
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh
@@ -2,8 +2,8 @@
 source "./deploy-common.sh"
 
 # Install Go
-filename="go1.15.7.linux-amd64.tar.gz"
-get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "0d142143794721bb63ce6c8a6180c4062bcf8ef4715e7d6d6609f3a8282629b3"
+filename="go1.16.linux-amd64.tar.gz"
+get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2"
 untar_file "/tmp/$filename"
 
 # Install golangci-lint
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index 757901a1761..506a027d0c3 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=alpine:3.12
+ARG BASE_IMAGE=alpine:3.13
 FROM ${BASE_IMAGE}
 
 ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz"
diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh
index dcad1fa2c69..4226e1a5256 100755
--- a/packaging/docker/build.sh
+++ b/packaging/docker/build.sh
@@ -60,7 +60,7 @@ docker_build () {
   if [ $UBUNTU_BASE = "0" ]; then
     libc="-musl"
     dockerfile="Dockerfile"
-    base_image="${base_arch}alpine:3.12"
+    base_image="${base_arch}alpine:3.13"
   else
     libc=""
     dockerfile="ubuntu.Dockerfile"
diff --git a/scripts/build/ci-build-windows/Dockerfile b/scripts/build/ci-build-windows/Dockerfile
index 05d820eaa6f..e60fc0062f7 100644
--- a/scripts/build/ci-build-windows/Dockerfile
+++ b/scripts/build/ci-build-windows/Dockerfile
@@ -8,7 +8,7 @@ RUN powershell Invoke-Expression (New-Object System.Net.WebClient).DownloadStrin
 # Scoop first of all needs git to update itself
 # Run Scoop under PowerShell since it can otherwise fail
 RUN powershell -Command scoop install git@2.29.1.windows.1
-RUN powershell -Command scoop install go@1.15.5 unzip@6.00 gcc@9.3.0-2
+RUN powershell -Command scoop install go@1.16 unzip@6.00 gcc@9.3.0-2
 
 # Install diffutils, in case we need them
 RUN powershell (New-Object Net.WebClient).DownloadFile(\
@@ -21,10 +21,10 @@ RUN mkdir -p "C:\Program Files (x86)\GnuWin32"
 RUN cd "C:\Program Files (x86)\GnuWin32" && unzip C:\App\diffutils-dep.zip && unzip C:\App\diffutils-bin.zip
 
 RUN powershell (New-Object Net.WebClient).DownloadFile(\
-  \"https://github.com/golangci/golangci-lint/releases/download/v1.37.0/golangci-lint-1.37.0-windows-amd64.zip\", \
+  \"https://github.com/golangci/golangci-lint/releases/download/v1.37.1/golangci-lint-1.37.1-windows-amd64.zip\", \
   \"golangci-lint.zip\")
 RUN powershell (Get-FileHash golangci-lint.zip -Algorithm SHA256).Hash -eq \
-  \"4b72c442d78a80bdfb7a775a55a9296beecc80afff6ef6ce9c727a573031278d"
+  \"a11b73bebd0ab6f2161d3677a5c63883001bf489aeebc494a6aaaead6addd161"
 RUN unzip golangci-lint.zip
 RUN powershell -Command mv golangci-lint-1.32.0-windows-amd64\golangci-lint.exe .
 
diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile
index d2d995fc616..ee986b003f2 100644
--- a/scripts/build/ci-build/Dockerfile
+++ b/scripts/build/ci-build/Dockerfile
@@ -1,5 +1,5 @@
 # Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's.
-FROM debian:stretch-20201209 AS toolchain
+FROM debian:stretch-20210208 AS toolchain
 
 ENV OSX_MIN=10.10 \
     CTNG=1.24.0 \
@@ -76,8 +76,8 @@ RUN cd /tmp && \
     rm -rf /tmp/x86_64-centos6-linux-gnu/ && \
     rm -rf /tmp/crosstool-ng-${CTNG}
 
-ARG GOLANGCILINT_VERSION=1.37.0
-ARG GOLANGCILINT_CHKSUM=5fe9852e754b621c5264fb8ac810a75033e7f18e972315a60c5c3f8a37b3cb88
+ARG GOLANGCILINT_VERSION=1.37.1
+ARG GOLANGCILINT_CHKSUM=1929425d7733d136b342395c77f171d459aa89b198933465ec4c854aa34c41a2
 
 RUN curl -fLO https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCILINT_VERSION}/golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64.tar.gz
 RUN echo ${GOLANGCILINT_CHKSUM} golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64.tar.gz | sha256sum --check --strict --status
@@ -98,14 +98,13 @@ RUN tar xf cue_${CUE_VERSION}_Linux_x86_64.tar.gz -C /tmp cue
 
 # Base image to crossbuild grafana.
 # Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's.
-FROM debian:stretch-20201209
+FROM debian:stretch-20210208
 
-ENV GOVERSION=1.15.6 \
+ENV GOVERSION=1.16 \
     PATH=/usr/local/go/bin:$PATH \
     GOPATH=/go \
-    NODEVERSION=14.15.4-1nodesource1 \
-    YARNVERSION=1.22.5-1 \
-    GO111MODULE=on
+    NODEVERSION=14.15.5-1nodesource1 \
+    YARNVERSION=1.22.5-1
 
 # Use ARG so as not to persist environment variable in image
 ARG DEBIAN_FRONTEND=noninteractive
diff --git a/scripts/build/ci-deploy/Dockerfile b/scripts/build/ci-deploy/Dockerfile
index 49a7fe09ef4..a59a0f5931e 100644
--- a/scripts/build/ci-deploy/Dockerfile
+++ b/scripts/build/ci-deploy/Dockerfile
@@ -1,8 +1,8 @@
 FROM debian:testing-20210111-slim
 
 # Use ARG so as not to persist environment variable in image
-ARG GOVERSION=1.15.8 \
-  GO_CHECKSUM=d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b \
+ARG GOVERSION=1.16 \
+  GO_CHECKSUM=013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2 \
   DEBIAN_FRONTEND=noninteractive
 
 ENV PATH=/usr/local/go/bin:$PATH \
diff --git a/scripts/go/go.mod b/scripts/go/go.mod
index 79eb1b7c2ac..688f70b96eb 100644
--- a/scripts/go/go.mod
+++ b/scripts/go/go.mod
@@ -3,7 +3,7 @@ module github.com/grafana/grafana/scripts/go
 go 1.14
 
 require (
-	github.com/golangci/golangci-lint v1.37.0
+	github.com/golangci/golangci-lint v1.37.1
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/mgechev/revive v1.0.3
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
diff --git a/scripts/go/go.sum b/scripts/go/go.sum
index ee3f09fa555..19cb02c7b32 100644
--- a/scripts/go/go.sum
+++ b/scripts/go/go.sum
@@ -47,6 +47,8 @@ github.com/bombsimon/wsl/v3 v3.1.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/charithe/durationcheck v0.0.3 h1:W+9cu38epH7otBF96pdhbFw5vLilsl1oseMOiOgex5E=
 github.com/charithe/durationcheck v0.0.3/go.mod h1:0oCYOIgY8Om3hZxPedxKn0mzy0rneKTWJhRm+r6Gl20=
+github.com/charithe/durationcheck v0.0.4 h1:lD3ud3KJ2DaoL80EZ768cSBv3DS8Xr7nNgN+kgW1tts=
+github.com/charithe/durationcheck v0.0.4/go.mod h1:0oCYOIgY8Om3hZxPedxKn0mzy0rneKTWJhRm+r6Gl20=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -150,6 +152,8 @@ github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a h1:iR3fYXUjHCR97qWS
 github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU=
 github.com/golangci/golangci-lint v1.37.0 h1:jhxIiiPucX/mOiRP8PbfKg7IHjaBUmInx2kxRBZD3Us=
 github.com/golangci/golangci-lint v1.37.0/go.mod h1:BlaDtSbtsbLI3bY3yX1rz6PaLWZG0PQDV/fqUEBrJZo=
+github.com/golangci/golangci-lint v1.37.1 h1:Unt38FmBltdoILo6oQUMp6PuxwWbJ1YyNSStCrvA7+8=
+github.com/golangci/golangci-lint v1.37.1/go.mod h1:zOcxSdfQDe6AE9andI1mH5mBmOQwmRg0U2kW2a6WhpA=
 github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc h1:gLLhTLMk2/SutryVJ6D4VZCU3CUqr8YloG7FPIBWFpI=
 github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU=
 github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA=
diff --git a/scripts/lib.star b/scripts/lib.star
index 5dc88260e5a..f366f6b88dc 100644
--- a/scripts/lib.star
+++ b/scripts/lib.star
@@ -1,8 +1,8 @@
 grabpl_version = '0.5.43'
-build_image = 'grafana/build-container:1.3.2'
+build_image = 'grafana/build-container:1.4.0'
 publish_image = 'grafana/grafana-ci-deploy:1.3.1'
 grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
-alpine_image = 'alpine:3.12'
+alpine_image = 'alpine:3.13'
 windows_image = 'mcr.microsoft.com/windows:1809'
 dockerize_version = '0.6.1'
 wix_image = 'grafana/ci-wix:0.1.1'