diff --git a/conf/machine/rb1-core-kit.conf b/conf/machine/rb1-core-kit.conf
index 22c8da9e..9e8da220 100644
--- a/conf/machine/rb1-core-kit.conf
+++ b/conf/machine/rb1-core-kit.conf
@@ -6,7 +6,6 @@ require conf/machine/include/qcom-qcm2290.inc
 
 MACHINE_FEATURES = "efi usbhost usbgadget alsa wifi bluetooth"
 
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
 UBOOT_CONFIG = "qrb2210-rb1"
 UBOOT_CONFIG[qrb2210-rb1] = "qcom_defconfig"
 UBOOT_INITIAL_ENV = ""
@@ -22,11 +21,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
     packagegroup-rb1-hexagon-dsp-binaries \
 "
 
-# Helper util to tell the android bootloader to mark the boot as successfull.
-# The boot firmware will switch to slot B and fail to boot otherwise.
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "qbootctl"
-
 QCOM_BOOT_FILES_SUBDIR = "qrb2210"
 QCOM_PARTITION_FILES_SUBDIR ?= "partitions/qrb2210-rb1/emmc"
 
-QCOM_BOOT_FIRMWARE = "firmware-qcom-boot-qrb2210-rb1"
+QCOM_BOOT_FIRMWARE = "firmware-qcom-boot-qrb2210"
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210-rb1_23.12.bb b/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210-rb1_23.12.bb
index 8c5b3be9..36ca7220 100644
--- a/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210-rb1_23.12.bb
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210-rb1_23.12.bb
@@ -8,6 +8,6 @@ SRC_URI[sha256sum] = "c75b6c63eb24c8ca36dad08ba4d4e93f3f4cd7dce60cf1b6dfb5790dc1
 
 BOOTBINARIES = "rb1-bootloader-emmc-linux-47528"
 
-QCOM_BOOT_IMG_SUBDIR = "qrb2210"
+QCOM_BOOT_IMG_SUBDIR = "qrb2210-rb1"
 
 include firmware-qcom-boot-common.inc
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210.inc b/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210.inc
new file mode 100644
index 00000000..2f3f9c52
--- /dev/null
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "QCOM NHLOS Firmware for Qualcomm QRB2210 platform"
+LICENSE = "LICENSE.qcom-2"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE.${BPN};md5=6e1bae7ef13289c332a27b917fb49764"
+
+FW_ARTIFACTORY = "softwarecenter.qualcomm.com/nexus/generic/product/chip/tech-package/QRB2210_bootbinaries.1.0/qrb2210_bootbinaries.1.0-test-device-public"
+BOOTBINARIES = "Agatti_bootbinaries"
+
+SRC_URI = " \
+    https://${FW_ARTIFACTORY}/${PV}/${BOOTBINARIES}.zip;downloadfilename=${BOOTBINARIES}_r1.0_${PV}.zip;name=bootbinaries \
+    https://${FW_ARTIFACTORY}/${PV}/LICENSE.txt;downloadfilename=LICENSE.${BPN};name=license \
+    https://artifacts.codelinaro.org/artifactory/clo-549-96boards-backup/96boards/rb1/linaro/rescue/23.12/rb1-bootloader-emmc-linux-47528.zip;downloadfilename=fw-cdt-uno-q_${PV}.zip;name=cdt-rb1 \
+    "
+SRC_URI[cdt-rb1.sha256sum] = "c75b6c63eb24c8ca36dad08ba4d4e93f3f4cd7dce60cf1b6dfb5790dc181cc3d"
+SRC_URI[license.sha256sum] = "3ad8f1fd82f2918c858cec2d0887b7df6f71a06416beecfdb3efe7d62874d863"
+
+QCOM_BOOT_IMG_SUBDIR = "qrb2210"
+
+include firmware-qcom-boot-common.inc
diff --git a/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210_00010.bb b/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210_00010.bb
new file mode 100644
index 00000000..f7638fd4
--- /dev/null
+++ b/recipes-bsp/firmware-boot/firmware-qcom-boot-qrb2210_00010.bb
@@ -0,0 +1,3 @@
+require firmware-qcom-boot-qrb2210.inc
+
+SRC_URI[bootbinaries.sha256sum] = "70168afbb254b901d17111bcfcd627af2bfab326cf5e0a007feafafa6bc63b72"
diff --git a/recipes-bsp/packagegroups/packagegroup-machine-essential.bb b/recipes-bsp/packagegroups/packagegroup-machine-essential.bb
index d8988742..1cc486e1 100644
--- a/recipes-bsp/packagegroups/packagegroup-machine-essential.bb
+++ b/recipes-bsp/packagegroups/packagegroup-machine-essential.bb
@@ -141,7 +141,15 @@ RRECOMMENDS:${PN}-qcom-qcm2290-soc += " \
     ${PN}-qcom-generic \
     kernel-module-ath10k-snoc \
     kernel-module-dispcc-qcm2290 \
+    kernel-module-dwc3-qcom \
     kernel-module-gpucc-qcm2290 \
+    kernel-module-q6adm \
+    kernel-module-q6afe \
+    kernel-module-q6afe-clocks \
+    kernel-module-q6asm \
+    kernel-module-q6core \
+    kernel-module-qcom-pm8008 \
+    kernel-module-qcom-pm8008-regulator \
 "
 
 RRECOMMENDS:${PN}-qcom-qcs615-soc += " \
diff --git a/recipes-bsp/partition/qcom-partition-conf_git.bb b/recipes-bsp/partition/qcom-partition-conf_git.bb
index 205af692..210f62e2 100644
--- a/recipes-bsp/partition/qcom-partition-conf_git.bb
+++ b/recipes-bsp/partition/qcom-partition-conf_git.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "GPT partition binaries and QDL scripts for Qualcomm reference dev
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b0a8acd90d872086b279ead88af03369"
 
-SRC_URI = "git://github.com/qualcomm-linux/qcom-ptool.git;branch=main;protocol=https"
-SRCREV = "7b3365284e2c19f1457e335eb25d545e9a2c08a6"
+SRC_URI = "git://github.com/ricardosalveti/qcom-ptool.git;branch=rb1;protocol=https"
+SRCREV = "d3aa04b80d1c8ed11dec105da4671ccfa8315961"
 
 INHIBIT_DEFAULT_DEPS = "1"