diff --git a/.semaphore/semaphore-scheduled-builds.yml b/.semaphore/semaphore-scheduled-builds.yml
index a6516d821e1..7b5c167fe51 100644
--- a/.semaphore/semaphore-scheduled-builds.yml
+++ b/.semaphore/semaphore-scheduled-builds.yml
@@ -629,6 +629,7 @@ blocks:
           - export IMAGE=ubuntu-2404-noble-amd64-v20250502a
           - export UBUNTU_VERSION=noble
           - export DOCKER_VERSION=5:27.5.1-1~ubuntu.24.04~noble
+          - export BUILDX_VERSION=0.31.1-1~ubuntu.24.04~noble
           - mkdir artifacts
           - ./.semaphore/create-test-vms ${VM_PREFIX}
       jobs:
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 1f41907c7d3..4af6be90fb6 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -629,6 +629,7 @@ blocks:
           - export IMAGE=ubuntu-2404-noble-amd64-v20250502a
           - export UBUNTU_VERSION=noble
           - export DOCKER_VERSION=5:27.5.1-1~ubuntu.24.04~noble
+          - export BUILDX_VERSION=0.31.1-1~ubuntu.24.04~noble
           - mkdir artifacts
           - ./.semaphore/create-test-vms ${VM_PREFIX}
       jobs:
diff --git a/.semaphore/semaphore.yml.d/blocks/20-felix.yml b/.semaphore/semaphore.yml.d/blocks/20-felix.yml
index ff994b34bc2..2369374e441 100644
--- a/.semaphore/semaphore.yml.d/blocks/20-felix.yml
+++ b/.semaphore/semaphore.yml.d/blocks/20-felix.yml
@@ -210,6 +210,7 @@
         - export IMAGE=ubuntu-2404-noble-amd64-v20250502a
         - export UBUNTU_VERSION=noble
         - export DOCKER_VERSION=5:27.5.1-1~ubuntu.24.04~noble
+        - export BUILDX_VERSION=0.31.1-1~ubuntu.24.04~noble
         - mkdir artifacts
         - ./.semaphore/create-test-vms ${VM_PREFIX}
     jobs:
diff --git a/felix/.semaphore/create-test-vm b/felix/.semaphore/create-test-vm
index 851349ca57f..7474b7fb55e 100755
--- a/felix/.semaphore/create-test-vm
+++ b/felix/.semaphore/create-test-vm
@@ -23,6 +23,7 @@ zone=europe-west3-c
 
 : ${IMAGE:=ubuntu-2204-jammy-v20250312}
 : ${DOCKER_VERSION=5:20.10.14~3-0~ubuntu-jammy}
+: ${BUILDX_VERSION=0.29.0-0~ubuntu.22.04~jammy}
 : ${UBUNTU_VERSION=jammy}
 
 gcloud config set project $project
@@ -45,7 +46,7 @@ function create-vm() {
   gcloud --quiet compute ssh --zone=${zone} "ubuntu@${vm_name}" -- "curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --yes --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg" && \
   gcloud --quiet compute ssh --zone=${zone} "ubuntu@${vm_name}" -- "echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu ${UBUNTU_VERSION} stable' | sudo tee /etc/apt/sources.list.d/docker.list" && \
   gcloud --quiet compute ssh --zone=${zone} "ubuntu@${vm_name}" -- sudo apt update -y && \
-  gcloud --quiet compute ssh --zone=${zone} "ubuntu@${vm_name}" -- sudo apt install -y --no-install-recommends git docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION} docker-buildx-plugin containerd.io make iproute2 wireguard && \
+  gcloud --quiet compute ssh --zone=${zone} "ubuntu@${vm_name}" -- sudo apt install -y --no-install-recommends git docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION} docker-buildx-plugin=${BUILDX_VERSION} containerd.io make iproute2 wireguard && \
   gcloud --quiet compute ssh --zone=${zone} "ubuntu@${vm_name}" -- sudo usermod -a -G docker ubuntu && \
   gcloud --quiet compute ssh --zone=${zone} "ubuntu@${vm_name}" -- sudo modprobe ipip && \
   gcloud --quiet compute ssh --zone=${zone} "ubuntu@${vm_name}" -- 'if [ -s /etc/docker/daemon.json ] ; then cat /etc/docker/daemon.json | sed "\$d" | sed "\$s/\$/,/" > /tmp/daemon.json ; else echo -en {\\n > /tmp/daemon.json ; fi' && \