diff --git a/build.gradle b/build.gradle
index 356a729011..a4e5651b89 100644
--- a/build.gradle
+++ b/build.gradle
@@ -103,14 +103,26 @@ allprojects {
   targetCompatibility = 11
 
   repositories {
+    maven {
+      url 'https://hyperledger.jfrog.io/hyperledger/besu-maven'
+      content { includeGroupByRegex('org\\.hyperledger\\..*') }
+    }
+    maven {
+      url 'https://artifacts.consensys.net/public/maven/maven/'
+      content { includeGroupByRegex('tech\\.pegasys\\..*') }
+    }
+    maven {
+      url 'https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/'
+      content { includeGroupByRegex('net\\.consensys\\..*') }
+    }
+    maven {
+      url 'https://splunk.jfrog.io/splunk/ext-releases-local'
+      content { includeGroupByRegex('com\\.splunk\\..*') }
+    }
     mavenCentral()
-    maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" }
-    maven { url "https://artifacts.consensys.net/public/maven/maven/" }
-    maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" }
-    maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"}
   }
 
-  dependencies { errorprone "com.google.errorprone:error_prone_core" }
+  dependencies { errorprone 'com.google.errorprone:error_prone_core' }
 
   apply plugin: 'com.diffplug.spotless'
   spotless {
diff --git a/settings.gradle b/settings.gradle
index 86346e0395..68ad95f90d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,13 +16,19 @@
 
 pluginManagement {
   repositories {
-    gradlePluginPortal()
     /*
      *  Temporary repository to host the improved version of the
      *  com.github.hierynomus.license plugin. Can be removed when an
      *  official version with the fix is release upstream
      */
-    maven { url = uri("https://raw.githubusercontent.com/ConsenSys/license-gradle-plugin-fix-artifacts/main/") }
+    maven {
+      url = uri('https://raw.githubusercontent.com/ConsenSys/license-gradle-plugin-fix-artifacts/main/')
+      content {
+        includeGroup('com.github.hierynomus.license')
+        includeGroup('com.hierynomus.gradle.plugins')
+      }
+    }
+    gradlePluginPortal()
   }
 }