diff --git a/config/common.mk b/config/common.mk
index df8bbdb193af259348ea6fe00cc835f977aa8e96..e4a143c1c1c636057ffe3c842bc05e086bf70d82 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -24,7 +24,8 @@ PRODUCT_COPY_FILES += \
     $(VENDOR_PATH)/config/permissions/eos-allowlist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/eos-allowlist.xml
 
 # SafetyNet compatibility
-ifeq (stable,$(RELEASE_TYPE))
+ifneq (test,$(RELEASE_TYPE))
+  # Ship ih8sn on dev & stable builds
   INCLUDE_IH8SN ?= true
 endif
 
diff --git a/config/ih8sn/ih8sn_sunfish.conf b/config/ih8sn/ih8sn_sunfish.conf
new file mode 100644
index 0000000000000000000000000000000000000000..264823873bfd0da04914949dda47f4a455119073
--- /dev/null
+++ b/config/ih8sn/ih8sn_sunfish.conf
@@ -0,0 +1,3 @@
+BUILD_SECURITY_PATCH_DATE=2022-03-05
+BUILD_FINGERPRINT=google/sunfish/sunfish:12/SP2A.220305.012/8177914:user/release-keys
+DEBUGGABLE=0