diff --git a/device-husky.mk b/device-husky.mk
index dbf08ce..baa151b 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -36,6 +36,7 @@ DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false
 ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
 endif
 
 $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-husky.mk)
diff --git a/device-shiba.mk b/device-shiba.mk
index b7f3371..bc95cb8 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -28,7 +28,8 @@ DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false
 
 ifeq ($(DEVICE_PAGE_AGNOSTIC),true)
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
-TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb
+TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
 endif
 
 $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk)
diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk
index 26de30d..f387ff9 100644
--- a/husky/BoardConfig.mk
+++ b/husky/BoardConfig.mk
@@ -28,9 +28,9 @@ TARGET_BOOTLOADER_BOARD_NAME := husky
 
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR)
 RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
-RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= trunk # Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= pdk# Keep this for pdk TODO: b/327119000
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)
-$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR))
+$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR))
 
 ifdef PHONE_CAR_BOARD_PRODUCT
     include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk
index f7ec3e1..76f2b5d 100644
--- a/ripcurrent/BoardConfig.mk
+++ b/ripcurrent/BoardConfig.mk
@@ -27,9 +27,9 @@ TARGET_SCREEN_DENSITY := 440
 BOARD_USES_GENERIC_AUDIO := true
 USES_DEVICE_GOOGLE_SHUSKY := true
 
-RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= trunk # Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= pdk# Keep this for pdk TODO: b/327119000
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)
-$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR))
+$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR))
 
 include device/google/shusky/device-shusky-common.mk
 
diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk
index 579230b..8a5fb4b 100644
--- a/shiba/BoardConfig.mk
+++ b/shiba/BoardConfig.mk
@@ -28,9 +28,9 @@ TARGET_BOOTLOADER_BOARD_NAME := shiba
 
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR)
 RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
-RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= trunk # Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000
 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)
-$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR))
+$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR))
 
 ifdef PHONE_CAR_BOARD_PRODUCT
     include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk