diff --git a/renovate.json5 b/renovate.json5
index 03bf574a5c..49a5ccf9da 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -112,9 +112,31 @@
 			"automerge": true,
 			"labels": ["automerge"],
 		},
+		{
+			"matchUpdateTypes": ["major", "minor", "patch"],
+			"automerge": true,
+			"groupName": "buildTools",
+			"labels": ["automerge"],
+			"extends": ["schedule:monthly"],
+			"matchPackageNames": [
+				// If the apps build and all tests pass, we can assume that Yarn
+				// and TypeScript are safe to upgrade. They are frequently
+				// updated so having them here reduces noise.
+				"eslint",
+				"eslint-*",
+				"@typescript-eslint/*",
+				"yarn",
+				"typescript",
+				"prettier",
+				
+				// If it builds, it should be safe to merge @types/* packages
+				"@types/*",
+			],
+		},
 		{
 			"matchUpdateTypes": ["minor", "patch"],
 			"automerge": true,
+			"groupName": "aws",
 			"labels": ["automerge"],
 			"extends": ["schedule:monthly"],
 			"matchPackageNames": [
@@ -123,22 +145,7 @@
 				"@aws-sdk/client-s3",
 				"@aws-sdk/s3-request-presigner",
 				"aws-sdk",
-
-				// If the apps build and all tests pass, we can assume that Yarn
-				// and TypeScript are safe to upgrade. They are frequently
-				// updated so having them here reduces noise.
-				"eslint",
-				"eslint-config-prettier",
-				"eslint-interactive",
-				"@typescript-eslint/eslint-plugin",
-				"@typescript-eslint/parser",
-				"yarn",
-				"typescript",
-				"prettier",
-				
-				// If it builds, it should be safe to merge @types/* packages
-				"@types/*",
 			],
-		}
+		},
 	]
 }