diff --git a/dev-util/xrt/xrt-999999.ebuild b/dev-util/xrt/xrt-999999.ebuild
index 5746b42021..c4ce9587c6 100644
--- a/dev-util/xrt/xrt-999999.ebuild
+++ b/dev-util/xrt/xrt-999999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{12..14} )
-inherit bash-completion-r1 cmake python-any-r1
+PYTHON_COMPAT=( python3_{12..15} )
+inherit shell-completion cmake python-any-r1
 
 DESCRIPTION="Runtime for AIE and FPGA based platforms"
 HOMEPAGE="https://github.com/Xilinx/XRT"
@@ -12,11 +12,12 @@ HOMEPAGE="https://github.com/Xilinx/XRT"
 if [[ ${PV} == 999999 ]] ; then
 	EGIT_REPO_URI="https://github.com/Xilinx/XRT.git"
 	EGIT_SUBMODULES=(
-		src/runtime_src/aie-rt
+		src/runtime_src/aie-codegen
+		src/runtime_src/aie-codegen/aie-regdb
 		src/runtime_src/core/common/aiebu
+		src/runtime_src/core/common/aiebu/src/cpp/ELFIO
 		src/runtime_src/core/common/elf
 		src/runtime_src/xdp
-		src/runtime_src/core/common/aiebu/src/cpp/ELFIO
 	)
 	inherit git-r3
 else
@@ -55,8 +56,6 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-libs/openssl:=
 	sys-apps/util-linux
-	dev-cpp/abseil-cpp:=
-	dev-libs/protobuf:=
 "
 
 DEPEND="
@@ -70,6 +69,7 @@ DEPEND="
 
 BDEPEND="
 	${PYTHON_DEPS}
+	dev-libs/protobuf[protoc(+)]
 	$(python_gen_any_dep "
 		dev-python/jinja2[\${PYTHON_USEDEP}]
 		dev-python/markdown[\${PYTHON_USEDEP}]