diff --git a/tools/luci/config/generated/cr-buildbucket.cfg b/tools/luci/config/generated/cr-buildbucket.cfg
index 1e207d5..c6cdc02 100644
--- a/tools/luci/config/generated/cr-buildbucket.cfg
+++ b/tools/luci/config/generated/cr-buildbucket.cfg
@@ -23,11 +23,13 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:32"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
         properties_j: "debug:true"
         properties_j: "device:\"angler-armv7\""
         properties_j: "generational_cc:true"
+        properties_j: "product:\"arm_krait\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
@@ -51,11 +53,13 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:32"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
         properties_j: "debug:false"
         properties_j: "device:\"angler-armv7\""
         properties_j: "generational_cc:true"
+        properties_j: "product:\"arm_krait\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
@@ -80,11 +84,13 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:32"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:false"
         properties_j: "debug:true"
         properties_j: "device:\"angler-armv7\""
         properties_j: "generational_cc:false"
+        properties_j: "product:\"arm_krait\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
@@ -108,11 +114,13 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:64"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
         properties_j: "debug:true"
         properties_j: "device:\"angler-armv8\""
         properties_j: "generational_cc:true"
+        properties_j: "product:\"armv8\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
@@ -136,11 +144,13 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:64"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
         properties_j: "debug:false"
         properties_j: "device:\"angler-armv8\""
         properties_j: "generational_cc:true"
+        properties_j: "product:\"armv8\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
@@ -165,11 +175,13 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:64"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:false"
         properties_j: "debug:true"
         properties_j: "device:\"angler-armv8\""
         properties_j: "generational_cc:false"
+        properties_j: "product:\"armv8\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
@@ -193,12 +205,14 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:32"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
         properties_j: "debug:false"
         properties_j: "device:\"bullhead-armv7\""
         properties_j: "gcstress:true"
         properties_j: "generational_cc:true"
+        properties_j: "product:\"arm_krait\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
@@ -222,12 +236,14 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:64"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
         properties_j: "debug:true"
         properties_j: "device:\"bullhead-armv8\""
         properties_j: "gcstress:true"
         properties_j: "generational_cc:true"
+        properties_j: "product:\"armv8\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
@@ -251,12 +267,14 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:64"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
         properties_j: "debug:false"
         properties_j: "device:\"bullhead-armv8\""
         properties_j: "gcstress:true"
         properties_j: "generational_cc:true"
+        properties_j: "product:\"armv8\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
@@ -593,6 +611,7 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:64"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
         properties_j: "debug:false"
@@ -622,6 +641,7 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:64"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
         properties_j: "debug:false"
@@ -651,6 +671,7 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:64"
         properties_j: "build_only:true"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
@@ -681,12 +702,14 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:32"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
         properties_j: "debug:true"
         properties_j: "device:\"walleye-armv7\""
         properties_j: "generational_cc:true"
         properties_j: "heap_poisoning:true"
+        properties_j: "product:\"arm_krait\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
@@ -710,12 +733,14 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:64"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
         properties_j: "debug:true"
         properties_j: "device:\"walleye-armv8\""
         properties_j: "generational_cc:true"
         properties_j: "heap_poisoning:true"
+        properties_j: "product:\"armv8\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
@@ -739,12 +764,14 @@
         name: "art"
         cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
         cipd_version: "refs/heads/main"
+        properties_j: "bitness:64"
         properties_j: "builder_group:\"client.art\""
         properties_j: "concurrent_collector:true"
         properties_j: "debug:false"
         properties_j: "device:\"walleye-armv8\""
         properties_j: "generational_cc:true"
         properties_j: "heap_poisoning:true"
+        properties_j: "product:\"armv8\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
diff --git a/tools/luci/config/main.star b/tools/luci/config/main.star
index aa5dcd5..0320ce6 100755
--- a/tools/luci/config/main.star
+++ b/tools/luci/config/main.star
@@ -217,8 +217,10 @@
         short_name="dbg",
         dimensions=target_dims,
         properties={
+            "bitness": 32,
             "device": "angler-armv7",
             "debug": True,
+            "product": "arm_krait",
         }
     )
     ci_builder(
@@ -227,10 +229,12 @@
         short_name="ngen",
         dimensions=userfault_gc_target_dims,
         properties={
+            "bitness": 32,
             "device": "angler-armv7",
             "debug": True,
             "concurrent_collector": False,
             "generational_cc": False,
+            "product": "arm_krait",
         }
     )
     ci_builder(
@@ -239,8 +243,10 @@
         short_name="ndbg",
         dimensions=target_dims,
         properties={
+            "bitness": 32,
             "device": "angler-armv7",
             "debug": False,
+            "product": "arm_krait",
         }
     )
     ci_builder(
@@ -249,8 +255,10 @@
         short_name="dbg",
         dimensions=target_dims,
         properties={
+            "bitness": 64,
             "device": "angler-armv8",
             "debug": True,
+            "product": "armv8",
         }
     )
     ci_builder(
@@ -259,10 +267,12 @@
         short_name="ngen",
         dimensions=userfault_gc_target_dims,
         properties={
+            "bitness": 64,
             "device": "angler-armv8",
             "debug": True,
             "concurrent_collector": False,
             "generational_cc": False,
+            "product": "armv8",
         }
     )
     ci_builder(
@@ -271,8 +281,10 @@
         short_name="ndbg",
         dimensions=target_dims,
         properties={
+            "bitness": 64,
             "device": "angler-armv8",
             "debug": False,
+            "product": "armv8",
         }
     )
     ci_builder(
@@ -281,9 +293,11 @@
         short_name="dbg",
         dimensions=target_dims,
         properties={
+            "bitness": 32,
             "device": "bullhead-armv7",
             "debug": False,
             "gcstress": True,
+            "product": "arm_krait",
         }
     )
     ci_builder(
@@ -292,9 +306,11 @@
         short_name="dbg",
         dimensions=target_dims,
         properties={
+            "bitness": 64,
             "device": "bullhead-armv8",
             "debug": True,
             "gcstress": True,
+            "product": "armv8",
         }
     )
     ci_builder(
@@ -303,9 +319,11 @@
         short_name="ndbg",
         dimensions=target_dims,
         properties={
+            "bitness": 64,
             "device": "bullhead-armv8",
             "debug": False,
             "gcstress": True,
+            "product": "armv8",
         }
     )
     ci_builder(
@@ -314,9 +332,11 @@
         short_name="dbg",
         dimensions=target_dims,
         properties={
+            "bitness": 32,
             "device": "walleye-armv7",
             "debug": True,
             "heap_poisoning": True,
+            "product": "arm_krait",
         }
     )
     ci_builder(
@@ -325,9 +345,11 @@
         short_name="dbg",
         dimensions=target_dims,
         properties={
+            "bitness": 64,
             "device": "walleye-armv8",
             "debug": True,
             "heap_poisoning": True,
+            "product": "armv8",
         }
     )
     ci_builder(
@@ -336,9 +358,11 @@
         short_name="ndbg",
         dimensions=target_dims,
         properties={
+            "bitness": 64,
             "device": "walleye-armv8",
             "debug": False,
             "heap_poisoning": True,
+            "product": "armv8",
         }
     )
 
@@ -471,6 +495,7 @@
         dimensions=host_dims,
         is_fyi=True,
         properties={
+            "bitness": 64,
             "debug": False,
             "device": "qemu-armv8",
             "on_virtual_machine": True,
@@ -483,6 +508,7 @@
         dimensions=host_dims,
         is_fyi=True,
         properties={
+            "bitness": 64,
             "debug": False,
             "device": "qemu-riscv64",
             "on_virtual_machine": True,
@@ -494,6 +520,7 @@
         short_name="bo",
         dimensions=host_dims,
         properties={
+            "bitness": 64,
             "build_only": True,
             "debug": False,
             "device": "qemu-riscv64",