diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile
--- a/sysutils/edk2/Makefile
+++ b/sysutils/edk2/Makefile
@@ -1,11 +1,8 @@
 PORTNAME=	edk2
-PORTVERSION=	g202202
-PORTREVISION=	10
+PORTVERSION=	g202308
 CATEGORIES=	sysutils
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	22130dcd98b4d4b76ac8d922adb4a2dbc86fa52c.patch:-p1 \
-		85021f8cf22d1bd4114803c6c610dea5ef0059f1.patch:-p1
 
 MAINTAINER=	uboot@FreeBSD.org
 COMMENT=	EDK2 Firmware for ${FLAVOR}
@@ -27,19 +24,19 @@
 		bash:shells/bash
 
 # Both platform and non-osi repository don't have release, use latest known to work tag
-PLATFORM_TAG=	38855c56
-NONOSI_TAG=	6996a45d
+PLATFORM_TAG=	e509ac5a72
+NONOSI_TAG=	8c09bd0955
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tianocore
-GH_TAGNAME=	edk2-stable202202
+GH_TAGNAME=	edk2-stable202308
 GH_TUPLE=	tianocore:edk2-platforms:${PLATFORM_TAG}:platforms \
 		tianocore:edk2-non-osi:${NONOSI_TAG}:nonosi \
-		openssl:openssl:OpenSSL_1_1_1j:openssl/CryptoPkg/Library/OpensslLib/openssl \
-		ucb-bar:berkeley-softfloat-3:master:softfloat/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \
-		kkos:oniguruma:v6.9.4_mark1:oniguruma/MdeModulePkg/Universal/RegularExpressionDxe/oniguruma \
 		google:brotli:v1.0.9-35-gf4153a0:brotli/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \
-		akheron:jansson:v2.13.1:jansson/RedfishPkg/Library/JsonLib/jansson
+		google:googletest:release-1.8.0-2983-g86add134:googletest/UnitTestFrameworkPkg/Library/GoogleTestLib/googletest \
+		MIPI-Alliance:public-mipi-sys-t:v1.1+edk2:mipisyst/MdePkg/Library/MipiSysTLib/mipisyst \
+		openssl:openssl:openssl-3.0.9:openssl/CryptoPkg/Library/OpensslLib/openssl \
+		tianocore:edk2-cmocka:cmocka-1.1.5-23-g1cc9cde:cmocka/UnitTestFrameworkPkg/Library/CmockaLib/cmocka
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/edk2/distinfo b/sysutils/edk2/distinfo
--- a/sysutils/edk2/distinfo
+++ b/sysutils/edk2/distinfo
@@ -1,21 +1,17 @@
-TIMESTAMP = 1653575598
-SHA256 (tianocore-edk2-g202202-edk2-stable202202_GH0.tar.gz) = 072e84dfe3c8fbb35bb058dcc8b0f623fe831cead74ba81b0f8236d00a03e947
-SIZE (tianocore-edk2-g202202-edk2-stable202202_GH0.tar.gz) = 14208170
-SHA256 (tianocore-edk2-platforms-38855c56_GH0.tar.gz) = 87324cb01f3460a681155b5d12b2e19fa00638a0366c300813c507a1cbe081cb
-SIZE (tianocore-edk2-platforms-38855c56_GH0.tar.gz) = 10615126
-SHA256 (tianocore-edk2-non-osi-6996a45d_GH0.tar.gz) = ddef0aed5014c15c5eedd0c2a838025677ca9a222df74ea1997f49db4d16f197
-SIZE (tianocore-edk2-non-osi-6996a45d_GH0.tar.gz) = 18916605
-SHA256 (openssl-openssl-OpenSSL_1_1_1j_GH0.tar.gz) = 22d6588e4a7c5ad48fcac2fbf1d035bd43258c22a49457dad0539ded0651b4d2
-SIZE (openssl-openssl-OpenSSL_1_1_1j_GH0.tar.gz) = 9994760
-SHA256 (ucb-bar-berkeley-softfloat-3-master_GH0.tar.gz) = a40ccfa8d5c04971e6af8014217c93b58fba4d08c337bc0436bb141e9e79426a
-SIZE (ucb-bar-berkeley-softfloat-3-master_GH0.tar.gz) = 148747
-SHA256 (kkos-oniguruma-v6.9.4_mark1_GH0.tar.gz) = 7f7576c926f7d4a071d594a01691c477bbb9391df250378bd5e1c003d42b4318
-SIZE (kkos-oniguruma-v6.9.4_mark1_GH0.tar.gz) = 592141
+TIMESTAMP = 1693222100
+SHA256 (tianocore-edk2-g202308-edk2-stable202308_GH0.tar.gz) = 3f1cde1166ad94f86fc2375ee2c3f7f1c16c646b9518de3ff928efd28702ffe1
+SIZE (tianocore-edk2-g202308-edk2-stable202308_GH0.tar.gz) = 16801285
+SHA256 (tianocore-edk2-platforms-e509ac5a729ebe2a3bc905aed1df23226aca4dc9_GH0.tar.gz) = c240a8ec7816bc5963d881c84eb18d880e9269c117cfc46a3106b0c5e6e80c66
+SIZE (tianocore-edk2-platforms-e509ac5a729ebe2a3bc905aed1df23226aca4dc9_GH0.tar.gz) = 11102684
+SHA256 (tianocore-edk2-non-osi-8c09bd0955338db38813e0d8ae1faa634f545f73_GH0.tar.gz) = 6fe059c4ee5d4fad6245a6eb53ed6b62b8890e9481cfb52c9fbdb83a5b2e0edb
+SIZE (tianocore-edk2-non-osi-8c09bd0955338db38813e0d8ae1faa634f545f73_GH0.tar.gz) = 21524411
 SHA256 (google-brotli-v1.0.9-35-gf4153a0_GH0.tar.gz) = 8deff90317f030d770ab912fbc2a789394ac35c2d68eb5105e1f427aa8f88a3f
 SIZE (google-brotli-v1.0.9-35-gf4153a0_GH0.tar.gz) = 512041
-SHA256 (akheron-jansson-v2.13.1_GH0.tar.gz) = f22901582138e3203959c9257cf83eba9929ac41d7be4a42557213a22ebcc7a0
-SIZE (akheron-jansson-v2.13.1_GH0.tar.gz) = 144979
-SHA256 (22130dcd98b4d4b76ac8d922adb4a2dbc86fa52c.patch) = d7e7e46f5c84abc222343182c7c4dfef26cbb78b5a0269514466221211fe050b
-SIZE (22130dcd98b4d4b76ac8d922adb4a2dbc86fa52c.patch) = 1672
-SHA256 (85021f8cf22d1bd4114803c6c610dea5ef0059f1.patch) = d4e68faead64d7b808b32bb37aac110f0d7dd98433ec5d145e8de016d6d9ba0a
-SIZE (85021f8cf22d1bd4114803c6c610dea5ef0059f1.patch) = 2068
+SHA256 (MIPI-Alliance-public-mipi-sys-t-v1.1+edk2_GH0.tar.gz) = 473dcd46ed32b098091a2353f0ed13e69cbe773811c5551e6e766c16ac9ba464
+SIZE (MIPI-Alliance-public-mipi-sys-t-v1.1+edk2_GH0.tar.gz) = 378282
+SHA256 (openssl-openssl-openssl-3.0.9_GH0.tar.gz) = 2eec31f2ac0e126ff68d8107891ef534159c4fcfb095365d4cd4dc57d82616ee
+SIZE (openssl-openssl-openssl-3.0.9_GH0.tar.gz) = 15335782
+SHA256 (tianocore-edk2-cmocka-cmocka-1.1.5-23-g1cc9cde_GH0.tar.gz) = c2fb00395a55abd2ebfc2fcfe2705c7096cedd4416704dbb9237e394607fccb4
+SIZE (tianocore-edk2-cmocka-cmocka-1.1.5-23-g1cc9cde_GH0.tar.gz) = 100320
+SHA256 (google-googletest-release-1.8.0-2983-g86add134_GH0.tar.gz) = b94dc8bbc62251542f3dc5dc1398527379465dd8fc48e146ddea86403a195071
+SIZE (google-googletest-release-1.8.0-2983-g86add134_GH0.tar.gz) = 855431