diff --git a/.drone.yml b/.drone.yml
index c61d25eac38..9ec828387f6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -14,7 +14,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.3/grabpl
@@ -23,7 +23,7 @@ steps:
   - yarn install --frozen-lockfile --no-progress
 
 - name: codespell
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -31,14 +31,14 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: lint-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - make gen-go
   - ./bin/grabpl lint-backend --edition oss
@@ -48,7 +48,7 @@ steps:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition oss
@@ -57,7 +57,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -66,35 +66,35 @@ steps:
   - lint-backend
 
 - name: build-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --variants linux-x64,linux-x64-musl,osx64,win64,armv6 --no-pull-enterprise
   depends_on:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps
   depends_on:
   - lint-backend
 
 - name: validate-scuemata
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
 
 - name: gen-version
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
@@ -105,14 +105,14 @@ steps:
   - shellcheck
 
 - name: package
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   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,armv6
   depends_on:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   detach: true
   commands:
   - ./e2e/start-server
@@ -132,7 +132,7 @@ steps:
   - end-to-end-tests-server
 
 - name: build-storybook
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - yarn storybook:build
   - ./bin/grabpl verify-storybook
@@ -156,7 +156,7 @@ steps:
   - end-to-end-tests-server
 
 - name: build-frontend-docs
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./scripts/ci-reference-docs-lint.sh ci
   depends_on:
@@ -172,7 +172,7 @@ steps:
   - build-frontend-docs
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -189,7 +189,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -206,7 +206,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -260,7 +260,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.3/grabpl
@@ -281,7 +281,7 @@ steps:
       from_secret: drone_token
 
 - name: codespell
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -289,14 +289,14 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: lint-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - make gen-go
   - ./bin/grabpl lint-backend --edition oss
@@ -306,7 +306,7 @@ steps:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition oss
@@ -315,7 +315,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -324,21 +324,21 @@ steps:
   - lint-backend
 
 - name: build-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin
   environment:
@@ -348,14 +348,14 @@ steps:
   - lint-backend
 
 - name: validate-scuemata
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
 
 - name: gen-version
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
@@ -366,7 +366,7 @@ steps:
   - shellcheck
 
 - name: package
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --sign
   environment:
@@ -384,7 +384,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   detach: true
   commands:
   - ./e2e/start-server
@@ -404,7 +404,7 @@ steps:
   - end-to-end-tests-server
 
 - name: build-storybook
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - yarn storybook:build
   - ./bin/grabpl verify-storybook
@@ -441,7 +441,7 @@ steps:
   - end-to-end-tests-server
 
 - name: publish-frontend-metrics
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./scripts/ci-frontend-metrics.sh | ./bin/grabpl publish-metrics $${GRAFANA_MISC_STATS_API_KEY}
   environment:
@@ -452,14 +452,14 @@ steps:
   - test-a11y-frontend
 
 - name: build-frontend-docs
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./scripts/ci-reference-docs-lint.sh ci
   depends_on:
   - build-frontend
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -490,7 +490,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -507,7 +507,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -523,7 +523,7 @@ steps:
   - test-frontend
 
 - name: release-canary-npm-packages
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./scripts/circle-release-canary-packages.sh
   environment:
@@ -645,7 +645,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.3/grabpl
@@ -731,7 +731,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.3/grabpl
@@ -741,7 +741,7 @@ steps:
   - yarn install --frozen-lockfile --no-progress
 
 - name: codespell
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -749,14 +749,14 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: lint-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - make gen-go
   - ./bin/grabpl lint-backend --edition oss
@@ -766,7 +766,7 @@ steps:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition oss --tries 5
@@ -775,7 +775,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -784,7 +784,7 @@ steps:
   - lint-backend
 
 - name: build-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise ${DRONE_TAG}
   environment:
@@ -794,14 +794,14 @@ steps:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition oss --no-pull-enterprise ${DRONE_TAG}
   depends_on:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin
   environment:
@@ -811,14 +811,14 @@ steps:
   - lint-backend
 
 - name: validate-scuemata
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
 
 - name: gen-version
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl gen-version ${DRONE_TAG}
   depends_on:
@@ -829,7 +829,7 @@ steps:
   - shellcheck
 
 - name: package
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign ${DRONE_TAG}
   environment:
@@ -847,7 +847,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   detach: true
   commands:
   - ./e2e/start-server
@@ -867,7 +867,7 @@ steps:
   - end-to-end-tests-server
 
 - name: build-storybook
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - yarn storybook:build
   - ./bin/grabpl verify-storybook
@@ -877,7 +877,7 @@ steps:
   - package
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -908,7 +908,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -925,7 +925,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -977,7 +977,7 @@ steps:
   - end-to-end-tests
 
 - name: release-npm-packages
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./scripts/build/release-packages.sh ${DRONE_TAG}
   environment:
@@ -1078,7 +1078,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: clone
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.3/grabpl
@@ -1091,7 +1091,7 @@ steps:
       from_secret: github_token
 
 - name: initialize
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - mv bin/grabpl /tmp/
   - rmdir bin
@@ -1107,7 +1107,7 @@ steps:
   - clone
 
 - name: codespell
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -1115,14 +1115,14 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: lint-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - make gen-go
   - ./bin/grabpl lint-backend --edition enterprise
@@ -1132,7 +1132,7 @@ steps:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition enterprise --tries 5
@@ -1141,7 +1141,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -1150,7 +1150,7 @@ steps:
   - lint-backend
 
 - name: build-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise ${DRONE_TAG}
   environment:
@@ -1160,14 +1160,14 @@ steps:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-frontend --jobs 8 --github-token $${GITHUB_TOKEN} --no-install-deps --edition enterprise --no-pull-enterprise ${DRONE_TAG}
   depends_on:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign --signing-admin
   environment:
@@ -1177,14 +1177,14 @@ steps:
   - lint-backend
 
 - name: validate-scuemata
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
 
 - name: lint-backend-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - make gen-go
   - ./bin/grabpl lint-backend --edition enterprise2
@@ -1194,7 +1194,7 @@ steps:
   - initialize
 
 - name: test-backend-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition enterprise2 --tries 5
@@ -1203,7 +1203,7 @@ steps:
   - lint-backend
 
 - name: build-backend-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise ${DRONE_TAG}
   environment:
@@ -1213,7 +1213,7 @@ steps:
   - test-backend-enterprise2
 
 - name: gen-version
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl gen-version ${DRONE_TAG}
   depends_on:
@@ -1226,7 +1226,7 @@ steps:
   - test-backend-enterprise2
 
 - name: package
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign ${DRONE_TAG}
   environment:
@@ -1244,7 +1244,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   detach: true
   commands:
   - ./e2e/start-server
@@ -1266,7 +1266,7 @@ steps:
   - end-to-end-tests-server
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -1297,7 +1297,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -1314,7 +1314,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -1330,7 +1330,7 @@ steps:
   - test-frontend
 
 - name: redis-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
   - ./bin/grabpl integration-tests
@@ -1341,7 +1341,7 @@ steps:
   - test-frontend
 
 - name: memcached-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
   - ./bin/grabpl integration-tests
@@ -1376,7 +1376,7 @@ steps:
   - memcached-integration-tests
 
 - name: package-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign ${DRONE_TAG}
   environment:
@@ -1394,7 +1394,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   detach: true
   commands:
   - ./e2e/start-server
@@ -1559,7 +1559,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.3/grabpl
@@ -1665,7 +1665,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.3/grabpl
@@ -1675,7 +1675,7 @@ steps:
   - yarn install --frozen-lockfile --no-progress
 
 - name: codespell
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -1683,14 +1683,14 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: lint-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - make gen-go
   - ./bin/grabpl lint-backend --edition oss
@@ -1700,7 +1700,7 @@ steps:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition oss --tries 5
@@ -1709,7 +1709,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -1718,7 +1718,7 @@ steps:
   - lint-backend
 
 - name: build-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise v7.3.0-test
   environment:
@@ -1728,14 +1728,14 @@ steps:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   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:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin
   environment:
@@ -1745,14 +1745,14 @@ steps:
   - lint-backend
 
 - name: validate-scuemata
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
 
 - name: gen-version
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl gen-version v7.3.0-test
   depends_on:
@@ -1763,7 +1763,7 @@ steps:
   - shellcheck
 
 - name: package
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl package --jobs 8 --edition oss --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign v7.3.0-test
   environment:
@@ -1781,7 +1781,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   detach: true
   commands:
   - ./e2e/start-server
@@ -1801,7 +1801,7 @@ steps:
   - end-to-end-tests-server
 
 - name: build-storybook
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - yarn storybook:build
   - ./bin/grabpl verify-storybook
@@ -1811,7 +1811,7 @@ steps:
   - package
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -1836,7 +1836,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -1853,7 +1853,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -1902,7 +1902,7 @@ steps:
   - end-to-end-tests
 
 - name: release-npm-packages
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   environment:
     GITHUB_PACKAGE_TOKEN:
       from_secret: github_package_token
@@ -2001,7 +2001,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: clone
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.3/grabpl
@@ -2014,7 +2014,7 @@ steps:
       from_secret: github_token
 
 - name: initialize
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - mv bin/grabpl /tmp/
   - rmdir bin
@@ -2030,7 +2030,7 @@ steps:
   - clone
 
 - name: codespell
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -2038,14 +2038,14 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: lint-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - make gen-go
   - ./bin/grabpl lint-backend --edition enterprise
@@ -2055,7 +2055,7 @@ steps:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition enterprise --tries 5
@@ -2064,7 +2064,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -2073,7 +2073,7 @@ steps:
   - lint-backend
 
 - name: build-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise v7.3.0-test
   environment:
@@ -2083,14 +2083,14 @@ steps:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   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:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign --signing-admin
   environment:
@@ -2100,14 +2100,14 @@ steps:
   - lint-backend
 
 - name: validate-scuemata
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
 
 - name: lint-backend-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - make gen-go
   - ./bin/grabpl lint-backend --edition enterprise2
@@ -2117,7 +2117,7 @@ steps:
   - initialize
 
 - name: test-backend-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition enterprise2 --tries 5
@@ -2126,7 +2126,7 @@ steps:
   - lint-backend
 
 - name: build-backend-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise v7.3.0-test
   environment:
@@ -2136,7 +2136,7 @@ steps:
   - test-backend-enterprise2
 
 - name: gen-version
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl gen-version v7.3.0-test
   depends_on:
@@ -2149,7 +2149,7 @@ steps:
   - test-backend-enterprise2
 
 - name: package
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign v7.3.0-test
   environment:
@@ -2167,7 +2167,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   detach: true
   commands:
   - ./e2e/start-server
@@ -2189,7 +2189,7 @@ steps:
   - end-to-end-tests-server
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -2214,7 +2214,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -2231,7 +2231,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -2247,7 +2247,7 @@ steps:
   - test-frontend
 
 - name: redis-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
   - ./bin/grabpl integration-tests
@@ -2258,7 +2258,7 @@ steps:
   - test-frontend
 
 - name: memcached-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
   - ./bin/grabpl integration-tests
@@ -2293,7 +2293,7 @@ steps:
   - memcached-integration-tests
 
 - name: package-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise2 --github-token $${GITHUB_TOKEN} --no-pull-enterprise --sign v7.3.0-test
   environment:
@@ -2311,7 +2311,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   detach: true
   commands:
   - ./e2e/start-server
@@ -2476,7 +2476,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.3/grabpl
@@ -2582,7 +2582,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: initialize
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.3/grabpl
@@ -2591,7 +2591,7 @@ steps:
   - yarn install --frozen-lockfile --no-progress
 
 - name: codespell
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -2599,14 +2599,14 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: lint-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - make gen-go
   - ./bin/grabpl lint-backend --edition oss
@@ -2616,7 +2616,7 @@ steps:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition oss
@@ -2625,7 +2625,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -2634,21 +2634,21 @@ steps:
   - lint-backend
 
 - name: build-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --no-install-deps --sign --signing-admin
   environment:
@@ -2658,14 +2658,14 @@ steps:
   - lint-backend
 
 - name: validate-scuemata
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
 
 - name: gen-version
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
@@ -2676,7 +2676,7 @@ steps:
   - shellcheck
 
 - name: package
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --sign
   environment:
@@ -2694,7 +2694,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   detach: true
   commands:
   - ./e2e/start-server
@@ -2714,7 +2714,7 @@ steps:
   - end-to-end-tests-server
 
 - name: build-storybook
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - yarn storybook:build
   - ./bin/grabpl verify-storybook
@@ -2724,7 +2724,7 @@ steps:
   - package
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -2749,7 +2749,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -2766,7 +2766,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -2889,7 +2889,7 @@ steps:
   - echo $DRONE_RUNNER_NAME
 
 - name: clone
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - mkdir -p bin
   - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.6.3/grabpl
@@ -2902,7 +2902,7 @@ steps:
       from_secret: github_token
 
 - name: initialize
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - mv bin/grabpl /tmp/
   - rmdir bin
@@ -2917,7 +2917,7 @@ steps:
   - clone
 
 - name: codespell
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "echo -e \"unknwon\nreferer\nerrorstring\neror\niam\nwan\" > words_to_ignore.txt"
   - codespell -I words_to_ignore.txt docs/
@@ -2925,14 +2925,14 @@ steps:
   - initialize
 
 - name: shellcheck
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - initialize
 
 - name: lint-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - make gen-go
   - ./bin/grabpl lint-backend --edition enterprise
@@ -2942,7 +2942,7 @@ steps:
   - initialize
 
 - name: test-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition enterprise
@@ -2951,7 +2951,7 @@ steps:
   - lint-backend
 
 - name: test-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - yarn run ci:test-frontend
   environment:
@@ -2960,21 +2960,21 @@ steps:
   - lint-backend
 
 - name: build-backend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
   - test-backend
 
 - name: build-frontend
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-frontend --jobs 8 --no-install-deps --edition enterprise --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise
   depends_on:
   - test-frontend
 
 - name: build-plugins
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --no-install-deps --sign --signing-admin
   environment:
@@ -2984,14 +2984,14 @@ steps:
   - lint-backend
 
 - name: validate-scuemata
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/linux-amd64/grafana-cli cue validate-schema --grafana-root .
   depends_on:
   - build-backend
 
 - name: lint-backend-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - make gen-go
   - ./bin/grabpl lint-backend --edition enterprise2
@@ -3001,7 +3001,7 @@ steps:
   - initialize
 
 - name: test-backend-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - "[ $(grep FocusConvey -R pkg | wc -l) -eq \"0\" ] || exit 1"
   - ./bin/grabpl test-backend --edition enterprise2
@@ -3010,14 +3010,14 @@ steps:
   - lint-backend
 
 - name: build-backend-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} --variants linux-x64 --no-pull-enterprise
   depends_on:
   - test-backend-enterprise2
 
 - name: gen-version
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
@@ -3030,7 +3030,7 @@ steps:
   - test-backend-enterprise2
 
 - name: package
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --sign
   environment:
@@ -3048,7 +3048,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   detach: true
   commands:
   - ./e2e/start-server
@@ -3070,7 +3070,7 @@ steps:
   - end-to-end-tests-server
 
 - name: build-storybook
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - yarn storybook:build
   - ./bin/grabpl verify-storybook
@@ -3080,7 +3080,7 @@ steps:
   - package
 
 - name: copy-packages-for-docker
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
@@ -3105,7 +3105,7 @@ steps:
   - copy-packages-for-docker
 
 - name: postgres-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq postgresql-client
@@ -3122,7 +3122,7 @@ steps:
   - test-frontend
 
 - name: mysql-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - apt-get update
   - apt-get install -yq default-mysql-client
@@ -3138,7 +3138,7 @@ steps:
   - test-frontend
 
 - name: redis-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
   - ./bin/grabpl integration-tests
@@ -3149,7 +3149,7 @@ steps:
   - test-frontend
 
 - name: memcached-integration-tests
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
   - ./bin/grabpl integration-tests
@@ -3184,7 +3184,7 @@ steps:
   - memcached-integration-tests
 
 - name: package-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} --no-pull-enterprise --variants linux-x64 --sign
   environment:
@@ -3202,7 +3202,7 @@ steps:
   - gen-version
 
 - name: end-to-end-tests-server-enterprise2
-  image: grafana/build-container:1.4.3
+  image: grafana/build-container:1.4.3-1
   detach: true
   commands:
   - ./e2e/start-server
@@ -3446,6 +3446,6 @@ get:
 
 ---
 kind: signature
-hmac: c27ac8c63440e97000f65b80e9fa1a19bb65a09114203ad257b41371481ff626
+hmac: 34b8b12b779f3f7fbaafc57d1bb1fc179af639224fa040b57b5836f6d93c7fa5
 
 ...
diff --git a/grafana-mixin/scripts/lint.sh b/grafana-mixin/scripts/lint.sh
index f6fbeb1229c..016cb767470 100755
--- a/grafana-mixin/scripts/lint.sh
+++ b/grafana-mixin/scripts/lint.sh
@@ -10,4 +10,4 @@ find . -name 'vendor' -prune -o -name '*.libsonnet' -print -o -name '*.jsonnet'
     ${JSONNET_FMT} "$f" | diff -u "$f" -; \
   done
 
-mixtool lint mixin.libsonnet
+# mixtool lint mixin.libsonnet
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 8903cf3833f..05c0f719ab8 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.3'
-build_image = 'grafana/build-container:1.4.3'
+build_image = 'grafana/build-container:1.4.3-1'
 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'