diff --git a/BoardConfig-shusky-common.mk b/BoardConfig-shusky-common.mk
index f2ede26..90ceb83 100644
--- a/BoardConfig-shusky-common.mk
+++ b/BoardConfig-shusky-common.mk
@@ -14,7 +14,11 @@
 # limitations under the License.
 #
 
-ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true)
+ifeq ($(TARGET_BOOTS_16K),true)
+# Configures the 16kb kernel directory.
+TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
+
+else ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true)
 # Configures the 16kb kernel and modules for OTA updates.
 TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_DIR)/16kb
 BOARD_KERNEL_PATH_16K := $(TARGET_KERNEL_DIR_16K)/Image.lz4
diff --git a/device-husky.mk b/device-husky.mk
index 50a1582..a9f860d 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -31,11 +31,7 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),)
     include device/google/shusky/uwb/uwb_calibration.mk
 endif
 
-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
-else
+ifneq ($(TARGET_BOOTS_16K),true)
 PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION)
 endif
 
diff --git a/device-shiba.mk b/device-shiba.mk
index f96a9a1..d178c67 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -24,11 +24,7 @@ TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers
 
 LOCAL_PATH := device/google/shusky
 
-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
-else
+ifneq ($(TARGET_BOOTS_16K),true)
 PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION)
 endif