diff --git a/build.gradle b/build.gradle
index 2fc03be..6a47932 100644
--- a/build.gradle
+++ b/build.gradle
@@ -383,7 +383,6 @@ task codeCoverageReport(type: JacocoReport) {
 
 wrapper {
 	gradleVersion = "6.5.1"
-	distributionType = Wrapper.DistributionType.ALL
 }
 
 def getDocumentationProjects() {
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 624829e..59a1f1f 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -45,7 +45,7 @@ jobs:
           disable_checksum_uploads: true
           artifact_set:
             - include:
-                - "/**/spring-cloud-app-broker-*-docs.zip"
+                - "/**/spring-cloud-app-broker-docs-*.zip"
               properties:
                 "zip.type": "docs"
                 "zip.deployed": "false"
diff --git a/ci/scripts/distribute.sh b/ci/scripts/distribute.sh
index e320814..359a879 100755
--- a/ci/scripts/distribute.sh
+++ b/ci/scripts/distribute.sh
@@ -44,7 +44,7 @@ while [ $artifacts_published == "false" ] && [ $retry_counter -lt $WAIT_ATTEMPTS
   sleep $WAIT_TIME
 done
 if [[ $artifacts_published == "false" ]]; then
-  echo "Failed to ditribute"
+  echo "Failed to distribute"
   exit 1
 fi
 
diff --git a/gradle.properties b/gradle.properties
index f7d0e8a..a11d61f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,16 +3,12 @@ group=org.springframework.cloud
 
 onlyShowStandardStreamsOnTestFailure = false
 
-assertjVersion = 3.13.2
 awaitilityVersion = 4.0.2
 blockHoundVersion = 1.0.3.RELEASE
 cfJavaClientVersion = 4.7.0.RELEASE
 checkstyleVersion = 8.33
 commonsTextVersion = 1.8
 immutablesVersion = 2.8.8
-junitJupiterVersion = 5.5.2
-junitPlatformLauncherVersion = 1.6.2
-mockitoVersion = 3.1.0
 openServiceBrokerVersion = 3.2.0-SNAPSHOT
 pmdVersion = 6.24.0
 springBootVersion = 2.3.1.RELEASE
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac33e99..bb8b2fc 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.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index 900403c..e4018cc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1,6 @@
 pluginManagement {
 	plugins {
-		id "io.spring.dependency-management" version "1.0.9.RELEASE"
-		id "org.springframework.boot" version "2.2.7.RELEASE"
-		id "com.jfrog.artifactory" version "4.15.2"
+		id "org.springframework.boot" version "${springBootVersion}"
 		id "io.spring.nohttp" version "0.0.5.RELEASE"
 		id 'org.asciidoctor.jvm.pdf' version '3.1.0'
 		id 'org.asciidoctor.jvm.convert' version '3.1.0'
diff --git a/spring-cloud-app-broker-core/build.gradle b/spring-cloud-app-broker-core/build.gradle
index bc696e1..dfb5df8 100644
--- a/spring-cloud-app-broker-core/build.gradle
+++ b/spring-cloud-app-broker-core/build.gradle
@@ -27,14 +27,14 @@ dependencies {
 
 	implementation "org.apache.commons:commons-text:${commonsTextVersion}"
 
-	testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"
-	testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junitPlatformLauncherVersion}"
+	testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
+	testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 
 	testImplementation "org.springframework:spring-test"
 	testImplementation "io.projectreactor:reactor-test"
 	testImplementation "io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}"
-	testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
-	testImplementation "org.assertj:assertj-core:${assertjVersion}"
-	testImplementation "org.mockito:mockito-core:${mockitoVersion}"
-	testImplementation "org.mockito:mockito-junit-jupiter:${mockitoVersion}"
+	testImplementation "org.junit.jupiter:junit-jupiter-api"
+	testImplementation "org.assertj:assertj-core"
+	testImplementation "org.mockito:mockito-core"
+	testImplementation "org.mockito:mockito-junit-jupiter"
 }
diff --git a/spring-cloud-app-broker-docs/build.gradle b/spring-cloud-app-broker-docs/build.gradle
index dc05a73..381c210 100644
--- a/spring-cloud-app-broker-docs/build.gradle
+++ b/spring-cloud-app-broker-docs/build.gradle
@@ -29,10 +29,10 @@ dependencies {
 	implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
 	implementation project(":spring-cloud-app-broker-core")
 	implementation "org.springframework.boot:spring-boot-starter"
+	implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
 	implementation "org.springframework.boot:spring-boot-starter-security"
 	implementation "org.springframework.boot:spring-boot-starter-tomcat"
 	implementation "io.projectreactor:reactor-core"
-	implementation "org.springframework.data:spring-data-r2dbc:1.1.1.RELEASE"
 	implementation "io.r2dbc:r2dbc-h2:0.8.0.RELEASE"
 
 	docs "io.spring.docresources:spring-doc-resources:0.2.1.RELEASE@zip"