diff --git a/.drone.yml b/.drone.yml
index 07f7ed4d8ac..635e4ed43fe 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,7 +11,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -23,7 +23,7 @@ steps:
   - make gen-go
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   - yarn install --immutable
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: initialize
 - commands:
   - ./bin/grabpl verify-drone
@@ -43,13 +43,13 @@ steps:
   - rm words_to_ignore.txt
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: codespell
 - commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: shellcheck
 - commands:
   - ./bin/grabpl lint-backend --edition oss
@@ -57,7 +57,7 @@ steps:
   - initialize
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-backend
 - commands:
   - yarn run prettier:check
@@ -67,19 +67,19 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-frontend
 - commands:
   - ./bin/grabpl test-backend --edition oss
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend
 - commands:
   - ./bin/grabpl integration-tests --edition oss
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend-integration
 - commands:
   - yarn run ci:test-frontend
@@ -87,7 +87,7 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-frontend
 trigger:
   event:
@@ -106,7 +106,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -118,7 +118,7 @@ steps:
   - make gen-go
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   - yarn install --immutable
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: initialize
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -126,27 +126,27 @@ steps:
   depends_on:
   - initialize
   environment: {}
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-backend
 - commands:
   - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id
     ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-frontend
 - commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps
   depends_on:
   - initialize
   environment: null
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-plugins
 - commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: validate-scuemata
 - commands:
   - '# Make sure the git tree is clean.'
@@ -167,7 +167,7 @@ steps:
   - git stash pop
   depends_on:
   - validate-scuemata
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: ensure-cuetsified
 - commands:
   - . scripts/build/gpg-test-vars.sh && ./bin/grabpl package --jobs 8 --edition oss
@@ -177,7 +177,7 @@ steps:
   - build-backend
   - build-frontend
   environment: null
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: package
 - commands:
   - ./e2e/start-server
@@ -186,7 +186,7 @@ steps:
   detach: true
   environment:
     PORT: 3001
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
   - yarn run cypress install
@@ -204,7 +204,7 @@ steps:
   - build-frontend
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-storybook
 - commands:
   - yarn wait-on http://$HOST:$PORT
@@ -223,7 +223,7 @@ steps:
   - ./scripts/ci-reference-docs-lint.sh ci
   depends_on:
   - build-frontend
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-frontend-docs
 - commands:
   - mkdir -p /hugo/content/docs/grafana
@@ -238,7 +238,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: copy-packages-for-docker
 - depends_on:
   - copy-packages-for-docker
@@ -279,7 +279,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -291,7 +291,7 @@ steps:
   - make gen-go
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   - yarn install --immutable
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: initialize
 - commands:
   - apt-get update
@@ -306,7 +306,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -321,7 +321,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: mysql-integration-tests
 trigger:
   event:
@@ -353,7 +353,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -365,7 +365,7 @@ steps:
   - make gen-go
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   - yarn install --immutable
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: initialize
 - commands:
   - ./bin/grabpl verify-drone
@@ -396,13 +396,13 @@ steps:
   - rm words_to_ignore.txt
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: codespell
 - commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: shellcheck
 - commands:
   - ./bin/grabpl lint-backend --edition oss
@@ -410,7 +410,7 @@ steps:
   - initialize
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-backend
 - commands:
   - yarn run prettier:check
@@ -420,19 +420,19 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-frontend
 - commands:
   - ./bin/grabpl test-backend --edition oss
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend
 - commands:
   - ./bin/grabpl integration-tests --edition oss
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend-integration
 - commands:
   - yarn run ci:test-frontend
@@ -440,7 +440,7 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-frontend
 - commands:
   - apt-get update
@@ -455,7 +455,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -470,7 +470,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: mysql-integration-tests
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -478,14 +478,14 @@ steps:
   depends_on:
   - initialize
   environment: {}
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-backend
 - commands:
   - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id
     ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-frontend
 - commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin
@@ -494,13 +494,13 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-plugins
 - commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: validate-scuemata
 - commands:
   - '# Make sure the git tree is clean.'
@@ -521,7 +521,7 @@ steps:
   - git stash pop
   depends_on:
   - validate-scuemata
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: ensure-cuetsified
 - commands:
   - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
@@ -541,7 +541,7 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: package
 - commands:
   - ./e2e/start-server
@@ -550,7 +550,7 @@ steps:
   detach: true
   environment:
     PORT: 3001
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
   - yarn run cypress install
@@ -568,7 +568,7 @@ steps:
   - build-frontend
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-storybook
 - commands:
   - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json
@@ -603,20 +603,20 @@ steps:
     GRAFANA_MISC_STATS_API_KEY:
       from_secret: grafana_misc_stats_api_key
   failure: ignore
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: publish-frontend-metrics
 - commands:
   - ./scripts/ci-reference-docs-lint.sh ci
   depends_on:
   - build-frontend
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-frontend-docs
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: copy-packages-for-docker
 - depends_on:
   - copy-packages-for-docker
@@ -649,7 +649,7 @@ steps:
   environment:
     GITHUB_PACKAGE_TOKEN:
       from_secret: github_package_token
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: release-canary-npm-packages
 - commands:
   - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads
@@ -691,7 +691,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: initialize
@@ -734,7 +734,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -744,7 +744,7 @@ steps:
   name: identify-runner
 - commands:
   - make gen-go
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: initialize
 - commands:
   - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json
@@ -824,7 +824,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -837,7 +837,7 @@ steps:
   - ./bin/grabpl verify-version ${DRONE_TAG}
   - ./bin/grabpl gen-version ${DRONE_TAG}
   - yarn install --immutable
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: initialize
 - commands:
   - |-
@@ -851,13 +851,13 @@ steps:
   - rm words_to_ignore.txt
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: codespell
 - commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: shellcheck
 - commands:
   - ./bin/grabpl lint-backend --edition oss
@@ -865,7 +865,7 @@ steps:
   - initialize
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-backend
 - commands:
   - yarn run prettier:check
@@ -875,19 +875,19 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-frontend
 - commands:
   - ./bin/grabpl test-backend --edition oss
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend
 - commands:
   - ./bin/grabpl integration-tests --edition oss
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend-integration
 - commands:
   - yarn run ci:test-frontend
@@ -895,7 +895,7 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-frontend
 - commands:
   - apt-get update
@@ -910,7 +910,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -925,7 +925,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: mysql-integration-tests
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN}
@@ -935,14 +935,14 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-backend
 - commands:
   - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps
     --edition oss --no-pull-enterprise ${DRONE_TAG}
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-frontend
 - commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin
@@ -951,13 +951,13 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-plugins
 - commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: validate-scuemata
 - commands:
   - '# Make sure the git tree is clean.'
@@ -978,7 +978,7 @@ steps:
   - git stash pop
   depends_on:
   - validate-scuemata
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: ensure-cuetsified
 - commands:
   - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise
@@ -998,7 +998,7 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: package
 - commands:
   - ./e2e/start-server
@@ -1007,7 +1007,7 @@ steps:
   detach: true
   environment:
     PORT: 3001
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
   - yarn run cypress install
@@ -1023,7 +1023,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: copy-packages-for-docker
 - depends_on:
   - copy-packages-for-docker
@@ -1056,7 +1056,7 @@ steps:
   - build-frontend
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-storybook
 - commands:
   - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets"
@@ -1098,7 +1098,7 @@ steps:
       from_secret: github_package_token
     NPM_TOKEN:
       from_secret: npm_token
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: release-npm-packages
 trigger:
   ref:
@@ -1121,7 +1121,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: initialize
@@ -1184,7 +1184,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1199,7 +1199,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -1215,7 +1215,7 @@ steps:
   - yarn install --immutable
   depends_on:
   - clone-enterprise
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: initialize
 - commands:
   - |-
@@ -1229,13 +1229,13 @@ steps:
   - rm words_to_ignore.txt
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: codespell
 - commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: shellcheck
 - commands:
   - ./bin/grabpl lint-backend --edition enterprise
@@ -1243,7 +1243,7 @@ steps:
   - initialize
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-backend
 - commands:
   - yarn run prettier:check
@@ -1253,19 +1253,19 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-frontend
 - commands:
   - ./bin/grabpl test-backend --edition enterprise
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend
 - commands:
   - ./bin/grabpl integration-tests --edition enterprise
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend-integration
 - commands:
   - yarn run ci:test-frontend
@@ -1273,7 +1273,7 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-frontend
 - commands:
   - apt-get update
@@ -1288,7 +1288,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -1303,7 +1303,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: mysql-integration-tests
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN}
@@ -1313,14 +1313,14 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-backend
 - commands:
   - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps
     --edition enterprise --no-pull-enterprise ${DRONE_TAG}
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-frontend
 - commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign
@@ -1330,13 +1330,13 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-plugins
 - commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: validate-scuemata
 - commands:
   - '# Make sure the git tree is clean.'
@@ -1357,7 +1357,7 @@ steps:
   - git stash pop
   depends_on:
   - validate-scuemata
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: ensure-cuetsified
 - commands:
   - ./bin/grabpl lint-backend --edition enterprise2
@@ -1365,19 +1365,19 @@ steps:
   - initialize
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-backend-enterprise2
 - commands:
   - ./bin/grabpl test-backend --edition enterprise2
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend-enterprise2
 - commands:
   - ./bin/grabpl integration-tests --edition enterprise2
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend-integration-enterprise2
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN}
@@ -1387,7 +1387,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-backend-enterprise2
 - commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN}
@@ -1409,7 +1409,7 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: package
 - commands:
   - ./e2e/start-server
@@ -1420,7 +1420,7 @@ steps:
     PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz
     PORT: 3001
     RUNDIR: e2e/tmp-grafana-enterprise
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
   - yarn run cypress install
@@ -1436,7 +1436,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: copy-packages-for-docker
 - depends_on:
   - copy-packages-for-docker
@@ -1469,7 +1469,7 @@ steps:
   - initialize
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -1478,7 +1478,7 @@ steps:
   - initialize
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: memcached-integration-tests
 - commands:
   - ./bin/grabpl upload-cdn --edition enterprise --bucket "grafana-static-assets"
@@ -1520,7 +1520,7 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: package-enterprise2
 - commands:
   - ./e2e/start-server
@@ -1531,7 +1531,7 @@ steps:
     PACKAGE_FILE: dist/grafana-enterprise2-*linux-amd64.tar.gz
     PORT: 3002
     RUNDIR: e2e/tmp-grafana-enterprise2
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: end-to-end-tests-server-enterprise2
 - commands:
   - yarn run cypress install
@@ -1587,7 +1587,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/windows/grabpl.exe
     -OutFile grabpl.exe
   - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
   - cd grafana-enterprise
@@ -1648,7 +1648,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1659,7 +1659,7 @@ steps:
 - commands:
   - make gen-go
   - ./bin/grabpl verify-version ${DRONE_TAG}
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: initialize
 - commands:
   - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json
@@ -1757,7 +1757,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1770,7 +1770,7 @@ steps:
   - ./bin/grabpl verify-version v7.3.0-test
   - ./bin/grabpl gen-version v7.3.0-test
   - yarn install --immutable
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: initialize
 - commands:
   - |-
@@ -1784,13 +1784,13 @@ steps:
   - rm words_to_ignore.txt
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: codespell
 - commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: shellcheck
 - commands:
   - ./bin/grabpl lint-backend --edition oss
@@ -1798,7 +1798,7 @@ steps:
   - initialize
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-backend
 - commands:
   - yarn run prettier:check
@@ -1808,19 +1808,19 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-frontend
 - commands:
   - ./bin/grabpl test-backend --edition oss
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend
 - commands:
   - ./bin/grabpl integration-tests --edition oss
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend-integration
 - commands:
   - yarn run ci:test-frontend
@@ -1828,7 +1828,7 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-frontend
 - commands:
   - apt-get update
@@ -1843,7 +1843,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -1858,7 +1858,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: mysql-integration-tests
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN}
@@ -1868,14 +1868,14 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-backend
 - 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:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-frontend
 - commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin
@@ -1884,13 +1884,13 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-plugins
 - commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: validate-scuemata
 - commands:
   - '# Make sure the git tree is clean.'
@@ -1911,7 +1911,7 @@ steps:
   - git stash pop
   depends_on:
   - validate-scuemata
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: ensure-cuetsified
 - commands:
   - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise
@@ -1931,7 +1931,7 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: package
 - commands:
   - ./e2e/start-server
@@ -1940,7 +1940,7 @@ steps:
   detach: true
   environment:
     PORT: 3001
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
   - yarn run cypress install
@@ -1956,7 +1956,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: copy-packages-for-docker
 - depends_on:
   - copy-packages-for-docker
@@ -1981,7 +1981,7 @@ steps:
   - build-frontend
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-storybook
 - commands:
   - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets"
@@ -2019,7 +2019,7 @@ steps:
       from_secret: github_package_token
     NPM_TOKEN:
       from_secret: npm_token
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: release-npm-packages
 trigger:
   event:
@@ -2042,7 +2042,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: initialize
@@ -2106,7 +2106,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2121,7 +2121,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -2137,7 +2137,7 @@ steps:
   - yarn install --immutable
   depends_on:
   - clone-enterprise
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: initialize
 - commands:
   - |-
@@ -2151,13 +2151,13 @@ steps:
   - rm words_to_ignore.txt
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: codespell
 - commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: shellcheck
 - commands:
   - ./bin/grabpl lint-backend --edition enterprise
@@ -2165,7 +2165,7 @@ steps:
   - initialize
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-backend
 - commands:
   - yarn run prettier:check
@@ -2175,19 +2175,19 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-frontend
 - commands:
   - ./bin/grabpl test-backend --edition enterprise
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend
 - commands:
   - ./bin/grabpl integration-tests --edition enterprise
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend-integration
 - commands:
   - yarn run ci:test-frontend
@@ -2195,7 +2195,7 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-frontend
 - commands:
   - apt-get update
@@ -2210,7 +2210,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -2225,7 +2225,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: mysql-integration-tests
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN}
@@ -2235,14 +2235,14 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-backend
 - 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:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-frontend
 - commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign
@@ -2252,13 +2252,13 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-plugins
 - commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: validate-scuemata
 - commands:
   - '# Make sure the git tree is clean.'
@@ -2279,7 +2279,7 @@ steps:
   - git stash pop
   depends_on:
   - validate-scuemata
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: ensure-cuetsified
 - commands:
   - ./bin/grabpl lint-backend --edition enterprise2
@@ -2287,19 +2287,19 @@ steps:
   - initialize
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-backend-enterprise2
 - commands:
   - ./bin/grabpl test-backend --edition enterprise2
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend-enterprise2
 - commands:
   - ./bin/grabpl integration-tests --edition enterprise2
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend-integration-enterprise2
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN}
@@ -2309,7 +2309,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-backend-enterprise2
 - commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN}
@@ -2331,7 +2331,7 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: package
 - commands:
   - ./e2e/start-server
@@ -2342,7 +2342,7 @@ steps:
     PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz
     PORT: 3001
     RUNDIR: e2e/tmp-grafana-enterprise
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
   - yarn run cypress install
@@ -2358,7 +2358,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: copy-packages-for-docker
 - depends_on:
   - copy-packages-for-docker
@@ -2383,7 +2383,7 @@ steps:
   - grabpl
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -2392,7 +2392,7 @@ steps:
   - grabpl
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: memcached-integration-tests
 - commands:
   - ./bin/grabpl upload-cdn --edition enterprise --bucket "grafana-static-assets"
@@ -2434,7 +2434,7 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: package-enterprise2
 - commands:
   - ./e2e/start-server
@@ -2445,7 +2445,7 @@ steps:
     PACKAGE_FILE: dist/grafana-enterprise2-*linux-amd64.tar.gz
     PORT: 3002
     RUNDIR: e2e/tmp-grafana-enterprise2
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: end-to-end-tests-server-enterprise2
 - commands:
   - yarn run cypress install
@@ -2501,7 +2501,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/windows/grabpl.exe
     -OutFile grabpl.exe
   - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
   - cd grafana-enterprise
@@ -2563,7 +2563,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2574,7 +2574,7 @@ steps:
 - commands:
   - make gen-go
   - ./bin/grabpl verify-version v7.3.0-test
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: initialize
 - commands:
   - printenv GCP_KEY | base64 -d > /tmp/gcpkey.json
@@ -2677,7 +2677,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2689,7 +2689,7 @@ steps:
   - make gen-go
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   - yarn install --immutable
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: initialize
 - commands:
   - |-
@@ -2703,13 +2703,13 @@ steps:
   - rm words_to_ignore.txt
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: codespell
 - commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: shellcheck
 - commands:
   - ./bin/grabpl lint-backend --edition oss
@@ -2717,7 +2717,7 @@ steps:
   - initialize
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-backend
 - commands:
   - yarn run prettier:check
@@ -2727,19 +2727,19 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-frontend
 - commands:
   - ./bin/grabpl test-backend --edition oss
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend
 - commands:
   - ./bin/grabpl integration-tests --edition oss
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend-integration
 - commands:
   - yarn run ci:test-frontend
@@ -2747,7 +2747,7 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-frontend
 - commands:
   - apt-get update
@@ -2762,7 +2762,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -2777,7 +2777,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: mysql-integration-tests
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -2785,14 +2785,14 @@ steps:
   depends_on:
   - initialize
   environment: {}
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-backend
 - commands:
   - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id
     ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-frontend
 - commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin
@@ -2801,13 +2801,13 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-plugins
 - commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: validate-scuemata
 - commands:
   - '# Make sure the git tree is clean.'
@@ -2828,7 +2828,7 @@ steps:
   - git stash pop
   depends_on:
   - validate-scuemata
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: ensure-cuetsified
 - commands:
   - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
@@ -2848,7 +2848,7 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: package
 - commands:
   - ./e2e/start-server
@@ -2857,7 +2857,7 @@ steps:
   detach: true
   environment:
     PORT: 3001
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
   - yarn run cypress install
@@ -2873,7 +2873,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: copy-packages-for-docker
 - depends_on:
   - copy-packages-for-docker
@@ -2898,7 +2898,7 @@ steps:
   - build-frontend
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-storybook
 - commands:
   - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets"
@@ -2939,7 +2939,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: initialize
@@ -2998,7 +2998,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3013,7 +3013,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -3028,7 +3028,7 @@ steps:
   - yarn install --immutable
   depends_on:
   - clone-enterprise
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: initialize
 - commands:
   - |-
@@ -3042,13 +3042,13 @@ steps:
   - rm words_to_ignore.txt
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: codespell
 - commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: shellcheck
 - commands:
   - ./bin/grabpl lint-backend --edition enterprise
@@ -3056,7 +3056,7 @@ steps:
   - initialize
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-backend
 - commands:
   - yarn run prettier:check
@@ -3066,19 +3066,19 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-frontend
 - commands:
   - ./bin/grabpl test-backend --edition enterprise
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend
 - commands:
   - ./bin/grabpl integration-tests --edition enterprise
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend-integration
 - commands:
   - yarn run ci:test-frontend
@@ -3086,7 +3086,7 @@ steps:
   - initialize
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-frontend
 - commands:
   - apt-get update
@@ -3101,7 +3101,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -3116,7 +3116,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: mysql-integration-tests
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
@@ -3124,14 +3124,14 @@ steps:
   depends_on:
   - initialize
   environment: {}
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-backend
 - commands:
   - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition enterprise --build-id
     ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-frontend
 - commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign
@@ -3141,13 +3141,13 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-plugins
 - commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: validate-scuemata
 - commands:
   - '# Make sure the git tree is clean.'
@@ -3168,7 +3168,7 @@ steps:
   - git stash pop
   depends_on:
   - validate-scuemata
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: ensure-cuetsified
 - commands:
   - ./bin/grabpl lint-backend --edition enterprise2
@@ -3176,19 +3176,19 @@ steps:
   - initialize
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: lint-backend-enterprise2
 - commands:
   - ./bin/grabpl test-backend --edition enterprise2
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend-enterprise2
 - commands:
   - ./bin/grabpl integration-tests --edition enterprise2
   depends_on:
   - initialize
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: test-backend-integration-enterprise2
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER}
@@ -3196,7 +3196,7 @@ steps:
   depends_on:
   - initialize
   environment: {}
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-backend-enterprise2
 - commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
@@ -3218,7 +3218,7 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: package
 - commands:
   - ./e2e/start-server
@@ -3229,7 +3229,7 @@ steps:
     PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz
     PORT: 3001
     RUNDIR: e2e/tmp-grafana-enterprise
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: end-to-end-tests-server
 - commands:
   - yarn run cypress install
@@ -3245,7 +3245,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: copy-packages-for-docker
 - depends_on:
   - copy-packages-for-docker
@@ -3270,7 +3270,7 @@ steps:
   - build-frontend
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: build-storybook
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -3279,7 +3279,7 @@ steps:
   - initialize
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -3288,7 +3288,7 @@ steps:
   - initialize
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: memcached-integration-tests
 - commands:
   - ./bin/grabpl upload-cdn --edition enterprise --bucket "grafana-static-assets"
@@ -3330,7 +3330,7 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: package-enterprise2
 - commands:
   - ./e2e/start-server
@@ -3341,7 +3341,7 @@ steps:
     PACKAGE_FILE: dist/grafana-enterprise2-*linux-amd64.tar.gz
     PORT: 3002
     RUNDIR: e2e/tmp-grafana-enterprise2
-  image: grafana/build-container:1.4.5
+  image: grafana/build-container:1.4.6
   name: end-to-end-tests-server-enterprise2
 - commands:
   - yarn run cypress install
@@ -3397,7 +3397,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.1/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.7.1/windows/grabpl.exe
     -OutFile grabpl.exe
   - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
   - cd grafana-enterprise
@@ -3520,6 +3520,6 @@ kind: secret
 name: drone_token
 ---
 kind: signature
-hmac: 937b1a90380e210f04594a27aeadc40110d953e2990c1c0ca65c43924c9f15e2
+hmac: 506f659ace94bf2db684864909ea29b8963f3655d4f02b5dbd0d3440271be38f
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index ad3727ad77f..cf94c66f175 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1,7 +1,7 @@
 load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token')
 
-grabpl_version = '2.6.1'
-build_image = 'grafana/build-container:1.4.5'
+grabpl_version = '2.7.1'
+build_image = 'grafana/build-container:1.4.6'
 publish_image = 'grafana/grafana-ci-deploy:1.3.1'
 grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
 deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'