diff --git a/device-husky.mk b/device-husky.mk
index aad692e..93d9742 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -31,9 +31,7 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),)
     include device/google/shusky/uwb/uwb_calibration.mk
 endif
 
-DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false)
-
-ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
+ifeq ($(PRODUCT_BOOTS_16K),true)
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
 TARGET_RW_FILE_SYSTEM_TYPE := ext4
diff --git a/device-shiba.mk b/device-shiba.mk
index 4965a07..a2c19b9 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -24,9 +24,7 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers
 
 LOCAL_PATH := device/google/shusky
 
-DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false)
-
-ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
+ifeq ($(PRODUCT_BOOTS_16K),true)
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb
 TARGET_RW_FILE_SYSTEM_TYPE := ext4