diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f6d3b3b2..f737bb7b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ on:
 
 env:
   NODE_VERSION: "24"
-  BUILDX_VERSION: "v0.35.0"
+  BUILDX_VERSION: "v0.36.0-rc1"
   BUILDKIT_IMAGE: "moby/buildkit:v0.32.0-rc1"
 
 jobs:
diff --git a/dev.Dockerfile b/dev.Dockerfile
index 8a7eecad..a792f324 100644
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@@ -16,7 +16,7 @@
 
 ARG NODE_VERSION=24
 ARG DOCKER_VERSION=29.6
-ARG BUILDX_VERSION=0.35.0
+ARG BUILDX_VERSION=0.36.0-rc1
 ARG COMPOSE_VERSION=5.3.1
 ARG UNDOCK_VERSION=0.14.0
 ARG REGCTL_VERSION=v0.11.5