diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 63a93bfadb8..183e585e56d 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -7,7 +7,7 @@ ext {
 
     slf4j         : "1.7.30",
     guava         : "20.0", // Last version to support Java 7
-    okhttp        : "3.12.10", // 3.12.x is last version to support Java7)
+    okhttp        : "3.12.12", // 3.12.x is last version to support Java7)
 
     spock         : "1.3-groovy-$spockGroovyVer",
     groovy        : groovyVer,
@@ -28,54 +28,54 @@ ext {
 
   deps = [
     // OpenTracing
-    opentracingApi : dependencies.create(group: 'io.opentracing', name: 'opentracing-api', version: versions.opentracing),
-    opentracing    : [
+    opentracingApi: dependencies.create(group: 'io.opentracing', name: 'opentracing-api', version: versions.opentracing),
+    opentracing   : [
       dependencies.create(group: 'io.opentracing', name: 'opentracing-api', version: versions.opentracing),
       dependencies.create(group: 'io.opentracing', name: 'opentracing-noop', version: versions.opentracing),
       dependencies.create(group: 'io.opentracing', name: 'opentracing-util', version: versions.opentracing),
     ],
 
     // General
-    slf4j          : "org.slf4j:slf4j-api:${versions.slf4j}",
-    guava          : "com.google.guava:guava:$versions.guava",
-    okhttp         : dependencies.create(group: 'com.squareup.okhttp3', name: 'okhttp', version: versions.okhttp),
-    bytebuddy      : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: versions.bytebuddy),
-    bytebuddyagent : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy-agent', version: versions.bytebuddy),
-    autoservice    : [
+    slf4j         : "org.slf4j:slf4j-api:${versions.slf4j}",
+    guava         : "com.google.guava:guava:$versions.guava",
+    okhttp        : dependencies.create(group: 'com.squareup.okhttp3', name: 'okhttp', version: versions.okhttp),
+    bytebuddy     : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: versions.bytebuddy),
+    bytebuddyagent: dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy-agent', version: versions.bytebuddy),
+    autoservice   : [
       dependencies.create(group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'),
       dependencies.create(group: 'com.google.auto', name: 'auto-common', version: '0.8'),
       // These are the last versions that support guava 20.0.  Upgrading has odd interactions with shadow.
       dependencies.create(group: 'com.google.guava', name: 'guava', version: "${versions.guava}"),
     ],
-    commonsMath    : dependencies.create(group: 'org.apache.commons', name: 'commons-math3', version: versions.commons),
+    commonsMath   : dependencies.create(group: 'org.apache.commons', name: 'commons-math3', version: versions.commons),
 
     // Testing
 
-    spock          : [
+    spock         : [
       dependencies.create("org.spockframework:spock-core:${versions.spock}", {
         exclude group: 'org.codehaus.groovy', module: 'groovy-all'
       }),
       // Used by Spock for mocking:
       dependencies.create(group: 'org.objenesis', name: 'objenesis', version: '2.6') // Last version to support Java7
     ],
-    groovy         : "org.codehaus.groovy:groovy-all:${versions.groovy}",
-    junit5         : "org.junit.jupiter:junit-jupiter:${versions.junit5}",
-    mockito        : [
+    groovy        : "org.codehaus.groovy:groovy-all:${versions.groovy}",
+    junit5        : "org.junit.jupiter:junit-jupiter:${versions.junit5}",
+    mockito       : [
       dependencies.create(group: 'org.mockito', name: 'mockito-core', version: versions.mockito),
       dependencies.create(group: 'org.mockito', name: 'mockito-junit-jupiter', version: versions.mockito)
     ],
-    testcontainers : "org.testcontainers:testcontainers:${versions.testcontainers}",
-    testLogging    : [
+    testcontainers: "org.testcontainers:testcontainers:${versions.testcontainers}",
+    testLogging   : [
       dependencies.create(group: 'ch.qos.logback', name: 'logback-classic', version: versions.logback),
       dependencies.create(group: 'org.slf4j', name: 'log4j-over-slf4j', version: versions.slf4j),
       dependencies.create(group: 'org.slf4j', name: 'jcl-over-slf4j', version: versions.slf4j),
       dependencies.create(group: 'org.slf4j', name: 'jul-to-slf4j', version: versions.slf4j),
     ],
-    scala          : dependencies.create(group: 'org.scala-lang', name: 'scala-library', version: "${versions.scala}"),
-    kotlin         : dependencies.create(group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: "${versions.kotlin}"),
-    coroutines     : dependencies.create(group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: "${versions.coroutines}"),
+    scala         : dependencies.create(group: 'org.scala-lang', name: 'scala-library', version: "${versions.scala}"),
+    kotlin        : dependencies.create(group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: "${versions.kotlin}"),
+    coroutines    : dependencies.create(group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: "${versions.coroutines}"),
 
-    jmc            : [
+    jmc           : [
       dependencies.create(group: 'org.openjdk.jmc', name: 'common', version: versions.jmc),
       dependencies.create(group: 'org.openjdk.jmc', name: 'flightrecorder', version: versions.jmc),
       dependencies.create(group: 'org.openjdk.jmc', name: 'flightrecorder', version: versions.jmc),
@@ -83,7 +83,7 @@ ext {
     ],
 
     // Shared between agent tooling and instrumentation and JMXFetch
-    shared         : [
+    shared        : [
       dependencies.create(group: 'com.datadoghq', name: 'java-dogstatsd-client', version: "${versions.dogstatsd}"),
       dependencies.create(group: 'com.github.jnr', name: 'jnr-unixsocket', version: "${versions.jnr_unixsocket}"),
       dependencies.create(group: 'com.google.guava', name: 'guava', version: "${versions.guava}")
@@ -92,7 +92,7 @@ ext {
     // Inverse of "shared".  These exclude directives are part of shadowJar's DSL
     // which is similar but not exactly the same as the regular gradle dependency{} block
     // Also, transitive dependencies have to be explicitly listed
-    sharedInverse  : (Closure) {
+    sharedInverse : (Closure) {
       // dogstatsd and its transitives
       exclude(dependency('com.datadoghq:java-dogstatsd-client'))
       exclude(dependency('com.github.jnr::'))
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fd0c5a38e92..21e622da69c 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-6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists