diff --git a/Dockerfile b/Dockerfile
index ec0be01..c3f66ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,23 @@
 # hadolint ignore=DL3007
-ARG UBUNTU_VERSION=focal
+ARG UBUNTU_VERSION=noble
 FROM myoung34/github-runner:ubuntu-${UBUNTU_VERSION}
 # Redefining UBUNTU_VERSION without a value inherits the global default
 ARG UBUNTU_VERSION
 
 LABEL maintainer="sunyucong@gmail.com"
 
-RUN apt-get update \
-  && apt-get install -y cmake flex bison build-essential libssl-dev ncurses-dev xz-utils bc rsync libguestfs-tools qemu-kvm qemu-utils linux-image-generic zstd binutils-dev elfutils libcap-dev libelf-dev libdw-dev python3-docutils \
-  && apt-get install -y g++ libelf-dev \
-  && apt-get install -y iproute2 iputils-ping \
-  && apt-get install -y cpu-checker qemu-kvm qemu-utils qemu-system-x86 qemu-system-s390x qemu-system-arm qemu-guest-agent ethtool keyutils iptables gawk \
-  && echo "deb https://apt.llvm.org/${UBUNTU_VERSION}/ llvm-toolchain-${UBUNTU_VERSION} main" > /etc/apt/sources.list.d/llvm.list \
-  && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
-  && apt-get update \
-  && apt-get install -y clang lld llvm
+RUN apt-get update -y && apt-get install -y \
+    bc bison build-essential cmake cpu-checker curl dumb-init elfutils ethtool flex g++ gawk git \
+    iproute2 iptables iputils-ping jq keyutils libguestfs-tools python3-minimal python3-docutils \
+    rsync sudo tree wget xz-utils zstd
+
+RUN apt-get update -y && apt-get install -y \
+    binutils-dev libcap-dev libdw-dev libelf-dev libssl-dev ncurses-dev
+
+RUN apt-get update -y && apt-get install -y \
+    qemu-guest-agent qemu-kvm qemu-system-arm qemu-system-s390x qemu-system-x86 qemu-utils
+
+# Install LLVM with automatic script (https://apt.llvm.org)
+RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
+
+RUN apt-get clean
diff --git a/s390x-native.Dockerfile b/s390x-native.Dockerfile
index a6d5678..c40b934 100644
--- a/s390x-native.Dockerfile
+++ b/s390x-native.Dockerfile
@@ -3,15 +3,23 @@ ARG UBUNTU_VERSION=noble
 FROM --platform=linux/s390x ubuntu:${UBUNTU_VERSION}
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get -y install \
-    bc bison cmake cpu-checker curl dumb-init ethtool flex gawk git \
-    iproute2 iptables iputils-ping jq keyutils linux-image-generic \
-    python3 rsync software-properties-common sudo tree wget zstd
-RUN apt-get -y install \
-    qemu-guest-agent qemu-kvm qemu-utils \
-    qemu-system-arm qemu-system-s390x qemu-system-x86
-RUN apt-get install -y \
+RUN apt-get update -y && apt-get install -y \
+    bc bison build-essential cmake cpu-checker curl dumb-init elfutils ethtool flex g++ gawk git \
+    iproute2 iptables iputils-ping jq keyutils libguestfs-tools python3-minimal python3-docutils \
+    rsync sudo tree wget xz-utils zstd
+
+RUN apt-get update -y && apt-get install -y \
+    binutils-dev libcap-dev libdw-dev libelf-dev libssl-dev ncurses-dev
+
+RUN apt-get update -y && apt-get install -y \
+    qemu-guest-agent qemu-kvm qemu-system-arm qemu-system-s390x qemu-system-x86 qemu-utils
+
+# Install LLVM with automatic script (https://apt.llvm.org)
+RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
+
+RUN apt-get update -y && apt-get install -y \
     aspnetcore-runtime-8.0
+
 RUN apt-get clean
 
 ARG version=2.321.0