diff --git a/packages/clang/Containerfile b/packages/clang/Containerfile
index 9cd3476..d694d7b 100644
--- a/packages/clang/Containerfile
+++ b/packages/clang/Containerfile
@@ -37,7 +37,7 @@ RUN --network=none <<-EOF
 	-DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr/ \
         -DCLANG_BUILT_STANDALONE=ON \
-        -DCLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang16 \
+        -DCLANG_CONFIG_FILE_SYSTEM_DIR=/etc/clang18 \
         -DCLANG_ENABLE_ARCMT=ON \
         -DCMAKE_INSTALL_RPATH=/usr/ \
         -DCLANG_LINK_CLANG_DYLIB=ON \
diff --git a/packages/eif_build/Containerfile b/packages/eif_build/Containerfile
index 824abad..0fe9a20 100644
--- a/packages/eif_build/Containerfile
+++ b/packages/eif_build/Containerfile
@@ -13,7 +13,7 @@ COPY --from=stagex/zlib . /
 COPY --from=stagex/openssl . /
 COPY --from=stagex/ca-certificates . /
 COPY --from=stagex/gcc . /
-COPY --from=stagex/llvm16 . /
+COPY --from=stagex/llvm . /
 COPY --from=stagex/binutils . /
 COPY --from=stagex/pkgconf . /
 COPY --from=stagex/git . /
diff --git a/packages/keyfork/Containerfile b/packages/keyfork/Containerfile
index 06dc54a..f83a419 100644
--- a/packages/keyfork/Containerfile
+++ b/packages/keyfork/Containerfile
@@ -10,7 +10,7 @@ COPY --from=stagex/rust . /
 COPY --from=stagex/busybox . /
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
-COPY --from=stagex/llvm16 . /
+COPY --from=stagex/llvm . /
 COPY --from=stagex/libunwind . /
 COPY --from=stagex/openssl . /
 COPY --from=stagex/zlib . /
@@ -24,7 +24,7 @@ ADD <<-EOF /.cargo/config.toml
 RUN cargo fetch
 
 FROM fetch AS build
-COPY --from=stagex/clang16 . /
+COPY --from=stagex/clang . /
 COPY --from=stagex/linux-headers . /
 COPY --from=stagex/gmp . /
 COPY --from=stagex/nettle . /
diff --git a/packages/mdbook/Containerfile b/packages/mdbook/Containerfile
index 873a249..e62433d 100644
--- a/packages/mdbook/Containerfile
+++ b/packages/mdbook/Containerfile
@@ -10,7 +10,7 @@ COPY --from=stagex/rust . /
 COPY --from=stagex/busybox . /
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
-COPY --from=stagex/llvm16 . /
+COPY --from=stagex/llvm . /
 COPY --from=stagex/libunwind . /
 COPY --from=stagex/openssl . /
 COPY --from=stagex/zlib . /
diff --git a/packages/ocismack/Containerfile b/packages/ocismack/Containerfile
index 085b83c..2b60a0c 100644
--- a/packages/ocismack/Containerfile
+++ b/packages/ocismack/Containerfile
@@ -10,7 +10,7 @@ COPY --from=stagex/rust . /
 COPY --from=stagex/busybox . /
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
-COPY --from=stagex/llvm16 . /
+COPY --from=stagex/llvm . /
 COPY --from=stagex/libunwind . /
 COPY --from=stagex/openssl . /
 COPY --from=stagex/zlib . /
diff --git a/packages/openpgp-card-tools/Containerfile b/packages/openpgp-card-tools/Containerfile
index d96ac6b..2fe1e8e 100644
--- a/packages/openpgp-card-tools/Containerfile
+++ b/packages/openpgp-card-tools/Containerfile
@@ -10,7 +10,7 @@ COPY --from=stagex/rust . /
 COPY --from=stagex/busybox . /
 COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
-COPY --from=stagex/llvm16 . /
+COPY --from=stagex/llvm . /
 COPY --from=stagex/libunwind . /
 COPY --from=stagex/openssl . /
 COPY --from=stagex/zlib . /
@@ -20,7 +20,7 @@ WORKDIR /openpgp-card-tools
 RUN cargo fetch
 
 FROM fetch AS build
-COPY --from=stagex/clang16 . /
+COPY --from=stagex/clang . /
 COPY --from=stagex/linux-headers . /
 COPY --from=stagex/gmp . /
 COPY --from=stagex/nettle . /
diff --git a/packages/py-cryptography/Containerfile b/packages/py-cryptography/Containerfile
index c0c0330..6aff081 100644
--- a/packages/py-cryptography/Containerfile
+++ b/packages/py-cryptography/Containerfile
@@ -13,7 +13,7 @@ COPY --from=stagex/musl . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/binutils . /
 COPY --from=stagex/pkgconf . /
-COPY --from=stagex/llvm16 . /
+COPY --from=stagex/llvm . /
 COPY --from=stagex/libunwind . /
 COPY --from=stagex/openssl . /
 COPY --from=stagex/ca-certificates . /