diff --git a/build.gradle b/build.gradle
index ba674e610f4..776af9d3394 100644
--- a/build.gradle
+++ b/build.gradle
@@ -604,8 +604,25 @@ for ( sv in availableScalaVersions ) {
   }
 }
 
-def connectPkgs = ['connect:api', 'connect:runtime', 'connect:transforms', 'connect:json', 'connect:file', 'connect:basic-auth-extension']
-def pkgs = ['clients', 'examples', 'log4j-appender', 'tools', 'streams', 'streams:streams-scala', 'streams:test-utils', 'streams:examples'] + connectPkgs
+def connectPkgs = [
+    'connect:api',
+    'connect:basic-auth-extension',
+    'connect:file',
+    'connect:json',
+    'connect:runtime',
+    'connect:transforms'
+]
+
+def pkgs = [
+    'clients',
+    'examples',
+    'log4j-appender',
+    'streams',
+    'streams:examples',
+    'streams:streams-scala',
+    'streams:test-utils',
+    'tools'
+] + connectPkgs
 
 /** Create one task per default Scala version */
 def withDefScalaVersions(taskName) {
diff --git a/settings.gradle b/settings.gradle
index 5ae78e40360..b2814b1844d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,8 +13,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-include 'core', 'examples', 'clients', 'tools', 'streams', 'streams:streams-scala', 'streams:test-utils', 'streams:examples',
-        'streams:upgrade-system-tests-0100', 'streams:upgrade-system-tests-0101', 'streams:upgrade-system-tests-0102',
-        'streams:upgrade-system-tests-0110', 'streams:upgrade-system-tests-10', 'streams:upgrade-system-tests-11', 'streams:upgrade-system-tests-20',
-        'streams:upgrade-system-tests-21' , 'log4j-appender', 'connect:api', 'connect:transforms', 'connect:runtime', 'connect:json', 'connect:file',
-        'connect:basic-auth-extension', 'jmh-benchmarks', 'generator'
+include 'clients',
+    'connect:api',
+    'connect:basic-auth-extension',
+    'connect:file',
+    'connect:json',
+    'connect:runtime',
+    'connect:transforms',
+    'core',
+    'examples',
+    'generator',
+    'jmh-benchmarks',
+    'log4j-appender',
+    'streams',
+    'streams:examples',
+    'streams:streams-scala',
+    'streams:test-utils',
+    'streams:upgrade-system-tests-0100',
+    'streams:upgrade-system-tests-0101',
+    'streams:upgrade-system-tests-0102',
+    'streams:upgrade-system-tests-0110',
+    'streams:upgrade-system-tests-10',
+    'streams:upgrade-system-tests-11',
+    'streams:upgrade-system-tests-20',
+    'streams:upgrade-system-tests-21',
+    'tools'