diff --git a/.github/workflows/.e2e-run.yml b/.github/workflows/.e2e-run.yml
index ba81b1a..c775250 100644
--- a/.github/workflows/.e2e-run.yml
+++ b/.github/workflows/.e2e-run.yml
@@ -38,6 +38,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          -
+            buildx_version: edge
+            buildkit_image: moby/buildkit:latest
           -
             buildx_version: latest
             buildkit_image: moby/buildkit:buildx-stable-1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 387dff8..e9d7706 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,8 +24,8 @@ on:
   pull_request:
 
 env:
-  BUILDX_VERSION: latest
-  BUILDKIT_IMAGE: moby/buildkit:buildx-stable-1
+  BUILDX_VERSION: edge
+  BUILDKIT_IMAGE: moby/buildkit:latest
 
 jobs:
   minimal:
@@ -565,6 +565,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - buildx: edge
+            buildkit: moby/buildkit:latest
           - buildx: latest
             buildkit: moby/buildkit:buildx-stable-1
           - buildx: latest
@@ -1468,6 +1470,7 @@ jobs:
       fail-fast: false
       matrix:
         buildx-version:
+          - edge
           - latest
           - v0.14.1
     steps: