diff --git a/apps/firmware-setup b/apps/firmware-setup
index 81bd5c3..39cbc4a 160000
--- a/apps/firmware-setup
+++ b/apps/firmware-setup
@@ -1 +1 @@
-Subproject commit 81bd5c39a1ad021ab06ff6c06d00fc4c769a66e4
+Subproject commit 39cbc4ab112e2bbbb947a34a218db4374d7c0fad
diff --git a/edk2 b/edk2
index 51be9d0..8ef4127 160000
--- a/edk2
+++ b/edk2
@@ -1 +1 @@
-Subproject commit 51be9d0425cf9c4d1f398e7b730e797ccd45e410
+Subproject commit 8ef41276638153b0c610207ab4b1a8a70c2a4456
diff --git a/scripts/_build/edk2.sh b/scripts/_build/edk2.sh
index d303e47..4fe5367 100755
--- a/scripts/_build/edk2.sh
+++ b/scripts/_build/edk2.sh
@@ -4,7 +4,7 @@ set -e
 
 if [ -z "$1" ]
 then
-  echo "$0 [UEFIPAYLOAD.fd]" >&2
+  echo "$0 [UEFIPAYLOAD.fd] <ARGS..>" >&2
   exit 1
 fi
 UEFIPAYLOAD="$(realpath "$1")"
@@ -23,7 +23,8 @@ pushd edk2 >/dev/null
     -a X64 \
     -b "${BUILD_TYPE}" \
     -t "${TOOLCHAIN}" \
-    -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
+    -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc \
+    "${@:2}"
 
   cp -v \
     "Build/CorebootPayloadPkgX64/${BUILD_TYPE}_${TOOLCHAIN}/FV/UEFIPAYLOAD.fd" \
diff --git a/scripts/build.sh b/scripts/build.sh
index d40d1f9..b69d5e7 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -24,7 +24,9 @@ touch apps/firmware-setup/Cargo.toml
 make -C apps/firmware-setup
 
 # Rebuild CorebootPayloadPkg using edk2
-./scripts/_build/edk2.sh build/UEFIPAYLOAD.fd
+export
+./scripts/_build/edk2.sh build/UEFIPAYLOAD.fd \
+  -D FIRMWARE_OPEN_FIRMWARE_SETUP="firmware-setup/firmware-setup.inf"
 
 # Rebuild coreboot
 export FIRMWARE_OPEN_UEFIPAYLOAD="$(realpath build/UEFIPAYLOAD.fd)"