diff --git a/PRESUBMIT.py b/PRESUBMIT.py
deleted file mode 100755
index 04c2a5be6..000000000
--- a/PRESUBMIT.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2014 The LibYuv Project Authors. All rights reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS. All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-import re
-import sys
-
-
-def GetDefaultTryConfigs(bots=None):
-  """Returns a list of ('bot', set(['tests']), optionally filtered by [bots].
-
-  For WebRTC purposes, we always return an empty list of tests, since we want
-  to run all tests by default on all our trybots.
-  """
-  return { 'tryserver.libyuv': dict((bot, []) for bot in bots)}
-
-
-# pylint: disable=W0613
-def GetPreferredTryMasters(project, change):
-  files = change.LocalPaths()
-  bots = [
-    'win',
-    'win_rel',
-    'win_x64_rel',
-    'win_clang',
-    'win_clang_rel',
-    'win_x64_clang_rel',
-    'mac',
-    'mac_rel',
-    'mac_asan',
-    'ios',
-    'ios_rel',
-    'ios_arm64',
-    'ios_arm64_rel',
-    'linux',
-    'linux_rel',
-    'linux_memcheck',
-    'linux_tsan2',
-    'linux_asan',
-    'linux_msan',
-    'linux_ubsan',
-    'linux_ubsan_vptr',
-    'android',
-    'android_rel',
-    'android_clang',
-    'android_arm64',
-    'android_mips',
-    'android_x64',
-    'android_x86',
-  ]
-  if not files or all(re.search(r'[\\/]OWNERS$', f) for f in files):
-    return {}
-  return GetDefaultTryConfigs(bots)
diff --git a/infra/config/OWNERS b/infra/config/OWNERS
new file mode 100644
index 000000000..02eccd5eb
--- /dev/null
+++ b/infra/config/OWNERS
@@ -0,0 +1,3 @@
+set noparent
+agable@chromium.org
+kjellander@chromium.org
diff --git a/infra/config/README.md b/infra/config/README.md
new file mode 100644
index 000000000..c036d610c
--- /dev/null
+++ b/infra/config/README.md
@@ -0,0 +1 @@
+This directory contains configuration files for infra services.
diff --git a/infra/config/cq.cfg b/infra/config/cq.cfg
new file mode 100644
index 000000000..7a0d2d84f
--- /dev/null
+++ b/infra/config/cq.cfg
@@ -0,0 +1,61 @@
+# Commit Queue configuration file. The documentation of the format can be found
+# at http://luci-config.appspot.com/schemas/projects/refs:cq.cfg.
+
+version: 1
+cq_name: "libyuv"
+cq_status_url: "https://chromium-cq-status.appspot.com"
+git_repo_url: "https://chromium.googlesource.com/libyuv/libyuv.git"
+
+gerrit {}
+rietveld {
+  url: "https://codereview.chromium.org"
+}
+
+
+verifiers {
+  reviewer_lgtm {
+    committer_list: "project-libyuv-committers"
+  }
+
+  try_job {
+    buckets {
+      name: "master.tryserver.libyuv"
+      builders { name: "win" }
+      builders { name: "win_rel" }
+      builders { name: "win_x64_rel" }
+      builders { name: "win_clang" }
+      builders { name: "win_clang_rel" }
+      builders { name: "win_x64_clang_rel" }
+      builders { name: "mac" }
+      builders { name: "mac_rel" }
+      builders { name: "mac_asan" }
+      builders { name: "ios" }
+      builders { name: "ios_rel" }
+      builders { name: "ios_arm64" }
+      builders { name: "ios_arm64_rel" }
+      builders { name: "linux" }
+      builders { name: "linux_rel" }
+      builders {
+        name: "linux_gcc"
+        experiment_percentage: 100
+      }
+      builders { name: "linux_memcheck" }
+      builders { name: "linux_msan" }
+      builders { name: "linux_tsan2" }
+      builders { name: "linux_asan" }
+      builders { name: "linux_msan" }
+      builders { name: "linux_ubsan" }
+      builders { name: "linux_ubsan_vptr" }
+      builders { name: "android" }
+      builders { name: "android_rel" }
+      builders { name: "android_clang" }
+      builders { name: "android_arm64" }
+      builders { name: "android_x86" }
+      builders { name: "android_x64" }
+      builders {
+        name: "android_mips"
+        experiment_percentage: 100
+      }
+    }
+  }
+}