diff --git a/autoroll/config/chromium-angle.cfg b/autoroll/config/chromium-angle.cfg
index a05ce61..175a65e 100644
--- a/autoroll/config/chromium-angle.cfg
+++ b/autoroll/config/chromium-angle.cfg
@@ -27,7 +27,7 @@
 gerrit:  {
   url:  "https://chromium-review.googlesource.com"
   project:  "angle/angle"
-  config:  ANGLE
+  config:  CHROMIUM_BOT_COMMIT
 }
 kubernetes:  {
   cpu:  "2"
@@ -58,7 +58,7 @@
     gerrit:  {
       url:  "https://chromium-review.googlesource.com"
       project:  "angle/angle"
-      config:  ANGLE
+      config:  CHROMIUM_BOT_COMMIT
     }
   }
   gitiles_child:  {
diff --git a/autoroll/config/swiftshader-angle.cfg b/autoroll/config/swiftshader-angle.cfg
index c764466..0d559c5 100644
--- a/autoroll/config/swiftshader-angle.cfg
+++ b/autoroll/config/swiftshader-angle.cfg
@@ -28,7 +28,7 @@
 gerrit:  {
   url:  "https://chromium-review.googlesource.com"
   project:  "angle/angle"
-  config:  ANGLE
+  config:  CHROMIUM_BOT_COMMIT
 }
 kubernetes:  {
   cpu:  "1"
@@ -52,7 +52,7 @@
     gerrit:  {
       url:  "https://chromium-review.googlesource.com"
       project:  "angle/angle"
-      config:  ANGLE
+      config:  CHROMIUM_BOT_COMMIT
     }
   }
   gitiles_child:  {
diff --git a/autoroll/config/vk-gl-cts-angle.cfg b/autoroll/config/vk-gl-cts-angle.cfg
index bf61045..9b909ef 100644
--- a/autoroll/config/vk-gl-cts-angle.cfg
+++ b/autoroll/config/vk-gl-cts-angle.cfg
@@ -24,7 +24,7 @@
 gerrit:  {
   url:  "https://chromium-review.googlesource.com"
   project:  "angle/angle"
-  config:  ANGLE
+  config:  CHROMIUM_BOT_COMMIT
 }
 kubernetes:  {
   cpu:  "2"
@@ -57,7 +57,7 @@
     gerrit:  {
       url:  "https://chromium-review.googlesource.com"
       project:  "angle/angle"
-      config:  ANGLE
+      config:  CHROMIUM_BOT_COMMIT
     }
   }
   git_checkout_child:  {
diff --git a/autoroll/config/vulkan-deps-angle.cfg b/autoroll/config/vulkan-deps-angle.cfg
index f332a8c..e5bae1a 100644
--- a/autoroll/config/vulkan-deps-angle.cfg
+++ b/autoroll/config/vulkan-deps-angle.cfg
@@ -24,7 +24,7 @@
 gerrit:  {
   url:  "https://chromium-review.googlesource.com"
   project:  "angle/angle"
-  config:  ANGLE
+  config:  CHROMIUM_BOT_COMMIT
 }
 kubernetes:  {
   cpu:  "2"
@@ -58,7 +58,7 @@
     gerrit:  {
       url:  "https://chromium-review.googlesource.com"
       project:  "angle/angle"
-      config:  ANGLE
+      config:  CHROMIUM_BOT_COMMIT
     }
   }
   git_checkout_child:  {
diff --git a/infra/bots/task_drivers/validate_autoroll_configs/validate_autoroll_configs.go b/infra/bots/task_drivers/validate_autoroll_configs/validate_autoroll_configs.go
index 5731895..fe5b6c3 100644
--- a/infra/bots/task_drivers/validate_autoroll_configs/validate_autoroll_configs.go
+++ b/infra/bots/task_drivers/validate_autoroll_configs/validate_autoroll_configs.go
@@ -36,10 +36,9 @@
 
 var (
 	// "constants"
-	chromiumServiceAccounts = []string{
-		"chromium-autoroll@skia-public.iam.gserviceaccount.com",
-		"chromium-release-autoroll@skia-public.iam.gserviceaccount.com",
-		"chromium-internal-autoroll@skia-corp.google.com.iam.gserviceaccount.com",
+	chromiumGerritHosts = []string{
+		"https://chromium-review.googlesource.com",
+		"https://chrome-internal-review.googlesource.com",
 	}
 )
 
@@ -65,11 +64,10 @@
 		if err := cfg.Validate(); err != nil {
 			return skerr.Wrap(err)
 		}
-		if util.In(cfg.ServiceAccount, chromiumServiceAccounts) {
-			gerrit := cfg.GetGerrit()
-			if gerrit != nil && gerrit.Config == config.GerritConfig_CHROMIUM || gerrit.Config == config.GerritConfig_CHROMIUM_NO_CQ {
-				return skerr.Fmt("Chromium rollers must use Gerrit config CHROMIUM_BOT_COMMIT")
-			}
+
+		gerrit := cfg.GetGerrit()
+		if gerrit != nil && util.In(gerrit.Url, chromiumGerritHosts) && (gerrit.Config != config.GerritConfig_CHROMIUM_BOT_COMMIT && gerrit.Config != config.GerritConfig_CHROMIUM_BOT_COMMIT_NO_CQ) {
+			return skerr.Fmt("Chromium rollers must use Gerrit config CHROMIUM_BOT_COMMIT")
 		}
 
 		rollerName = cfg.RollerName