diff --git a/arch/arm64/configs/vendor/niobe_GKI.config b/arch/arm64/configs/vendor/niobe_GKI.config
index b7398f4a895d..bce5eb924a75 100644
--- a/arch/arm64/configs/vendor/niobe_GKI.config
+++ b/arch/arm64/configs/vendor/niobe_GKI.config
@@ -1,3 +1,24 @@
 CONFIG_ARCH_NIOBE=y
+CONFIG_ARM_SMMU=m
+CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
+CONFIG_ARM_SMMU_QCOM=m
+# CONFIG_ARM_SMMU_QCOM_DEBUG is not set
+# CONFIG_ARM_SMMU_SELFTEST is not set
 CONFIG_LOCALVERSION="-gki"
 # CONFIG_MODULE_SIG_ALL is not set
+# CONFIG_MSM_HAB is not set
+CONFIG_QCOM_DMABUF_HEAPS=m
+CONFIG_QCOM_DMABUF_HEAPS_CARVEOUT=y
+CONFIG_QCOM_DMABUF_HEAPS_CMA=y
+CONFIG_QCOM_DMABUF_HEAPS_PAGE_POOL_REFILL=y
+CONFIG_QCOM_DMABUF_HEAPS_SYSTEM=y
+# CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_MOVABLE is not set
+# CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_UNCACHED is not set
+# CONFIG_QCOM_DMABUF_HEAPS_TUI_CARVEOUT is not set
+# CONFIG_QCOM_DMABUF_HEAPS_UBWCP is not set
+# CONFIG_QCOM_IOMMU_DEBUG is not set
+CONFIG_QCOM_IOMMU_UTIL=m
+CONFIG_QCOM_LAZY_MAPPING=m
+CONFIG_QCOM_MEM_BUF=m
+CONFIG_QCOM_MEM_BUF_DEV=m
+CONFIG_QCOM_SCM=m
diff --git a/modules.list.msm.niobe b/modules.list.msm.niobe
index f679895bc362..9ce0a7cd0d97 100644
--- a/modules.list.msm.niobe
+++ b/modules.list.msm.niobe
@@ -1,2 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
 # Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
+qcom-scm.ko
+mem_buf.ko
+mem_buf_dev.ko
+msm_dma_iommu_mapping.ko
+qcom_dma_heaps.ko
+qcom_iommu_util.ko
+arm_smmu.ko
diff --git a/niobe.bzl b/niobe.bzl
index 28e27b2ae601..99fe03063250 100644
--- a/niobe.bzl
+++ b/niobe.bzl
@@ -8,6 +8,13 @@ def define_niobe():
     _niobe_in_tree_modules = [
         # keep sorted
         # TODO: Need to add GKI modules
+        "drivers/dma-buf/heaps/qcom_dma_heaps.ko",
+        "drivers/firmware/qcom-scm.ko",
+        "drivers/iommu/arm/arm-smmu/arm_smmu.ko",
+        "drivers/iommu/msm_dma_iommu_mapping.ko",
+        "drivers/iommu/qcom_iommu_util.ko",
+        "drivers/soc/qcom/mem_buf/mem_buf.ko",
+        "drivers/soc/qcom/mem_buf/mem_buf_dev.ko",
     ]
 
     _niobe_consolidate_in_tree_modules = _niobe_in_tree_modules + [