diff --git a/BoardConfig-shusky-common.mk b/BoardConfig-shusky-common.mk
index d23edb3..f2ede26 100644
--- a/BoardConfig-shusky-common.mk
+++ b/BoardConfig-shusky-common.mk
@@ -29,4 +29,5 @@ BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K
 BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module)))
 
 BOARD_16K_OTA_USE_INCREMENTAL := true
+BOARD_16K_OTA_MOVE_VENDOR := true
 endif
\ No newline at end of file
diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk
index c005922..00ac252 100644
--- a/aosp_husky_pgagnostic.mk
+++ b/aosp_husky_pgagnostic.mk
@@ -20,7 +20,6 @@ PRODUCT_MODEL := AOSP page-size agnostic Husky 16KB ELF
 
 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
 PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
-PRODUCT_16K_DEVELOPER_OPTION := true
 
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 
diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk
index 91a9992..40f0a48 100644
--- a/aosp_shiba_pgagnostic.mk
+++ b/aosp_shiba_pgagnostic.mk
@@ -20,7 +20,6 @@ PRODUCT_MODEL := AOSP page-size agnostic Shiba 16KB ELF
 
 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
 PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
-PRODUCT_16K_DEVELOPER_OPTION := true
 
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 
diff --git a/device-husky.mk b/device-husky.mk
index 1599407..62608e8 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -38,7 +38,7 @@ TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
 TARGET_RW_FILE_SYSTEM_TYPE := ext4
 else
-PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION)
+PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION)
 endif
 
 $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-husky.mk)