diff --git a/tools/luci/config/generated/cr-buildbucket.cfg b/tools/luci/config/generated/cr-buildbucket.cfg
index c6cdc02..c7d12b7 100644
--- a/tools/luci/config/generated/cr-buildbucket.cfg
+++ b/tools/luci/config/generated/cr-buildbucket.cfg
@@ -618,6 +618,7 @@
         properties_j: "device:\"qemu-armv8\""
         properties_j: "generational_cc:true"
         properties_j: "on_virtual_machine:true"
+        properties_j: "product:\"armv8\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
@@ -648,6 +649,7 @@
         properties_j: "device:\"qemu-riscv64\""
         properties_j: "generational_cc:true"
         properties_j: "on_virtual_machine:true"
+        properties_j: "product:\"riscv64\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
@@ -679,6 +681,7 @@
         properties_j: "device:\"qemu-riscv64\""
         properties_j: "generational_cc:true"
         properties_j: "on_virtual_machine:true"
+        properties_j: "product:\"riscv64\""
       }
       execution_timeout_secs: 108000
       expiration_secs: 61200
diff --git a/tools/luci/config/main.star b/tools/luci/config/main.star
index 0320ce6..dd7acab 100755
--- a/tools/luci/config/main.star
+++ b/tools/luci/config/main.star
@@ -499,6 +499,7 @@
             "debug": False,
             "device": "qemu-armv8",
             "on_virtual_machine": True,
+            "product": "armv8",
         }
     )
     ci_builder(
@@ -512,6 +513,7 @@
             "debug": False,
             "device": "qemu-riscv64",
             "on_virtual_machine": True,
+            "product": "riscv64",
         }
     )
     ci_builder(
@@ -525,6 +527,7 @@
             "debug": False,
             "device": "qemu-riscv64",
             "on_virtual_machine": True,
+            "product": "riscv64",
         }
     )