diff --git a/google_devices/dragon/device-vendor.mk b/google_devices/dragon/device-vendor.mk
index e517c724..9bf84fe7 100644
--- a/google_devices/dragon/device-vendor.mk
+++ b/google_devices/dragon/device-vendor.mk
@@ -26,4 +26,4 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     DragonKeyboardFirmwareUpdater \
     GCS \
-    HotwordEnrollment
+    HotwordEnrollmentRT5677
diff --git a/google_devices/dragon/proprietary/app/UserInfoWidget/UserInfoWidget.apk b/google_devices/dragon/proprietary/app/UserInfoWidget/UserInfoWidget.apk
index 19493adc..aec584c3 100644
Binary files a/google_devices/dragon/proprietary/app/UserInfoWidget/UserInfoWidget.apk and b/google_devices/dragon/proprietary/app/UserInfoWidget/UserInfoWidget.apk differ
diff --git a/google_devices/dragon/proprietary/bin/tsec_service b/google_devices/dragon/proprietary/bin/tsec_service
index 9cf1a7b8..f9819bf3 100755
Binary files a/google_devices/dragon/proprietary/bin/tsec_service and b/google_devices/dragon/proprietary/bin/tsec_service differ
diff --git a/google_devices/dragon/proprietary/bin/vkinfo b/google_devices/dragon/proprietary/bin/vkinfo
index 6b0c6833..3cc7c2b2 100755
Binary files a/google_devices/dragon/proprietary/bin/vkinfo and b/google_devices/dragon/proprietary/bin/vkinfo differ
diff --git a/google_devices/dragon/proprietary/nvdec_ns.bin b/google_devices/dragon/proprietary/nvdec_ns.bin
index 7500912c..b1733123 100644
Binary files a/google_devices/dragon/proprietary/nvdec_ns.bin and b/google_devices/dragon/proprietary/nvdec_ns.bin differ
diff --git a/google_devices/dragon/proprietary/nvdec_prod.bin b/google_devices/dragon/proprietary/nvdec_prod.bin
index 50a1bdab..25b4a059 100644
Binary files a/google_devices/dragon/proprietary/nvdec_prod.bin and b/google_devices/dragon/proprietary/nvdec_prod.bin differ
diff --git a/google_devices/dragon/proprietary/priv-app/Android.mk b/google_devices/dragon/proprietary/priv-app/Android.mk
index 88c89aa6..cae4bd46 100644
--- a/google_devices/dragon/proprietary/priv-app/Android.mk
+++ b/google_devices/dragon/proprietary/priv-app/Android.mk
@@ -37,9 +37,9 @@ LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := HotwordEnrollment
+LOCAL_MODULE := HotwordEnrollmentRT5677
 LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := HotwordEnrollment/HotwordEnrollment.apk
+LOCAL_SRC_FILES := HotwordEnrollmentRT5677/HotwordEnrollmentRT5677.apk
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_CLASS := APPS
 LOCAL_PRIVILEGED_MODULE := true
diff --git a/google_devices/dragon/proprietary/priv-app/DragonKeyboardFirmwareUpdater/DragonKeyboardFirmwareUpdater.apk b/google_devices/dragon/proprietary/priv-app/DragonKeyboardFirmwareUpdater/DragonKeyboardFirmwareUpdater.apk
index a6c9e841..4b71306d 100644
Binary files a/google_devices/dragon/proprietary/priv-app/DragonKeyboardFirmwareUpdater/DragonKeyboardFirmwareUpdater.apk and b/google_devices/dragon/proprietary/priv-app/DragonKeyboardFirmwareUpdater/DragonKeyboardFirmwareUpdater.apk differ
diff --git a/google_devices/dragon/proprietary/priv-app/GCS/GCS.apk b/google_devices/dragon/proprietary/priv-app/GCS/GCS.apk
index 7350dbb4..28540c72 100644
Binary files a/google_devices/dragon/proprietary/priv-app/GCS/GCS.apk and b/google_devices/dragon/proprietary/priv-app/GCS/GCS.apk differ
diff --git a/google_devices/dragon/proprietary/priv-app/HotwordEnrollment/HotwordEnrollment.apk b/google_devices/dragon/proprietary/priv-app/HotwordEnrollmentRT5677/HotwordEnrollmentRT5677.apk
similarity index 97%
rename from google_devices/dragon/proprietary/priv-app/HotwordEnrollment/HotwordEnrollment.apk
rename to google_devices/dragon/proprietary/priv-app/HotwordEnrollmentRT5677/HotwordEnrollmentRT5677.apk
index 64b2f4b8..c30690bc 100644
Binary files a/google_devices/dragon/proprietary/priv-app/HotwordEnrollment/HotwordEnrollment.apk and b/google_devices/dragon/proprietary/priv-app/HotwordEnrollmentRT5677/HotwordEnrollmentRT5677.apk differ