diff --git a/device-oriole.mk b/device-oriole.mk
index bfd2ebe..f852140 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -203,6 +203,25 @@ endif
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=$(TARGET_SVN)
 
+# Set device family property for SMR builds
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.build.device_family=O6R4B9
+
+# Set build properties for SMR builds
+ifeq ($(RELEASE_IS_SMR), true)
+    ifneq (,$(RELEASE_BASE_OS_ORIOLE))
+        PRODUCT_BASE_OS := $(RELEASE_BASE_OS_ORIOLE)
+    endif
+endif
+
+# Set build properties for EMR builds
+ifeq ($(RELEASE_IS_EMR), true)
+    ifneq (,$(RELEASE_BASE_OS_ORIOLE))
+        PRODUCT_PROPERTY_OVERRIDES += \
+        ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_ORIOLE)
+    endif
+endif
+
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.support_hide_display_cutout=true
diff --git a/device-raven.mk b/device-raven.mk
index 4e09b42..c69116a 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -207,6 +207,25 @@ endif
 PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=$(TARGET_SVN)
 
+# Set device family property for SMR
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.build.device_family=O6R4B9
+
+# Set build properties for SMR builds
+ifeq ($(RELEASE_IS_SMR), true)
+    ifneq (,$(RELEASE_BASE_OS_RAVEN))
+        PRODUCT_BASE_OS := $(RELEASE_BASE_OS_RAVEN)
+    endif
+endif
+
+# Set build properties for EMR builds
+ifeq ($(RELEASE_IS_EMR), true)
+    ifneq (,$(RELEASE_BASE_OS_RAVEN))
+        PRODUCT_PROPERTY_OVERRIDES += \
+        ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_RAVEN)
+    endif
+endif
+
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.support_hide_display_cutout=true