diff --git a/Containerfile.bytecode.multi.arch b/Containerfile.bytecode.multi.arch
index 328d0063263ce9d90585f0249d2af810a2177841..aecbae976634583c71f4e371a7d6724780136b99 100644
--- a/Containerfile.bytecode.multi.arch
+++ b/Containerfile.bytecode.multi.arch
@@ -4,57 +4,29 @@ FROM scratch
 ARG TARGETARCH
 ARG TARGETOS
 
-FROM scratch AS linux386
-ARG BC_386_EL
-COPY  $BC_386_EL /
-
 FROM scratch AS linuxamd64
+ARG TARGETARCH
+ARG TARGETOS
 ARG BC_AMD64_EL
-COPY  $BC_AMD64_EL /
-
-FROM scratch AS linuxarm
-ARG BC_ARM_EL
-COPY  $BC_ARM_EL /
+COPY $BC_AMD64_EL /
 
 FROM scratch AS linuxarm64
+ARG TARGETARCH
+ARG TARGETOS
 ARG BC_ARM64_EL
-COPY  $BC_ARM64_EL /
-
-FROM scratch AS linuxloong64
-ARG BC_LOONG64_EL
-COPY  $BC_LOONG64_EL /
-
-FROM scratch AS linuxmips
-ARG BC_MIPS_EB
-COPY  $BC_MIPS_EB /
-
-FROM scratch AS linuxmipsle
-ARG BC_MIPSLE_EL
-COPY  $BC_MIPSLE_EL /
-
-FROM scratch AS linuxmips64
-ARG BC_MIPS64_EB
-COPY  $BC_MIPS64_EB /
-
-FROM scratch AS linuxmips64le
-ARG BC_MIPS64LE_EL
-COPY  $BC_MIPS64LE_EL /
-
-FROM scratch AS linuxppc64
-ARG BC_PPC64_EB
-COPY  $BC_PPC64_EL /
+COPY $BC_ARM64_EL /
 
 FROM scratch AS linuxppc64le
+ARG TARGETARCH
+ARG TARGETOS
 ARG BC_PPC64LE_EL
-COPY  $BC_PPC64LE_EL /
-
-FROM scratch AS linuxriscv64
-ARG BC_RISCV64_EL
-COPY  $BC_RISCV64_EL /
+COPY $BC_PPC64LE_EL /
 
 FROM scratch AS linuxs390x
+ARG TARGETARCH
+ARG TARGETOS
 ARG BC_S390X_EB
-COPY  $BC_S390X_EB /
+COPY $BC_S390X_EB /
 
 ARG TARGETARCH
 ARG TARGETOS