diff --git a/build_targets.json b/build_targets.json
index 67db9ea..66a9554 100644
--- a/build_targets.json
+++ b/build_targets.json
@@ -3,6 +3,7 @@
       "cf2",
       "bolt",
       "tag",
-      "flapper"
+      "flapper",
+      "cf21bl"
     ]
   }
diff --git a/tools/build/package b/tools/build/package
index 4674796..693b4ce 100755
--- a/tools/build/package
+++ b/tools/build/package
@@ -91,7 +91,7 @@ def _download_latest(path, repository: str, branch: str, fw_platform: str) -> st
     found_artifact = None
     if fw_platform is not None:
         for artifact in artifacts['artifacts']:
-            if artifact["name"].startswith(fw_platform):
+            if artifact["name"].split('-')[0] == fw_platform:
                 found_artifact = artifact
                 version = found_artifact['name'].replace(fw_platform + "-", "")
                 break