diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 0390c151..4475c567 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,9 +16,11 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_caiman.mk \
+    $(LOCAL_DIR)/aosp_caiman_16k.mk \
     $(LOCAL_DIR)/aosp_caiman_fullmte.mk \
     $(LOCAL_DIR)/factory_caiman.mk \
     $(LOCAL_DIR)/aosp_komodo.mk \
+    $(LOCAL_DIR)/aosp_komodo_16k.mk \
     $(LOCAL_DIR)/aosp_komodo_fullmte.mk \
     $(LOCAL_DIR)/factory_komodo.mk \
     $(LOCAL_DIR)/aosp_ripcurrentpro.mk \
@@ -28,6 +30,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_ripcurrent24_fullmte.mk \
     $(LOCAL_DIR)/factory_ripcurrent24.mk \
     $(LOCAL_DIR)/aosp_tokay.mk \
+    $(LOCAL_DIR)/aosp_tokay_16k.mk \
     $(LOCAL_DIR)/aosp_tokay_fullmte.mk \
     $(LOCAL_DIR)/factory_tokay.mk
 COMMON_LUNCH_CHOICES := \
diff --git a/aosp_caiman_16k.mk b/aosp_caiman_16k.mk
new file mode 100644
index 00000000..34c68737
--- /dev/null
+++ b/aosp_caiman_16k.mk
@@ -0,0 +1,7 @@
+$(call inherit-product, device/google/caimito/aosp_caiman.mk)
+
+PRODUCT_NAME := aosp_caiman_16k
+
+TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
+TARGET_BOOTS_16K := true
diff --git a/aosp_komodo_16k.mk b/aosp_komodo_16k.mk
new file mode 100644
index 00000000..6333a486
--- /dev/null
+++ b/aosp_komodo_16k.mk
@@ -0,0 +1,7 @@
+$(call inherit-product, device/google/caimito/aosp_komodo.mk)
+
+PRODUCT_NAME := aosp_komodo_16k
+
+TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
+TARGET_BOOTS_16K := true
diff --git a/aosp_tokay_16k.mk b/aosp_tokay_16k.mk
new file mode 100644
index 00000000..17791dcc
--- /dev/null
+++ b/aosp_tokay_16k.mk
@@ -0,0 +1,7 @@
+$(call inherit-product, device/google/caimito/aosp_tokay.mk)
+
+PRODUCT_NAME := aosp_tokay_16k
+
+TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
+TARGET_BOOTS_16K := true