diff --git a/config/common.mk b/config/common.mk
index 27e8558a43c0afbe44f148544133811f15d8370e..df8bbdb193af259348ea6fe00cc835f977aa8e96 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -23,10 +23,15 @@ PRODUCT_COPY_FILES += \
     $(VENDOR_PATH)/config/permissions/eos-permissions.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/default-permissions/eos-permissions.xml \
     $(VENDOR_PATH)/config/permissions/eos-allowlist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/eos-allowlist.xml
 
-# SafetyNet
-PRODUCT_CONFIGURATION_FILE := vendor/eos/config/ih8sn/ih8sn_$(subst lineage_,,$(TARGET_PRODUCT)).conf
+# SafetyNet compatibility
+ifeq (stable,$(RELEASE_TYPE))
+  INCLUDE_IH8SN ?= true
+endif
 
-ifneq (eng,$(TARGET_BUILD_VARIANT))
+INCLUDE_IH8SN ?= false
+
+PRODUCT_CONFIGURATION_FILE := vendor/eos/config/ih8sn/ih8sn_$(subst lineage_,,$(TARGET_PRODUCT)).conf
+ifeq (true,$(INCLUDE_IH8SN))
   ifneq (,$(wildcard $(PRODUCT_CONFIGURATION_FILE)))
     PRODUCT_PACKAGES += ih8sn
     PRODUCT_COPY_FILES += \