diff --git a/.gbt.mk b/.gbt.mk
index 4d61b260..5fa22313 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.34.0
+GBT_IMAGE=ghcr.io/grafana/grafana-build-tools:v0.36.0
diff --git a/.github/workflows/build_and_publish.yaml b/.github/workflows/build_and_publish.yaml
index cedc0da6..86d4b518 100644
--- a/.github/workflows/build_and_publish.yaml
+++ b/.github/workflows/build_and_publish.yaml
@@ -35,7 +35,7 @@ jobs:
     runs-on: github-hosted-ubuntu-${{ matrix.arch }}
 
     container:
-      image: ghcr.io/grafana/grafana-build-tools:v0.34.0@sha256:2d2b61738952e4934df01457638cf78da6178e763db152cfde0489e99bc14eeb
+      image: ghcr.io/grafana/grafana-build-tools:v0.36.0@sha256:deec32592848cde11ff64b4a5803b85546027dfb7b98921a0d0b89cd2226612f
     outputs:
       version: ${{ steps.version.outputs.value }}
 
diff --git a/.github/workflows/validate_pr.yaml b/.github/workflows/validate_pr.yaml
index 6f1f1f82..1af244af 100644
--- a/.github/workflows/validate_pr.yaml
+++ b/.github/workflows/validate_pr.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.runner }}
 
     container:
-      image: ghcr.io/grafana/grafana-build-tools:v0.34.0@sha256:2d2b61738952e4934df01457638cf78da6178e763db152cfde0489e99bc14eeb
+      image: ghcr.io/grafana/grafana-build-tools:v0.36.0@sha256:deec32592848cde11ff64b4a5803b85546027dfb7b98921a0d0b89cd2226612f
 
     steps:
       - name: checkout