diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1caa9d75..a3503b91 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
   - test
   - deploy
 
-image: blockstream/verde@sha256:91d76305c62782bae08f8437d99a6a41d984c85afe3a76c9d2c50e0b8568e1df
+image: blockstream/verde@sha256:fa0abe7cef1f0a80c2b2ec0477cadc3e629eb74c8a79a0c555062da0275df035
 
 test_format:
   tags:
diff --git a/Dockerfile b/Dockerfile
index 3b597f97..44e603b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,8 +14,8 @@ RUN cd ~/esp/esp-idf && git checkout ${ESP_IDF_COMMIT} && ./install.sh esp32 esp
 FROM base AS esp-qemu
 
 # These ARGs are easily parseable (eg by HWI)
-ARG ESP_QEMU_BRANCH=esp-develop-8.2.0-20240122
-ARG ESP_QEMU_COMMIT=b3354073efe670e312707c899f9bb2ebbe482ba1
+ARG ESP_QEMU_BRANCH=esp-develop-9.0.0-20240606
+ARG ESP_QEMU_COMMIT=abb5ce24386972e048b401f9eca10e90b8427a20
 RUN git clone --quiet --depth 1 --branch ${ESP_QEMU_BRANCH} --single-branch --recursive --shallow-submodules https://github.com/espressif/qemu.git \
 && cd qemu && git checkout ${ESP_QEMU_COMMIT}
 
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 96d7f467..d898f97a 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM blockstream/verde@sha256:91d76305c62782bae08f8437d99a6a41d984c85afe3a76c9d2c50e0b8568e1df
+FROM blockstream/verde@sha256:fa0abe7cef1f0a80c2b2ec0477cadc3e629eb74c8a79a0c555062da0275df035
 
 RUN echo "source /root/esp/esp-idf/export.sh" >> /etc/bash.bashrc
 
diff --git a/Dockerfile.qemu b/Dockerfile.qemu
index 15f82f48..754fdaba 100644
--- a/Dockerfile.qemu
+++ b/Dockerfile.qemu
@@ -1,4 +1,4 @@
-FROM blockstream/verde@sha256:91d76305c62782bae08f8437d99a6a41d984c85afe3a76c9d2c50e0b8568e1df as builder
+FROM blockstream/verde@sha256:fa0abe7cef1f0a80c2b2ec0477cadc3e629eb74c8a79a0c555062da0275df035 as builder
 
 ARG SDK_CONFIG=configs/sdkconfig_qemu_psram.defaults