diff --git a/src/images/Containerfile b/src/images/Containerfile
index 3f9a618e..74738701 100644
--- a/src/images/Containerfile
+++ b/src/images/Containerfile
@@ -12,7 +12,7 @@ FROM stagex/binutils@sha256:9cc26e56cdfce106108a0f4c416a27967060d8d07c4da0cbc0e1
 FROM stagex/pkgconf@sha256:36fc4ed10a6e044d068aa7316e72588dbd365be4eb0271a84cf632521dbd8a09 as pkgconf
 FROM stagex/git@sha256:3a2853fa2fa725f7f02565e24f508912b33223e49bed915e55a5d3f85548d190 as git
 FROM stagex/gen_initramfs@sha256:6d323df1291bfd26e3a1db33065cbec1c44d397dd6b0f23b2f25c0f8c9f7ce76 as gen_initramfs
-FROM stagex/eif_build@sha256:94a4dd467e6f5e7a9967a538179e40737b9b4ff8007219aebbc6e96089a545c7 as eif_build
+FROM stagex/eif_build@sha256:561ac95d02f1a5caf1d600cd2dbf487d1bb63450de0af2b528a9b657c66c12a8 as eif_build
 FROM stagex/llvm@sha256:9dfc53795c89295da52719959f96df9122e0b921da6283c7bd7a582749545b1d as llvm
 FROM stagex/pcsc-lite@sha256:818ee8367335a47109ec5464bfb8c4a313a25909c430176d543619b75a6c339a as pcsc-lite
 FROM stagex/file@sha256:8ce66c0574777bca83c8297b74372e0be7a6cc5d2b7e21061391726ad6d6d406 as file
diff --git a/src/images/client/Dockerfile b/src/images/client/Dockerfile
deleted file mode 100644
index 7fd4b2e3..00000000
--- a/src/images/client/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM scratch
-LABEL org.opencontainers.image.source=https://github.com/tkhq/qos
-ARG BIN
-COPY ${BIN} /qos_client
-ENTRYPOINT ["/qos_client"]
diff --git a/src/images/host/Dockerfile b/src/images/host/Dockerfile
deleted file mode 100644
index 27542874..00000000
--- a/src/images/host/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM scratch
-LABEL org.opencontainers.image.source=https://github.com/tkhq/qos
-ARG BIN
-COPY ${BIN} /qos_host
-ENTRYPOINT ["/qos_host"]
diff --git a/src/images/qos_client/Containerfile b/src/images/qos_client/Containerfile
index d406f9d6..9959d5d3 100644
--- a/src/images/qos_client/Containerfile
+++ b/src/images/qos_client/Containerfile
@@ -3,7 +3,7 @@ ADD . /src
 
 FROM base as build
 ENV PCSC_LIB_NAME=static=pcsclite
-RUN --mount=type=cache,target=/src/qos_client/cache/cargo <<-EOF
+RUN <<-EOF
 	set -eux
 	env -C /src/qos_client cargo build --features smartcard ${CARGOFLAGS}
     cp /src/target/${TARGET}/release/qos_client /
diff --git a/src/images/qos_enclave/Containerfile b/src/images/qos_enclave/Containerfile
index cc8b0045..4690bb8d 100644
--- a/src/images/qos_enclave/Containerfile
+++ b/src/images/qos_enclave/Containerfile
@@ -2,7 +2,7 @@ FROM qos-local/build-base as base
 ADD . /src
 
 FROM base as build-qos_enclave
-RUN --mount=type=cache,target=/src/qos_enclave/cache/cargo <<-EOF
+RUN <<-EOF
 	set -eux
 	env -C /src/qos_enclave cargo build ${CARGOFLAGS}
 	cp /src/qos_enclave/target/${TARGET}/release/qos_enclave /
@@ -10,7 +10,7 @@ RUN --mount=type=cache,target=/src/qos_enclave/cache/cargo <<-EOF
 EOF
 
 FROM base as build-init
-RUN --mount=type=cache,target=/src/init/cache/cargo <<-EOF
+RUN <<-EOF
 	set -eux
 	env -C /src/init cargo build ${CARGOFLAGS}
 	cp /src/init/target/${TARGET}/release/init /
@@ -38,7 +38,13 @@ COPY <<-EOF initramfs.list
 	dir  /dev/pts          0755 0 0
 	nod  /dev/console      0600 0 0 c 5 1
 EOF
-RUN gen_initramfs -o rootfs.cpio initramfs.list
+ENV CPIO_TIMESTAMP=1
+ENV KBUILD_BUILD_TIMESTAMP=1
+RUN <<-EOF
+    find . -exec touch -hcd "@0" "{}" +
+    gen_init_cpio -t 1 initramfs.list > rootfs.cpio
+    touch -hcd "@0" rootfs.cpio
+EOF
 WORKDIR /build_eif
 RUN eif_build \
 	--kernel /bzImage \
diff --git a/src/images/qos_host/Containerfile b/src/images/qos_host/Containerfile
index a051badf..64cb5236 100644
--- a/src/images/qos_host/Containerfile
+++ b/src/images/qos_host/Containerfile
@@ -2,7 +2,7 @@ FROM qos-local/build-base as base
 ADD . /src
 
 FROM base as build
-RUN --mount=type=cache,target=/src/qos_host/cache/cargo <<-EOF
+RUN <<-EOF
 	set -eux
 	env -C /src/qos_host cargo build --features vm ${CARGOFLAGS}
     cp /src/target/${TARGET}/release/qos_host /