diff --git a/.gitmodules b/.gitmodules
index f81081f..dae4725 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -70,3 +70,7 @@
 	path = libs/coreboot-fs
 	url = https://gitlab.redox-os.org/redox-os/coreboot-fs.git
 	branch = master
+[submodule "apps/gop-policy"]
+	path = apps/gop-policy
+	url = https://github.com/system76/gop-policy.git
+	branch = master
diff --git a/apps/gop-policy b/apps/gop-policy
new file mode 160000
index 0000000..791a0bb
--- /dev/null
+++ b/apps/gop-policy
@@ -0,0 +1 @@
+Subproject commit 791a0bbbe6c65f8fbf7ca4fe38543f825468b445
diff --git a/edk2 b/edk2
index c19cc0f..dd91bf2 160000
--- a/edk2
+++ b/edk2
@@ -1 +1 @@
-Subproject commit c19cc0f0b1582ab1c0db62c421a880ecb986c762
+Subproject commit dd91bf252d45e64c5cf96674c01fcc01b463d4ce
diff --git a/scripts/build.sh b/scripts/build.sh
index 0e53e79..245fdae 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -30,12 +30,18 @@ USB="${BUILD}/usb.img"
 touch apps/firmware-setup/Cargo.toml
 make -C apps/firmware-setup
 
+# Rebuild gop-policy (used by edk2)
+touch apps/gop-policy/Cargo.toml
+FIRMWARE_OPEN_VBT="${MODEL_DIR}/vbt.rom" \
+    make -C apps/gop-policy
+
 # Rebuild CorebootPayloadPkg using edk2
 PACKAGES_PATH="${MODEL_DIR}:$(realpath edk2-platforms):$(realpath apps)" \
     ./scripts/_build/edk2.sh \
         "${UEFIPAYLOAD}" \
-        -D FIRMWARE_OPEN_FIRMWARE_SETUP="firmware-setup/firmware-setup.inf"
-#        -D FIRMWARE_OPEN_GOP="IntelGopDriver.inf"
+        -D FIRMWARE_OPEN_FIRMWARE_SETUP="firmware-setup/firmware-setup.inf" \
+        -D FIRMWARE_OPEN_GOP_POLICY="gop-policy/gop-policy.inf" \
+        -D FIRMWARE_OPEN_GOP="IntelGopDriver.inf"
 
 # Rebuild coreboot
 FIRMWARE_OPEN_MODEL_DIR="${MODEL_DIR}" \