diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 032e8ed..1d465f5 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -131,9 +131,6 @@ BOARD_PLAT_PUBLIC_SEPOLICY_DIR += \
     device/qcom/sepolicy/generic/public \
     device/qcom/sepolicy/qva/public
 
-# Soong namespaces
-PRODUCT_SOONG_NAMESPACES += $(COMMON_PATH)
-
 # Verified Boot
 BOARD_AVB_ENABLE := true
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flag 2
diff --git a/common.mk b/common.mk
index a08cb6b..9299d28 100644
--- a/common.mk
+++ b/common.mk
@@ -150,6 +150,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     RemovePackages
 
+# Soong namespaces
+PRODUCT_SOONG_NAMESPACES += \
+    $(LOCAL_PATH)
+
 # Telephony
 PRODUCT_PACKAGES += \
     ims-ext-common \