diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5c6937e688..833c6e1f86 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,7 +41,7 @@ jobs:
       - run: make login-quality
         env:
           # latest if branch is main, otherwise image version which is the pull request number
-          BUILDX_CLI: depot bake --file docker-bake.hcl --file docker-bake-ci.hcl
+          BAKE_CLI: depot bake --file docker-bake.hcl --file docker-bake-ci.hcl
           DEPOT_PROJECT_ID: jp837jn3fm
           REF_TAG: ${{ github.ref == 'refs/heads/main' && 'latest' || fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
           CACHE_DIR: ${{ runner.temp }}/zitadel-make-cache
diff --git a/Makefile b/Makefile
index 98baf2a56b..dd918fd583 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 XDG_CACHE_HOME ?= $(HOME)/.cache
 export CACHE_DIR ?= $(XDG_CACHE_HOME)/zitadel-make
 
-export BAKE_CLI ?= docker buildx
+export BAKE_CLI ?= docker buildx bake
 export REF_TAG ?= local
 export LOGIN_TAG := login:${REF_TAG}
 export LOGIN_TEST_UNIT_TAG := login-test-unit:${REF_TAG}