diff --git a/config/common.mk b/config/common.mk
index 67110fc648aecf429425d6cc228e49f13efe95c9..19b3686dd682ddc8dd416de9c8bbc723a9cf9849 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -19,9 +19,14 @@ DEVICE_PACKAGE_OVERLAYS += \
     $(VENDOR_PATH)/overlay
 
 # SafetyNet compatibility
-PRODUCT_CONFIGURATION_FILE := vendor/eos/config/ih8sn/ih8sn_$(subst lineage_,,$(TARGET_PRODUCT)).conf
+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 += \