diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index 5e22a67413..33ffd4f6af 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -53,8 +53,6 @@ jobs:
       - 
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        with:
-          driver-opts: 'image=moby/buildkit:v0.11.6'
       -
         name: Login to Docker registry
         uses: docker/login-action@v3
@@ -75,7 +73,7 @@ jobs:
       - 
         name: Debug
         id: build-debug
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         timeout-minutes: 3
         with:
           context: .
@@ -90,7 +88,7 @@ jobs:
       - 
         name: Scratch
         id: build-scratch
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         timeout-minutes: 3
         with:
           context: .
@@ -147,8 +145,6 @@ jobs:
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        with:
-          driver-opts: 'image=moby/buildkit:v0.11.6'
       -
         name: Login to Docker registry
         uses: docker/login-action@v3
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 4100347d6d..4a3d7399f4 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -32,8 +32,6 @@ jobs:
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        with:
-          driver-opts: 'image=moby/buildkit:v0.11.6'
       -
         name: Start DB and ZITADEL
         run: |