diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py
index a4dd1ac..2f4daa6 100755
--- a/build/mainline_modules_sdks.py
+++ b/build/mainline_modules_sdks.py
@@ -771,6 +771,8 @@ MAINLINE_MODULES = [
         apex="com.android.bluetooth",
         sdks=["bluetooth-module-sdk"],
         first_release=Tiramisu,
+        # Bluetooth has always been and is still optional.
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.conscrypt",
@@ -861,6 +863,8 @@ MAINLINE_MODULES = [
         apex="com.android.uwb",
         sdks=["uwb-module-sdk"],
         first_release=Tiramisu,
+        # Uwb has always been and is still optional.
+        last_optional_release=LATEST,
     ),
     MainlineModule(
         apex="com.android.wifi",