diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 06dbd4c8fb..d73b13c7c1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -65,14 +65,14 @@ jobs:
           os: ubuntu-latest
         - tuple: x86_64-unknown-linux-gnu
           os: ubuntu-latest
-        - tuple: x86_64-unknown-linux-gnu-emulated
-          os: ubuntu-latest
+#        - tuple: x86_64-unknown-linux-gnu-emulated
+#          os: ubuntu-latest
         - tuple: arm-unknown-linux-gnueabihf
           os: ubuntu-latest
-        - tuple: armv7-unknown-linux-gnueabihf
-          os: ubuntu-latest
-        - tuple: aarch64-unknown-linux-gnu
-          os: ubuntu-latest
+#        - tuple: armv7-unknown-linux-gnueabihf
+#          os: ubuntu-latest
+#        - tuple: aarch64-unknown-linux-gnu
+#          os: ubuntu-latest
         - tuple: riscv64gc-unknown-linux-gnu
           os: ubuntu-latest
         - tuple: powerpc-unknown-linux-gnu
@@ -137,11 +137,11 @@ jobs:
 
         # Add additional variables to the matrix variations generated above using `include`:
         include:
-        - target:
-            tuple: x86_64-unknown-linux-gnu-emulated
-            os: ubuntu-latest
-          test_everything: true
-          rustflags: --cfg stdarch_intel_sde
+#        - target:
+#            tuple: x86_64-unknown-linux-gnu-emulated
+#            os: ubuntu-latest
+#          test_everything: true
+#          rustflags: --cfg stdarch_intel_sde
         # MIPS targets disabled since they are dropped to tier 3.
         # See https://github.com/rust-lang/compiler-team/issues/648
         #- target:
@@ -168,10 +168,10 @@ jobs:
             tuple: powerpc64-unknown-linux-gnu
             os: ubuntu-latest
           disable_assert_instr: true
-        - target:
-            tuple: powerpc64le-unknown-linux-gnu
-            os: ubuntu-latest
-          disable_assert_instr: true
+#        - target:
+#            tuple: powerpc64le-unknown-linux-gnu
+#            os: ubuntu-latest
+#          disable_assert_instr: true
         - target:
             tuple: aarch64-apple-darwin
             os: macos-latest
diff --git a/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile b/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile
index be9959240b..61d3a997cb 100644
--- a/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile
+++ b/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
   gcc \
   g++ \
@@ -10,8 +10,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   qemu-user \
   make \
   file \
-  clang-15 \
   lld
+
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
     CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -L /usr/arm-linux-gnueabihf" \
     OBJDUMP=arm-linux-gnueabihf-objdump