diff --git a/BoardConfig.mk b/BoardConfig.mk
index b25f143..cf4997f 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -150,6 +150,7 @@ TW_FRAMERATE := 60
 TARGET_USES_MKE2FS := true
 TW_NO_SCREEN_BLANK := true
 TW_EXCLUDE_APEX := true
+TW_INCLUDE_FASTBOOT := true
 TW_SUPPORT_INPUT_1_2_HAPTICS := true
 TW_PREPARE_DATA_MEDIA_EARLY := true
 TW_BACKUP_EXCLUSIONS := /data/fonts
diff --git a/device.mk b/device.mk
index f805439..50f9358 100755
--- a/device.mk
+++ b/device.mk
@@ -14,9 +14,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
 
 # Fastbootd
 PRODUCT_PACKAGES += \
-    android.hardware.fastboot@1.1-impl-mock \
-    android.hardware.fastboot@1.1-impl-mock.recovery \
-    fastbootd
+    android.hardware.fastboot@1.1-impl-mock
 
 # API
 PRODUCT_SHIPPING_API_LEVEL := 29