diff --git a/build.config.msm.gki b/build.config.msm.gki
index a5ab6a0e07d5..9fcb227ea2b6 100644
--- a/build.config.msm.gki
+++ b/build.config.msm.gki
@@ -12,6 +12,18 @@ function builtin_defconfig() {
 	${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} \
 	${KERNEL_DIR}/arch/arm64/configs/vendor/${MSM_ARCH}-builtin_defconfig
 	DEFCONFIG=vendor/${MSM_ARCH}-builtin_defconfig
+	# Techpack builtin
+	sed 's/=m/=y/g' ${KERNEL_DIR}/techpack/audio/config/${MSM_ARCH}auto.conf > \
+	${KERNEL_DIR}/techpack/audio/config/${MSM_ARCH}builtinauto.conf
+	sed 's/=m/=y/g' ${KERNEL_DIR}/techpack/display/config/${MSM_ARCH}disp.conf > \
+	${KERNEL_DIR}/techpack/display/config/${MSM_ARCH}builtindisp.conf
+	sed 's/=m/=y/g' ${KERNEL_DIR}/techpack/camera/config/${MSM_ARCH}camera.conf > \
+	${KERNEL_DIR}/techpack/camera/config/${MSM_ARCH}builtincamera.conf
+	# Hardcode for yupik
+	sed 's/=m/=y/g' ${KERNEL_DIR}/techpack/camera/config/yupikcamera.conf > \
+	${KERNEL_DIR}/techpack/camera/config/yupikbuiltincamera.conf
+	sed 's/=m/=y/g' ${KERNEL_DIR}/techpack/camera/config/shimacamera.conf > \
+	${KERNEL_DIR}/techpack/camera/config/shimabuiltincamera.conf
 }
 
 if [ ${BUILTIN} = "1" ]; then
diff --git a/techpack/audio/Makefile b/techpack/audio/Makefile
index 73ad150b67ec..d9d0794beb2e 100644
--- a/techpack/audio/Makefile
+++ b/techpack/audio/Makefile
@@ -1,39 +1,79 @@
 # auto-detect subdirs
 ifneq ($(CONFIG_ARCH_QTI_VM), y)
 ifeq ($(CONFIG_QTI_QUIN_GVM), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/audio/config/gvmbuiltinauto.conf
+else
 include $(srctree)/techpack/audio/config/gvmauto.conf
 endif
+endif
 ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/audio/config/sdxpoorwillsbuiltinauto.conf
+else
 include $(srctree)/techpack/audio/config/sdxpoorwillsauto.conf
+endif
 export
 endif
 ifeq ($(CONFIG_ARCH_SM8150), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/audio/config/sm8150builtinauto.conf
+else
 include $(srctree)/techpack/audio/config/sm8150auto.conf
+endif
 export
 endif
 ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/audio/config/sm8150builtinauto.conf
+else
 include $(srctree)/techpack/audio/config/sm8150auto.conf
+endif
 export
 endif
 ifeq ($(CONFIG_ARCH_KONA), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/audio/config/konabuiltinauto.conf
+else
 include $(srctree)/techpack/audio/config/konaauto.conf
 endif
+endif
 ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/audio/config/lahainabuiltinauto.conf
+else
 include $(srctree)/techpack/audio/config/lahainaauto.conf
 endif
+endif
 ifeq ($(CONFIG_ARCH_HOLI), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/audio/config/holibuiltinauto.conf
+else
 include $(srctree)/techpack/audio/config/holiauto.conf
 endif
+endif
 ifeq ($(CONFIG_ARCH_SA8155), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/audio/config/sa8155builtinauto.conf
+else
 include $(srctree)/techpack/audio/config/sa8155auto.conf
 endif
+endif
 ifeq ($(CONFIG_ARCH_SA6155), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/audio/config/sa6155builtinauto.conf
+else
 include $(srctree)/techpack/audio/config/sa6155auto.conf
 endif
+endif
 ifeq ($(CONFIG_ARCH_SM6150), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/audio/config/sm6150builtinauto.conf
+else
 include $(srctree)/techpack/audio/config/sm6150auto.conf
 endif
 endif
+endif
 # Use USERINCLUDE when you must reference the UAPI directories only.
 USERINCLUDE     += \
                 -I$(srctree)/techpack/audio/include/uapi/audio
diff --git a/techpack/camera/Makefile b/techpack/camera/Makefile
index 2568ff61c873..ad3dbd90b690 100644
--- a/techpack/camera/Makefile
+++ b/techpack/camera/Makefile
@@ -3,44 +3,84 @@
 # auto-detect subdirs
 ifneq ($(CONFIG_ARCH_QTI_VM), y)
 ifeq ($(CONFIG_ARCH_KONA), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/camera/config/konabuiltincamera.conf
+else
 include $(srctree)/techpack/camera/config/konacamera.conf
 endif
+endif
 
 ifeq ($(CONFIG_ARCH_LITO), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/camera/config/litobuiltincamera.conf
+else
 include $(srctree)/techpack/camera/config/litocamera.conf
 endif
+endif
 
 ifeq ($(CONFIG_ARCH_BENGAL), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/camera/config/bengalbuiltincamera.conf
+else
 include $(srctree)/techpack/camera/config/bengalcamera.conf
 endif
+endif
 
 ifeq ($(CONFIG_ARCH_MONACO), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/camera/config/monacobuiltincamera.conf
+else
 include $(srctree)/techpack/camera/config/monacocamera.conf
 endif
+endif
 
 ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/camera/config/lahainabuiltincamera.conf
+else
 include $(srctree)/techpack/camera/config/lahainacamera.conf
 endif
+endif
 
 ifeq ($(CONFIG_ARCH_HOLI), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/camera/config/holibuiltincamera.conf
+else
 include $(srctree)/techpack/camera/config/holicamera.conf
 endif
+endif
 
 ifeq ($(CONFIG_ARCH_BLAIR), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/camera/config/blairbuiltincamera.conf
+else
 include $(srctree)/techpack/camera/config/blaircamera.conf
 endif
+endif
 
 ifeq ($(CONFIG_ARCH_SHIMA), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/camera/config/shimabuiltincamera.conf
+else
 include $(srctree)/techpack/camera/config/shimacamera.conf
 endif
+endif
 
 ifeq ($(CONFIG_ARCH_YUPIK), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/camera/config/yupikbuiltincamera.conf
+else
 include $(srctree)/techpack/camera/config/yupikcamera.conf
 endif
+endif
 
 ifeq ($(CONFIG_ARCH_SM6150), y)
+ifeq ($(BUILTIN), 1)
+include $(srctree)/techpack/camera/config/sm6150builtincamera.conf
+else
 include $(srctree)/techpack/camera/config/sm6150camera.conf
 endif
+endif
 
 ifeq ($(CONFIG_ARCH_KONA), y)
 LINUXINCLUDE    += \
diff --git a/techpack/display/Makefile b/techpack/display/Makefile
index d51633c64222..51aeb5a09652 100644
--- a/techpack/display/Makefile
+++ b/techpack/display/Makefile
@@ -3,7 +3,11 @@
 # auto-detect subdirs
 ifeq ($(CONFIG_ARCH_KONA), y)
      ifeq ($(CONFIG_QGKI), y)
+	ifeq ($(BUILTIN), 1)
+		include $(srctree)/techpack/display/config/konabuiltindisp.conf
+	else
 		include $(srctree)/techpack/display/config/konadisp.conf
+	endif
 LINUXINCLUDE    += -include $(srctree)/techpack/display/config/konadispconf.h
      else
 		include $(srctree)/techpack/display/config/gki_konadisp.conf
@@ -13,7 +17,11 @@ endif
 
 ifeq ($(CONFIG_ARCH_LAHAINA), y)
      ifeq ($(CONFIG_QGKI), y)
+	ifeq ($(BUILTIN), 1)
+		include $(srctree)/techpack/display/config/lahainabuiltindisp.conf
+	else
 		include $(srctree)/techpack/display/config/lahainadisp.conf
+	endif
 LINUXINCLUDE    += -include $(srctree)/techpack/display/config/lahainadispconf.h
      else
 		include $(srctree)/techpack/display/config/gki_lahainadisp.conf
@@ -23,7 +31,11 @@ endif
 
 ifeq ($(CONFIG_ARCH_HOLI), y)
      ifeq ($(CONFIG_QGKI), y)
+	ifeq ($(BUILTIN), 1)
+		include $(srctree)/techpack/display/config/holibuiltindisp.conf
+	else
 		include $(srctree)/techpack/display/config/holidisp.conf
+	endif
 LINUXINCLUDE    += -include $(srctree)/techpack/display/config/holidispconf.h
      else
 		include $(srctree)/techpack/display/config/gki_holidisp.conf