diff --git a/builder.json b/builder.json
index c83cfbdb368..f0e3ed82194 100644
--- a/builder.json
+++ b/builder.json
@@ -6,7 +6,7 @@
         "gradlew": "{source_dir}/gradlew -p {source_dir}"
     },
     "build_steps": [
-        "{gradlew} assemble"
+        "{gradlew} assemble --parallel"
     ],
     "test_steps": [
         "{gradlew} publishToMavenLocal",
@@ -20,18 +20,6 @@
     "env": {
         "JAVA_HOME": "{java_home}"
     },
-    "hosts": {
-        "ubuntu": {
-            "packages": [
-                "openjdk-8-jdk-headless"
-            ]
-        },
-        "debian": {
-            "packages": [
-                "openjdk-8-jdk-headless"
-            ]
-        }
-    },
     "upstream": [
         {
             "name": "smithy-kotlin"
@@ -39,5 +27,13 @@
         {
             "name": "aws-crt-kotlin"
         }
-    ]
+    ],
+    "variants": {
+        "codebuild-svc-check": {
+            "!imports": [],
+            "!test_steps": [
+                "{gradlew} test allTests"
+            ]
+        }
+    }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cbfbc417b8f..ffed3a254e9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists