diff --git a/packages/acpica/Containerfile b/packages/acpica/Containerfile
new file mode 100644
index 0000000..364d947
--- /dev/null
+++ b/packages/acpica/Containerfile
@@ -0,0 +1,30 @@
+FROM scratch as base
+ENV VERSION=20230628
+ENV SRC_HASH=86876a745e3d224dcfd222ed3de465b47559e85811df2db9820ef09a9dff5cce
+ENV SRC_FILE=acpica-unix-${VERSION}.tar.gz
+ENV SRC_SITE=https://downloadmirror.intel.com/783549/${SRC_FILE}
+
+FROM base as fetch
+ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
+
+FROM fetch as build
+COPY --from=stagex/busybox . /
+COPY --from=stagex/gcc . /
+COPY --from=stagex/musl . /
+COPY --from=stagex/binutils . /
+COPY --from=stagex/make . /
+COPY --from=stagex/bison . /
+COPY --from=stage/flex . /
+RUN tar -xf ${SRC_FILE}
+WORKDIR acpica-unix-${VERSION}
+RUN --network=none <<-EOF
+	set -eux
+	export LDFLAGS="${LDFLAGS/-Wl,-z,pack-relative-relocs}"
+	make NOWERROR=TRUE -j "$(nproc)"
+EOF
+
+FROM build AS install
+RUN --network=none DESTDIR=/rootfs make install
+
+FROM stagex/filesystem AS package
+COPY --from=install /rootfs/. /
\ No newline at end of file
diff --git a/packages/edk2/Containerfile b/packages/edk2/Containerfile
new file mode 100644
index 0000000..c5d3aa8
--- /dev/null
+++ b/packages/edk2/Containerfile
@@ -0,0 +1,57 @@
+FROM scratch as base
+ARG ARCH=x86_64
+ENV VERSION=202408
+ENV SRC_HASH=63c99b6f9f7aa94e8d76c432bea05d0d4dd6600af78d6fd59a1aec5ce9cea8ce
+ENV SRC_FILE=edk2-stable${VERSION}.tar.gz
+ENV SRC_SITE=https://github.com/tianocore/edk2/archive/refs/tags/${SRC_FILE}}
+
+FROM base as fetch
+ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
+
+FROM fetch as build
+COPY --from=stagex/busybox . /
+COPY --from=stagex/binutils . /
+COPY --from=stagex/musl . /
+COPY --from=stagex/make . /
+COPY --from=stagex/gcc . /
+COPY --from=stagex/git . /
+COPY --from=stagex/python . /
+COPY --from=stagex/nasm . /
+COPY --from=stagex/acpica . /
+
+RUN tar -xf ${SRC_FILE}
+WORKDIR edk2-edk2-stable${VERSION}
+
+ENV PLATFORM = "ShellPkg/ShellPkg.dsc OvmfPkg/OvmfPkgX64.dsc OvmfPkg/OvmfXen.dsc"
+ENV TOOLCHAIN = "GCC5"
+ENV RELEASE = "RELEASE"
+RUN --network=none <<-EOF
+	set -ex
+    export PYTHON_COMMAND=python3
+	export WORKSPACE=$PWD
+	export PACKAGES_PATH=$PWD
+	export EDK_TOOLS_PATH=$PWD/BaseTools/
+	export PATH=$PWD/BaseTools/BinWrappers/PosixLike/:$PATH
+	# parallel build fails
+	unset MAKEFLAGS
+
+	bash -c ". edksetup.sh"
+	make -C BaseTools
+
+	for _p in $PLATFORM; do
+		msg "Building Plaform Files $_p"
+		command build -b $RELEASE \
+			-a $TARGET_ARCH  \
+			-t $TOOLCHAIN \
+			-p $_p \
+			-n ${JOBS:-2} \
+			-DSECURE_BOOT_ENABLE=TRUE \
+			-DTPM2_ENABLE=TRUE
+	done
+EOF
+
+FROM build as install
+RUN make DESTDIR="/rootfs" install
+
+FROM stagex/filesystem as package
+COPY --from=install /rootfs/. /
diff --git a/packages/nasm/Containerfile b/packages/nasm/Containerfile
new file mode 100644
index 0000000..64fc954
--- /dev/null
+++ b/packages/nasm/Containerfile
@@ -0,0 +1,35 @@
+FROM scratch as base
+ENV VERSION=2.16.03
+ENV SRC_HASH=86876a745e3d224dcfd222ed3de465b47559e85811df2db9820ef09a9dff5cce
+ENV SRC_FILE=nasm-${VERSION}.tar.xz
+ENV SRC_SITE=https://www.nasm.us/pub/nasm/releasebuilds/${VERSION}/${SRC_FILE}}
+
+FROM base as fetch
+ADD --checksum=sha256:${SRC_HASH} ${SRC_SITE} .
+
+FROM fetch as build
+COPY --from=stagex/busybox . /
+COPY --from=stagex/gcc . /
+COPY --from=stagex/binutils . /
+COPY --from=stagex/make . /
+COPY --from=stagex/bison . /
+COPY --from=stage/flex . /
+COPY --from=stagex/musl . /
+COPY --from=stagex/perl . /
+RUN tar -xf ${SRC_FILE}
+WORKDIR nasm-${VERSION}
+RUN --network=none <<-EOF
+	set -eux
+		CFLAGS="$CFLAGS -O2 -flto=auto" \
+	./configure \
+        --build=x86_64-linux-musl \
+        --host=x86_64-linux-musl \
+		--prefix=/usr
+	make -j "$(nproc)"
+EOF
+
+FROM build AS install
+RUN --network=none DESTDIR=/rootfs make install
+
+FROM stagex/filesystem AS package
+COPY --from=install /rootfs/. /
\ No newline at end of file