diff --git a/.drone.yml b/.drone.yml
index 2d5593b9b9c..08df14dd6d5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,13 +23,13 @@ steps:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - yarn install --immutable
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - commands:
   - yarn run prettier:check
@@ -40,7 +40,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-frontend
 - commands:
   - yarn run ci:test-frontend
@@ -48,7 +48,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-frontend
 trigger:
   event:
@@ -92,7 +92,7 @@ steps:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -100,13 +100,13 @@ steps:
   - '# The following command will fail if running code generators produces any diff
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - ./bin/grabpl verify-drone
@@ -124,13 +124,13 @@ steps:
     wan" > words_to_ignore.txt
   - codespell -I words_to_ignore.txt docs/
   - rm words_to_ignore.txt
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: codespell
 - commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: shellcheck
 - commands:
   - make lint-go
@@ -138,19 +138,19 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-backend
 - commands:
   - go test -short -covermode=atomic -timeout=30m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend
 - commands:
   - go test -run Integration -covermode=atomic -timeout=30m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend-integration
 trigger:
   event:
@@ -197,7 +197,7 @@ steps:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -205,19 +205,19 @@ steps:
   - '# The following command will fail if running code generators produces any diff
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - failure: ignore
   image: grafana/drone-downstream
@@ -238,7 +238,7 @@ steps:
   depends_on:
   - gen-version
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-backend
 - commands:
   - ./bin/grabpl build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -247,7 +247,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend
 - commands:
   - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -256,7 +256,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend-packages
 - commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss
@@ -264,7 +264,7 @@ steps:
   - gen-version
   - yarn-install
   environment: null
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-plugins
 - commands:
   - . scripts/build/gpg-test-vars.sh && ./bin/grabpl package --jobs 8 --edition oss
@@ -275,7 +275,7 @@ steps:
   - build-frontend
   - build-frontend-packages
   environment: null
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: package
 - commands:
   - ./scripts/grafana-server/start-server
@@ -288,7 +288,7 @@ steps:
   environment:
     ARCH: linux-amd64
     PORT: 3001
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -366,7 +366,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-storybook
 - commands:
   - yarn wait-on http://$HOST:$PORT
@@ -386,7 +386,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: copy-packages-for-docker
 - commands:
   - ./bin/grabpl build-docker --edition oss -archs amd64
@@ -460,13 +460,13 @@ steps:
   - '# The following command will fail if running code generators produces any diff
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - apt-get update
@@ -482,7 +482,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -498,7 +498,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: mysql-integration-tests
 trigger:
   event:
@@ -544,13 +544,13 @@ steps:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - yarn install --immutable
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - commands:
   - |-
@@ -562,7 +562,7 @@ steps:
     wan" > words_to_ignore.txt
   - codespell -I words_to_ignore.txt docs/
   - rm words_to_ignore.txt
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: codespell
 - commands:
   - yarn run prettier:checkDocs
@@ -570,7 +570,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-docs
 - commands:
   - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -579,13 +579,13 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend-packages
 - commands:
   - ./scripts/ci-reference-docs-lint.sh ci
   depends_on:
   - build-frontend-packages
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend-docs
 - commands:
   - mkdir -p /hugo/content/docs/grafana
@@ -634,13 +634,13 @@ steps:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - yarn install --immutable
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - commands:
   - |-
@@ -652,7 +652,7 @@ steps:
     wan" > words_to_ignore.txt
   - codespell -I words_to_ignore.txt docs/
   - rm words_to_ignore.txt
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: codespell
 - commands:
   - yarn run prettier:checkDocs
@@ -660,7 +660,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-docs
 - commands:
   - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -669,13 +669,13 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend-packages
 - commands:
   - ./scripts/ci-reference-docs-lint.sh ci
   depends_on:
   - build-frontend-packages
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend-docs
 - commands:
   - mkdir -p /hugo/content/docs/grafana
@@ -719,13 +719,13 @@ steps:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - yarn install --immutable
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - commands:
   - yarn run prettier:check
@@ -736,7 +736,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-frontend
 - commands:
   - yarn run ci:test-frontend
@@ -744,7 +744,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-frontend
 trigger:
   branch: main
@@ -780,7 +780,7 @@ steps:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -788,13 +788,13 @@ steps:
   - '# The following command will fail if running code generators produces any diff
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - ./bin/grabpl verify-drone
@@ -812,13 +812,13 @@ steps:
     wan" > words_to_ignore.txt
   - codespell -I words_to_ignore.txt docs/
   - rm words_to_ignore.txt
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: codespell
 - commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: shellcheck
 - commands:
   - make lint-go
@@ -826,19 +826,19 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-backend
 - commands:
   - go test -short -covermode=atomic -timeout=30m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend
 - commands:
   - go test -run Integration -covermode=atomic -timeout=30m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend-integration
 trigger:
   branch: main
@@ -874,7 +874,7 @@ steps:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -882,19 +882,19 @@ steps:
   - '# The following command will fail if running code generators produces any diff
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - commands:
   - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
@@ -915,7 +915,7 @@ steps:
       from_secret: github_token
     TEST_TAG: v0.0.0-test
   failure: ignore
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: trigger-test-release
   when:
     paths:
@@ -939,7 +939,7 @@ steps:
   depends_on:
   - gen-version
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-backend
 - commands:
   - ./bin/grabpl build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -948,7 +948,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend
 - commands:
   - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -957,7 +957,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend-packages
 - commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --sign --signing-admin
@@ -967,7 +967,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-plugins
 - commands:
   - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign
@@ -985,7 +985,7 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: package
 - commands:
   - ./scripts/grafana-server/start-server
@@ -998,7 +998,7 @@ steps:
   environment:
     ARCH: linux-amd64
     PORT: 3001
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -1076,7 +1076,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-storybook
 - commands:
   - ./bin/grabpl store-storybook --deployment canary --src-bucket grafana-storybook
@@ -1117,7 +1117,7 @@ steps:
     GRAFANA_MISC_STATS_API_KEY:
       from_secret: grafana_misc_stats_api_key
   failure: ignore
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: publish-frontend-metrics
   when:
     repo:
@@ -1127,7 +1127,7 @@ steps:
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: copy-packages-for-docker
 - commands:
   - ./bin/grabpl build-docker --edition oss
@@ -1205,7 +1205,7 @@ steps:
   environment:
     NPM_TOKEN:
       from_secret: npm_token
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: release-canary-npm-packages
   when:
     repo:
@@ -1303,13 +1303,13 @@ steps:
   - '# The following command will fail if running code generators produces any diff
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - apt-get update
@@ -1325,7 +1325,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -1341,7 +1341,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: mysql-integration-tests
 trigger:
   branch: main
@@ -1559,7 +1559,7 @@ steps:
   - ./bin/grabpl gen-version ${DRONE_TAG}
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1567,26 +1567,26 @@ steps:
   - '# The following command will fail if running code generators produces any diff
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss ${DRONE_TAG}
   depends_on:
   - gen-version
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-backend
 - commands:
   - ./bin/grabpl build-frontend --jobs 8 --edition oss ${DRONE_TAG}
@@ -1595,7 +1595,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend
 - commands:
   - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG}
@@ -1604,7 +1604,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend-packages
 - commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --sign --signing-admin
@@ -1614,7 +1614,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-plugins
 - commands:
   - ./bin/grabpl package --jobs 8 --edition oss  --sign ${DRONE_TAG}
@@ -1632,14 +1632,14 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: package
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: copy-packages-for-docker
 - commands:
   - ./bin/grabpl build-docker --edition oss --shouldSave
@@ -1676,7 +1676,7 @@ steps:
   environment:
     ARCH: linux-amd64
     PORT: 3001
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -1754,7 +1754,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-storybook
 - commands:
   - ./bin/grabpl upload-cdn --edition oss --src-bucket "$${PRERELEASE_BUCKET}" --src-dir
@@ -1856,7 +1856,7 @@ steps:
   - ./bin/grabpl gen-version ${DRONE_TAG}
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1864,25 +1864,25 @@ steps:
   - '# The following command will fail if running code generators produces any diff
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: shellcheck
 - commands:
   - |-
@@ -1894,7 +1894,7 @@ steps:
     wan" > words_to_ignore.txt
   - codespell -I words_to_ignore.txt docs/
   - rm words_to_ignore.txt
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: codespell
 - commands:
   - make lint-go
@@ -1902,7 +1902,7 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-backend
 - commands:
   - yarn run prettier:check
@@ -1913,19 +1913,19 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-frontend
 - commands:
   - go test -short -covermode=atomic -timeout=30m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend
 - commands:
   - go test -run Integration -covermode=atomic -timeout=30m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend-integration
 - commands:
   - yarn run ci:test-frontend
@@ -1933,7 +1933,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-frontend
 trigger:
   event:
@@ -1996,13 +1996,13 @@ steps:
   - '# The following command will fail if running code generators produces any diff
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - apt-get update
@@ -2018,7 +2018,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -2034,7 +2034,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: mysql-integration-tests
 trigger:
   event:
@@ -2149,7 +2149,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -2165,25 +2165,25 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: init-enterprise
 - commands:
   - make gen-go
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - commands:
   - ./bin/grabpl gen-version ${DRONE_TAG}
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -2193,14 +2193,14 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise ${DRONE_TAG}
   depends_on:
   - gen-version
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-backend
 - commands:
   - ./bin/grabpl build-frontend --jobs 8 --edition enterprise ${DRONE_TAG}
@@ -2209,7 +2209,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend
 - commands:
   - ./bin/grabpl build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG}
@@ -2218,7 +2218,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend-packages
 - commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --sign --signing-admin
@@ -2228,14 +2228,14 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-plugins
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG}
   depends_on:
   - gen-version
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-backend-enterprise2
 - commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise  --sign ${DRONE_TAG}
@@ -2254,14 +2254,14 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: package
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: copy-packages-for-docker
 - commands:
   - ./bin/grabpl build-docker --edition enterprise --shouldSave
@@ -2299,7 +2299,7 @@ steps:
     ARCH: linux-amd64
     PORT: 3001
     RUNDIR: scripts/grafana-server/tmp-grafana-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -2420,7 +2420,7 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: package-enterprise2
 - commands:
   - ./bin/grabpl upload-cdn --edition enterprise2 --src-bucket "$${PRERELEASE_BUCKET}"
@@ -2497,7 +2497,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -2513,25 +2513,25 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: init-enterprise
 - commands:
   - make gen-go
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - commands:
   - ./bin/grabpl gen-version ${DRONE_TAG}
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -2541,7 +2541,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - |-
@@ -2553,7 +2553,7 @@ steps:
     wan" > words_to_ignore.txt
   - codespell -I words_to_ignore.txt docs/
   - rm words_to_ignore.txt
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: codespell
 - commands:
   - make lint-go
@@ -2561,7 +2561,7 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-backend
 - commands:
   - yarn run prettier:check
@@ -2572,19 +2572,19 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-frontend
 - commands:
   - ./bin/grabpl test-backend --edition enterprise
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend
 - commands:
   - ./bin/grabpl integration-tests --edition enterprise
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend-integration
 - commands:
   - yarn run ci:test-frontend
@@ -2592,7 +2592,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-frontend
 - commands:
   - make lint-go
@@ -2600,19 +2600,19 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-backend-enterprise2
 - commands:
   - ./bin/grabpl test-backend --edition enterprise2
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend-enterprise2
 - commands:
   - ./bin/grabpl integration-tests --edition enterprise2
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend-integration-enterprise2
 trigger:
   event:
@@ -2686,7 +2686,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -2702,7 +2702,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: init-enterprise
 - commands:
   - apt-get update
@@ -2717,7 +2717,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -2732,7 +2732,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -2741,7 +2741,7 @@ steps:
   - init-enterprise
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -2750,7 +2750,7 @@ steps:
   - init-enterprise
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: memcached-integration-tests
 trigger:
   event:
@@ -3234,7 +3234,7 @@ steps:
   - yarn install --immutable
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - commands:
   - ./bin/grabpl artifacts npm retrieve --tag v${TAG}
@@ -3254,7 +3254,7 @@ steps:
   environment:
     NPM_TOKEN:
       from_secret: npm_token
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: release-npm-packages
 trigger:
   event:
@@ -3387,7 +3387,7 @@ steps:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3395,26 +3395,26 @@ steps:
   - '# The following command will fail if running code generators produces any diff
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - gen-version
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-backend
 - commands:
   - ./bin/grabpl build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -3423,7 +3423,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend
 - commands:
   - ./bin/grabpl build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -3432,7 +3432,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend-packages
 - commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition oss --sign --signing-admin
@@ -3442,7 +3442,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-plugins
 - commands:
   - ./bin/grabpl package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign
@@ -3460,14 +3460,14 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: package
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: copy-packages-for-docker
 - commands:
   - ./bin/grabpl build-docker --edition oss --shouldSave
@@ -3504,7 +3504,7 @@ steps:
   environment:
     ARCH: linux-amd64
     PORT: 3001
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -3582,7 +3582,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-storybook
 - commands:
   - ./bin/grabpl upload-cdn --edition oss --src-bucket "grafana-static-assets"
@@ -3654,7 +3654,7 @@ steps:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3662,25 +3662,25 @@ steps:
   - '# The following command will fail if running code generators produces any diff
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - commands:
   - ./bin/grabpl shellcheck
   depends_on:
   - grabpl
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: shellcheck
 - commands:
   - |-
@@ -3692,7 +3692,7 @@ steps:
     wan" > words_to_ignore.txt
   - codespell -I words_to_ignore.txt docs/
   - rm words_to_ignore.txt
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: codespell
 - commands:
   - make lint-go
@@ -3700,7 +3700,7 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-backend
 - commands:
   - yarn run prettier:check
@@ -3711,19 +3711,19 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-frontend
 - commands:
   - go test -short -covermode=atomic -timeout=30m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend
 - commands:
   - go test -run Integration -covermode=atomic -timeout=30m ./pkg/...
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend-integration
 - commands:
   - yarn run ci:test-frontend
@@ -3731,7 +3731,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-frontend
 trigger:
   ref:
@@ -3788,13 +3788,13 @@ steps:
   - '# The following command will fail if running code generators produces any diff
     in output.'
   - CODEGEN_VERIFY=1 make gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - make gen-go
   depends_on:
   - verify-gen-cue
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - apt-get update
@@ -3810,7 +3810,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -3826,7 +3826,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: mysql-integration-tests
 trigger:
   ref:
@@ -3924,7 +3924,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -3937,25 +3937,25 @@ steps:
   depends_on:
   - clone-enterprise
   environment: {}
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: init-enterprise
 - commands:
   - make gen-go
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - commands:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3965,14 +3965,14 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - gen-version
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-backend
 - commands:
   - ./bin/grabpl build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
@@ -3981,7 +3981,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend
 - commands:
   - ./bin/grabpl build-frontend-packages --jobs 8 --edition enterprise --build-id
@@ -3991,7 +3991,7 @@ steps:
   - yarn-install
   environment:
     NODE_OPTIONS: --max_old_space_size=8192
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-frontend-packages
 - commands:
   - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --sign --signing-admin
@@ -4001,7 +4001,7 @@ steps:
   environment:
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-plugins
 - commands:
   - ./bin/grabpl build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER}
@@ -4009,7 +4009,7 @@ steps:
   depends_on:
   - gen-version
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-backend-enterprise2
 - commands:
   - ./bin/grabpl package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER}
@@ -4029,14 +4029,14 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: package
 - commands:
   - ls dist/*.tar.gz*
   - cp dist/*.tar.gz* packaging/docker/
   depends_on:
   - package
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: copy-packages-for-docker
 - commands:
   - ./bin/grabpl build-docker --edition enterprise --shouldSave
@@ -4074,7 +4074,7 @@ steps:
     ARCH: linux-amd64
     PORT: 3001
     RUNDIR: scripts/grafana-server/tmp-grafana-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: grafana-server
 - commands:
   - apt-get install -y netcat
@@ -4152,7 +4152,7 @@ steps:
   - build-frontend-packages
   environment:
     NODE_OPTIONS: --max_old_space_size=4096
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: build-storybook
 - commands:
   - ./bin/grabpl upload-cdn --edition enterprise --src-bucket "grafana-static-assets"
@@ -4200,7 +4200,7 @@ steps:
       from_secret: gpg_pub_key
     GRAFANA_API_KEY:
       from_secret: grafana_api_key
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: package-enterprise2
 - commands:
   - ./bin/grabpl upload-cdn --edition enterprise2 --src-bucket "grafana-static-assets"
@@ -4270,7 +4270,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -4283,25 +4283,25 @@ steps:
   depends_on:
   - clone-enterprise
   environment: {}
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: init-enterprise
 - commands:
   - make gen-go
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: wire-install
 - commands:
   - yarn install --immutable
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: yarn-install
 - commands:
   - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: gen-version
 - commands:
   - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -4311,7 +4311,7 @@ steps:
   - CODEGEN_VERIFY=1 make gen-cue
   depends_on:
   - init-enterprise
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: verify-gen-cue
 - commands:
   - |-
@@ -4323,7 +4323,7 @@ steps:
     wan" > words_to_ignore.txt
   - codespell -I words_to_ignore.txt docs/
   - rm words_to_ignore.txt
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: codespell
 - commands:
   - make lint-go
@@ -4331,7 +4331,7 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-backend
 - commands:
   - yarn run prettier:check
@@ -4342,19 +4342,19 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-frontend
 - commands:
   - ./bin/grabpl test-backend --edition enterprise
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend
 - commands:
   - ./bin/grabpl integration-tests --edition enterprise
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend-integration
 - commands:
   - yarn run ci:test-frontend
@@ -4362,7 +4362,7 @@ steps:
   - yarn-install
   environment:
     TEST_MAX_WORKERS: 50%
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-frontend
 - commands:
   - make lint-go
@@ -4370,19 +4370,19 @@ steps:
   - wire-install
   environment:
     CGO_ENABLED: "1"
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: lint-backend-enterprise2
 - commands:
   - ./bin/grabpl test-backend --edition enterprise2
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend-enterprise2
 - commands:
   - ./bin/grabpl integration-tests --edition enterprise2
   depends_on:
   - wire-install
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: test-backend-integration-enterprise2
 trigger:
   ref:
@@ -4450,7 +4450,7 @@ steps:
   environment:
     GITHUB_TOKEN:
       from_secret: github_token
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: clone-enterprise
 - commands:
   - mv bin/grabpl /tmp/
@@ -4463,7 +4463,7 @@ steps:
   depends_on:
   - clone-enterprise
   environment: {}
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: init-enterprise
 - commands:
   - apt-get update
@@ -4478,7 +4478,7 @@ steps:
     GRAFANA_TEST_DB: postgres
     PGPASSWORD: grafanatest
     POSTGRES_HOST: postgres
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: postgres-integration-tests
 - commands:
   - apt-get update
@@ -4493,7 +4493,7 @@ steps:
   environment:
     GRAFANA_TEST_DB: mysql
     MYSQL_HOST: mysql
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: mysql-integration-tests
 - commands:
   - dockerize -wait tcp://redis:6379/0 -timeout 120s
@@ -4502,7 +4502,7 @@ steps:
   - init-enterprise
   environment:
     REDIS_URL: redis://redis:6379/0
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: redis-integration-tests
 - commands:
   - dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -4511,7 +4511,7 @@ steps:
   - init-enterprise
   environment:
     MEMCACHED_HOSTS: memcached:11211
-  image: grafana/build-container:1.5.5
+  image: grafana/build-container:1.5.7
   name: memcached-integration-tests
 trigger:
   ref:
@@ -4747,6 +4747,6 @@ kind: secret
 name: gcp_upload_artifacts_key
 ---
 kind: signature
-hmac: 265ab48b1e75ec1bba68edbf65b12be69ee5b4de0b113c3df48c54bcc6872b3a
+hmac: 32e54be4bd96844f07ea81b7ac46b37aa10f755074526353afb3420323e0f2f4
 
 ...
diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile
index 795e57e62a9..c34978124ea 100644
--- a/scripts/build/ci-build/Dockerfile
+++ b/scripts/build/ci-build/Dockerfile
@@ -81,14 +81,6 @@ RUN cd /tmp && \
     rm -rf /tmp/x86_64-centos6-linux-gnu/ && \
     rm -rf /tmp/crosstool-ng-${CTNG}
 
-ARG GOLANGCILINT_VERSION=1.37.1
-ARG GOLANGCILINT_CHKSUM=1929425d7733d136b342395c77f171d459aa89b198933465ec4c854aa34c41a2
-
-RUN curl -fLO https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCILINT_VERSION}/golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64.tar.gz
-RUN echo ${GOLANGCILINT_CHKSUM} golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64.tar.gz | sha256sum --check --strict --status
-RUN tar xf golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64.tar.gz
-RUN mv golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64/golangci-lint /tmp/
-
 ARG SHELLCHECK_VERSION=0.7.1
 ARG SHELLCHECK_CHKSUM=beca3d7819a6bdcfbd044576df4fc284053b48f468b2f03428fe66f4ceb2c05d9b5411357fa15003cb0311406c255084cf7283a3b8fce644c340c2f6aa910b9f
 RUN curl -fLO http://storage.googleapis.com/grafana-downloads/ci-dependencies/shellcheck-v${SHELLCHECK_VERSION}.linux.x86_64.tar.xz
@@ -120,7 +112,6 @@ ENV GOVERSION=1.17.11 \
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY --from=toolchain /tmp/x86_64-centos6-linux-gnu.tar.xz /tmp/osxcross.tar.xz /tmp/
-COPY --from=toolchain /tmp/golangci-lint /usr/local/bin/
 COPY --from=toolchain /tmp/shellcheck /usr/local/bin/
 COPY --from=toolchain /tmp/cue /usr/local/bin/
 COPY --from=toolchain /tmp/dockerize /usr/local/bin/
@@ -183,11 +174,11 @@ RUN cd /tmp && \
     tar xf x86_64-linux-musl-cross.tgz && \
     rm x86_64-linux-musl-cross.tgz
 
-RUN go get -u github.com/mgechev/revive@v1.0.2 && \
+RUN go install github.com/mgechev/revive@v1.0.2 && \
   mv ${GOPATH}/bin/revive /usr/local/bin/ && \
-  go get github.com/google/go-jsonnet/cmd/jsonnetfmt && \
+  go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest && \
   mv ${GOPATH}/bin/jsonnetfmt /usr/local/bin/ && \
-  go get github.com/monitoring-mixins/mixtool/cmd/mixtool && \
+  go install github.com/monitoring-mixins/mixtool/cmd/mixtool@latest && \
   mv ${GOPATH}/bin/mixtool /usr/local/bin/
 
 COPY ./bootstrap.sh /tmp/bootstrap.sh
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 8cd1ee35226..b473b9a7103 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', 'prerelease_bucket')
 
 grabpl_version = 'v2.9.50'
-build_image = 'grafana/build-container:1.5.5'
+build_image = 'grafana/build-container:1.5.7'
 publish_image = 'grafana/grafana-ci-deploy:1.3.1'
 deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'
 alpine_image = 'alpine:3.15'