diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg
new file mode 100644
index 0000000000..5187836f8d
--- /dev/null
+++ b/infra/config/generated/commit-queue.cfg
@@ -0,0 +1,33 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see Config message:
+#   https://luci-config.appspot.com/schemas/projects:commit-queue.cfg
+
+config_groups {
+  name: "main_repo"
+  gerrit {
+    url: "https://chromium-review.googlesource.com"
+    projects {
+      name: "crosvm/crosvm"
+      ref_regexp: "refs/heads/.+"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "mdb/crosvm-acl-luci-admin"
+    }
+    tryjob {
+      builders {
+        name: "crosvm/try/Verify CL"
+      }
+      retry_config {
+        single_quota: 1
+        global_quota: 2
+        failure_weight: 100
+        transient_failure_weight: 1
+        timeout_weight: 100
+      }
+    }
+  }
+}
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index 67556497e1..94df5c2758 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -32,6 +32,27 @@ buckets {
         value: 100
       }
     }
+    builders {
+      name: "Verify CL"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu"
+      dimensions: "pool:luci.crosvm.ci"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/crosvm/crosvm"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "recipe": "verify_cl"'
+        '}'
+      service_account: "crosvm-luci-ci-builder@crosvm-infra.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
   }
 }
 buckets {
@@ -45,4 +66,27 @@ buckets {
   acls {
     group: "all"
   }
+  swarming {
+    builders {
+      name: "Verify CL"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu"
+      dimensions: "pool:luci.crosvm.try"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/crosvm/crosvm"
+        cipd_version: "refs/heads/main"
+        cmd: "luciexe"
+      }
+      properties:
+        '{'
+        '  "recipe": "verify_cl"'
+        '}'
+      service_account: "crosvm-luci-try-builder@crosvm-infra.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+    }
+  }
 }
diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg
new file mode 100644
index 0000000000..11f63a7938
--- /dev/null
+++ b/infra/config/generated/luci-milo.cfg
@@ -0,0 +1,16 @@
+# Auto-generated by lucicfg.
+# Do not modify manually.
+#
+# For the schema of this file, see Project message:
+#   https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
+
+consoles {
+  id: "CI builders"
+  name: "CI builders"
+  repo_url: "https://chromium.googlesource.com/crosvm/crosvm"
+  refs: "regexp:refs/heads/main"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.crosvm.ci/Verify CL"
+  }
+}
diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg
index 0d0d9fdc2a..9453cf94f4 100644
--- a/infra/config/generated/luci-scheduler.cfg
+++ b/infra/config/generated/luci-scheduler.cfg
@@ -15,6 +15,26 @@ job {
     builder: "Example Builder"
   }
 }
+job {
+  id: "Verify CL"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "Verify CL"
+  }
+}
+trigger {
+  id: "main source"
+  realm: "ci"
+  acl_sets: "ci"
+  triggers: "Verify CL"
+  gitiles {
+    repo: "https://chromium.googlesource.com/crosvm/crosvm"
+    refs: "regexp:refs/heads/main"
+  }
+}
 acl_sets {
   name: "ci"
   acls {
diff --git a/infra/config/generated/realms.cfg b/infra/config/generated/realms.cfg
index 62221125a9..917598e70b 100644
--- a/infra/config/generated/realms.cfg
+++ b/infra/config/generated/realms.cfg
@@ -77,4 +77,8 @@ realms {
 }
 realms {
   name: "try"
+  bindings {
+    role: "role/buildbucket.builderServiceAccount"
+    principals: "user:crosvm-luci-try-builder@crosvm-infra.iam.gserviceaccount.com"
+  }
 }
diff --git a/infra/config/main.star b/infra/config/main.star
index 152bd658c1..798ee00e2f 100755
--- a/infra/config/main.star
+++ b/infra/config/main.star
@@ -124,3 +124,52 @@ luci.builder(
     schedule = "with 1m interval",
     service_account = "crosvm-luci-ci-builder@crosvm-infra.iam.gserviceaccount.com",
 )
+
+# Create builders for change verifier
+def verify_builder(bucket):
+    luci.builder(
+        name = "Verify CL",
+        bucket = bucket,
+        executable = luci.recipe(
+            name = "verify_cl",
+        ),
+        service_account = "crosvm-luci-%s-builder@crosvm-infra.iam.gserviceaccount.com" % bucket,
+        dimensions = {
+            "os": "Ubuntu",
+            "cpu": "x86-64",
+            "pool": "luci.crosvm.%s" % bucket,
+        },
+    )
+
+verify_builder("try")
+verify_builder("ci")
+
+# Create CQ group to watch crosvm
+luci.cq_group(
+    name = "main_repo",
+    watch = cq.refset(
+        repo = "https://chromium.googlesource.com/crosvm/crosvm",
+        refs = ["refs/heads/.+"],  # will watch all branches
+    ),
+)
+
+# Attach our "Verify CL" builder to this CQ group.
+luci.cq_tryjob_verifier(
+    builder = "try/Verify CL",
+    cq_group = "main_repo",
+)
+
+# Configure postsubmit tests running in ci pool
+luci.gitiles_poller(
+    name = "main source",
+    bucket = "ci",
+    repo = "https://chromium.googlesource.com/crosvm/crosvm",
+    triggers = ["ci/Verify CL"],
+)
+luci.console_view(
+    name = "CI builders",
+    repo = "https://chromium.googlesource.com/crosvm/crosvm",
+    entries = [
+        luci.console_view_entry(builder = "ci/Verify CL"),
+    ],
+)