diff --git a/factory_husky.mk b/factory_husky.mk
index 5c2c0ce..c44fc7e 100644
--- a/factory_husky.mk
+++ b/factory_husky.mk
@@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
diff --git a/factory_ripcurrent.mk b/factory_ripcurrent.mk
index b7c64c5..17cf8e8 100644
--- a/factory_ripcurrent.mk
+++ b/factory_ripcurrent.mk
@@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_sb3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
diff --git a/factory_shiba.mk b/factory_shiba.mk
index d20f113..2564bfe 100644
--- a/factory_shiba.mk
+++ b/factory_shiba.mk
@@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_sb3_ultrawide_hat_tool factory_hk3sb3_main_cam_decompress_test sb3_ultrawide_af_fw_update
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
diff --git a/husky_generic.mk b/husky_generic.mk
index 2bf7caf..61489f4 100644
--- a/husky_generic.mk
+++ b/husky_generic.mk
@@ -15,3 +15,6 @@
 #
 
 $(call inherit-product, device/google/shusky/device-husky.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common
diff --git a/ripcurrent_generic.mk b/ripcurrent_generic.mk
index bb1afb3..3789f83 100644
--- a/ripcurrent_generic.mk
+++ b/ripcurrent_generic.mk
@@ -15,3 +15,6 @@
 #
 
 $(call inherit-product, device/google/shusky/device-ripcurrent.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common
diff --git a/shiba_generic.mk b/shiba_generic.mk
index 064301e..f08b683 100644
--- a/shiba_generic.mk
+++ b/shiba_generic.mk
@@ -15,3 +15,6 @@
 #
 
 $(call inherit-product, device/google/shusky/device-shiba.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common