diff --git a/.drone.yml b/.drone.yml
index 2b132324a..1b52483d2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -13,13 +13,13 @@ steps:
   - ./scripts/enforce-clean
   depends_on:
   - runner identification
-  image: ghcr.io/grafana/grafana-build-tools:v0.23.0
+  image: ghcr.io/grafana/grafana-build-tools:v0.22.0
   name: deps
 - commands:
   - make lint
   depends_on:
   - deps
-  image: ghcr.io/grafana/grafana-build-tools:v0.23.0
+  image: ghcr.io/grafana/grafana-build-tools:v0.22.0
   name: lint
 - commands:
   - git fetch origin --tags
@@ -30,14 +30,14 @@ steps:
   - make build
   depends_on:
   - deps
-  image: ghcr.io/grafana/grafana-build-tools:v0.23.0
+  image: ghcr.io/grafana/grafana-build-tools:v0.22.0
   name: build
 - commands:
   - make test
   depends_on:
   - lint
   - build
-  image: ghcr.io/grafana/grafana-build-tools:v0.23.0
+  image: ghcr.io/grafana/grafana-build-tools:v0.22.0
   name: test
 - commands: []
   depends_on:
@@ -152,7 +152,7 @@ steps:
   - '{ echo latest-browser,$(eval ./scripts/version)-browser ; } > .tags'
   depends_on:
   - docker publish (release)
-  image: ghcr.io/grafana/grafana-build-tools:v0.15.0
+  image: ghcr.io/grafana/grafana-build-tools:v0.22.0
   name: docker publish (with browser) tags
 - commands: []
   depends_on:
@@ -253,7 +253,7 @@ steps:
     NFPM_SIGNING_KEY:
       from_secret: gpg_private_key
     NFPM_SIGNING_KEY_FILE: /drone/src/release-private-key.key
-  image: ghcr.io/grafana/grafana-build-tools:v0.23.0
+  image: ghcr.io/grafana/grafana-build-tools:v0.22.0
   name: write-key
 - commands:
   - make release-snapshot
@@ -261,7 +261,7 @@ steps:
     NFPM_DEFAULT_PASSPHRASE:
       from_secret: gpg_passphrase
     NFPM_SIGNING_KEY_FILE: /drone/src/release-private-key.key
-  image: ghcr.io/grafana/grafana-build-tools:v0.23.0
+  image: ghcr.io/grafana/grafana-build-tools:v0.22.0
   name: test release
 - commands:
   - ./scripts/package/verify-deb-install.sh
@@ -287,7 +287,7 @@ steps:
     NFPM_DEFAULT_PASSPHRASE:
       from_secret: gpg_passphrase
     NFPM_SIGNING_KEY_FILE: /drone/src/release-private-key.key
-  image: ghcr.io/grafana/grafana-build-tools:v0.23.0
+  image: ghcr.io/grafana/grafana-build-tools:v0.22.0
   name: release
   when:
     ref:
@@ -350,6 +350,6 @@ kind: secret
 name: gpg_private_key
 ---
 kind: signature
-hmac: 698b37f156f33b7a50b91862c9fea26f77799ec55c1146bf8e4f16ac0c18e36d
+hmac: 55a0c26c9860a4ebe2f1164f10e1c5957f2b7a7d790b07c6f3d5cab063d7a770
 
 ...
diff --git a/.gbt.mk b/.gbt.mk
index 717273c5e..c6f7aba8f 100644
--- a/.gbt.mk
+++ b/.gbt.mk
@@ -4,4 +4,4 @@
 # and a shell script. This is achieved by using the `VAR=value` syntax, which
 # is valid in both Makefile and shell.
 
-GBT_IMAGE=ghcr.io/grafana/grafana-build-tools:v0.23.0
+GBT_IMAGE=ghcr.io/grafana/grafana-build-tools:v0.22.0
diff --git a/scripts/configs/drone/main.jsonnet b/scripts/configs/drone/main.jsonnet
index ab2d86744..18b3ff322 100644
--- a/scripts/configs/drone/main.jsonnet
+++ b/scripts/configs/drone/main.jsonnet
@@ -1,4 +1,4 @@
-local go_tools_image = 'ghcr.io/grafana/grafana-build-tools:v0.23.0';
+local go_tools_image = 'ghcr.io/grafana/grafana-build-tools:v0.22.0';
 
 local step(name, commands, image=go_tools_image) = {
   name: name,