diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7155797ba7..676db617a1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ defaults:
 
 jobs:
   cargo-deny:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     strategy:
       matrix:
         checks:
@@ -31,7 +31,7 @@ jobs:
 
   clippy:
     name: Clippy
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@v6
       - uses: taiki-e/install-action@v2
@@ -74,7 +74,7 @@ jobs:
 
   format:
     name: Format
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@v6
       - uses: mkroening/rust-toolchain-toml@main
@@ -85,7 +85,7 @@ jobs:
 
   lock-file:
     name: Lock file
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@v6
       - uses: mkroening/rust-toolchain-toml@main
@@ -94,7 +94,7 @@ jobs:
 
   machete:
     name: Machete
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@v6
       - uses: mkroening/rust-toolchain-toml@main
@@ -105,14 +105,14 @@ jobs:
 
   typos:
     name: Typos
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@v6
       - uses: crate-ci/typos@master
 
   doc:
     name: Doc
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@v6
       - uses: mkroening/rust-toolchain-toml@main
@@ -120,7 +120,7 @@ jobs:
 
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@v6
       - uses: mkroening/rust-toolchain-toml@main
@@ -132,7 +132,7 @@ jobs:
 
   test:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     steps:
       - uses: actions/checkout@v6
       - name: Install QEMU
@@ -156,7 +156,7 @@ jobs:
 
   run-hermit:
     name: Run
-    runs-on: ${{ (matrix.arch == 'aarch64' || matrix.arch == 'aarch64_be') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
+    runs-on: ${{ (matrix.arch == 'aarch64' || matrix.arch == 'aarch64_be') && 'ubuntu-26.04-arm' || 'ubuntu-26.04' }}
     env:
       HERMIT_CAREFUL: ${{ matrix.hermit-careful }}
     defaults:
@@ -180,7 +180,7 @@ jobs:
           - arch: aarch64_be
             packages: qemu-system-arm ipxe-qemu
           - arch: riscv64
-            packages: qemu-system-misc
+            packages: qemu-system-riscv
             rs_flags: --features hermit/semihosting
 
     steps:
@@ -292,13 +292,11 @@ jobs:
         if: matrix.arch != 'x86_64'
       - run: cargo xtask ci rs --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} ${{ matrix.rs_flags }} --package httpd --features ci,hermit/dhcpv4,hermit/virtio-net qemu ${{ matrix.qemu_flags }} --devices virtio-net-pci
         if: matrix.arch != 'riscv64'
-      # FIXME: this is broken on QEMU 8.2.2
-      # Enable this once CI reaches QEMU 8.2.3 or QEMU 9.0.0
-      # - run: cargo xtask ci rs --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} ${{ matrix.rs_flags }} --package httpd --features ci,hermit/dhcpv4,hermit/virtio-net qemu ${{ matrix.qemu_flags }} --devices virtio-net-pci
-      #   if: matrix.arch != 'riscv64'
-      #   env:
-      #     # The buffer is sized to be smaller than the packets received during DHCPv4 address acquisition and thus exercise the buffer merging code path.
-      #     HERMIT_MRG_RXBUF_SIZE: 200
+      - run: cargo xtask ci rs --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} ${{ matrix.rs_flags }} --package httpd --features ci,hermit/dhcpv4,hermit/virtio-net qemu ${{ matrix.qemu_flags }} --devices virtio-net-pci
+        if: matrix.arch != 'riscv64'
+        env:
+          # The buffer is sized to be smaller than the packets received during DHCPv4 address acquisition and thus exercise the buffer merging code path.
+          HERMIT_MRG_RXBUF_SIZE: 200
       - run: cargo xtask ci rs --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} ${{ matrix.rs_flags }} --package httpd --features ci,hermit/virtio-net qemu ${{ matrix.qemu_flags }} --sudo --devices virtio-net-pci --tap
         if: matrix.arch != 'riscv64'
       - run: cargo xtask ci rs --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} ${{ matrix.rs_flags }} --package httpd --features ci,hermit/dhcpv4,hermit/virtio-net qemu ${{ matrix.qemu_flags }} --devices virtio-net-pci --no-default-virtio-features
diff --git a/xtask/src/ci/rftrace.snap b/xtask/src/ci/rftrace.snap
index fec57ad805..dd71849f58 100644
--- a/xtask/src/ci/rftrace.snap
+++ b/xtask/src/ci/rftrace.snap
@@ -1,4 +1,4 @@
-#   TID     FUNCTION
- [     1] | rftrace_example::f1() {
- [     1] |   rftrace_example::f2() {
- [     1] |     rftrace_example::f3()
\ No newline at end of file
+#   TID      FUNCTION
+ [      1] | rftrace_example::f1() {
+ [      1] |   rftrace_example::f2() {
+ [      1] |     rftrace_example::f3()
\ No newline at end of file