diff --git a/aosp_raven.mk b/aosp_raven.mk
index 6a29283..f434886 100644
--- a/aosp_raven.mk
+++ b/aosp_raven.mk
@@ -15,7 +15,7 @@
 #
 
 $(call inherit-product, device/google/gs101/aosp_common.mk)
-$(call inherit-product, device/google/raviole/device-raven.mk)
+$(call inherit-product, device/google/raviole/raven_generic.mk)
 
 PRODUCT_NAME := aosp_raven
 PRODUCT_NAME_FOR_ATTESTATION := raven
diff --git a/factory_slider.mk b/factory_slider.mk
index 1c51e91..1359fc6 100644
--- a/factory_slider.mk
+++ b/factory_slider.mk
@@ -23,3 +23,6 @@ PRODUCT_DEVICE := slider
 PRODUCT_MODEL := Factory build on Slider
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
diff --git a/factory_whitefin.mk b/factory_whitefin.mk
index 0dd0a4f..4d360c6 100644
--- a/factory_whitefin.mk
+++ b/factory_whitefin.mk
@@ -29,3 +29,5 @@ PRODUCT_MANUFACTURER := Google
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
 
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
diff --git a/raven_generic.mk b/raven_generic.mk
new file mode 100644
index 0000000..abbac40
--- /dev/null
+++ b/raven_generic.mk
@@ -0,0 +1,17 @@
+#
+# Copyright 2024 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$(call inherit-product, device/google/raviole/device-raven.mk)
diff --git a/slider_generic.mk b/slider_generic.mk
index 52d2542..419e587 100644
--- a/slider_generic.mk
+++ b/slider_generic.mk
@@ -15,3 +15,6 @@
 #
 
 $(call inherit-product, device/google/raviole/device-slider.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/slider
diff --git a/whitefin_generic.mk b/whitefin_generic.mk
index a56c609..f0616c6 100644
--- a/whitefin_generic.mk
+++ b/whitefin_generic.mk
@@ -15,3 +15,6 @@
 #
 
 $(call inherit-product, device/google/raviole/device-whitefin.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/slider