diff --git a/build.gradle b/build.gradle
index 119bea7..1c31226 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,8 +29,7 @@ buildscript {
 
 configure(allprojects) {
 	group = "org.springframework.cloud"
-
-	apply plugin: "java-library"
+	
 	apply plugin: "maven"
 	apply plugin: "eclipse"
 	apply plugin: "idea"
@@ -63,8 +62,8 @@ configure(allprojects) {
 
 	repositories {
 		mavenCentral()
-		maven { url "https://repo.spring.io/libs-snapshot-local" }
-		maven { url "https://repo.spring.io/libs-milestone-local" }
+		maven { url "https://repo.spring.io/libs-milestone" }
+		maven { url "https://repo.spring.io/libs-snapshot" }
 	}
 
 	if (project.hasProperty("springVersion") || project.hasProperty("springBootVersion") || project.hasProperty("reactorVersion")) {
diff --git a/spring-cloud-app-broker-acceptance-tests/build.gradle b/spring-cloud-app-broker-acceptance-tests/build.gradle
index 8a2cd68..0fabf1d 100644
--- a/spring-cloud-app-broker-acceptance-tests/build.gradle
+++ b/spring-cloud-app-broker-acceptance-tests/build.gradle
@@ -33,9 +33,8 @@ configurations.archives.artifacts.clear()
 apply plugin: 'org.springframework.boot'
 
 dependencies {
-	implementation project(":spring-cloud-starter-app-broker-cloudfoundry")
-
-	implementation("org.springframework.boot:spring-boot-starter-webflux")
+	compile project(":spring-cloud-starter-app-broker-cloudfoundry")
+	compile("org.springframework.boot:spring-boot-starter-webflux")
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
diff --git a/spring-cloud-app-broker-autoconfigure/build.gradle b/spring-cloud-app-broker-autoconfigure/build.gradle
index 41f5307..3009a1e 100644
--- a/spring-cloud-app-broker-autoconfigure/build.gradle
+++ b/spring-cloud-app-broker-autoconfigure/build.gradle
@@ -23,15 +23,14 @@ dependencyManagement {
 }
 
 dependencies {
-	implementation project(":spring-cloud-app-broker-core")
-	implementation project(":spring-cloud-app-broker-deployer")
-	implementation project(":spring-cloud-app-broker-deployer-cloudfoundry")
-	implementation project(":spring-cloud-app-broker-security-credhub")
-	implementation("org.springframework.boot:spring-boot-starter")
-
-	compileOnly("org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}")
-	compileOnly("org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}")
-	compileOnly("org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}")
+	compile project(":spring-cloud-app-broker-core")
+	compile project(":spring-cloud-app-broker-deployer")
+	compile project(":spring-cloud-app-broker-deployer-cloudfoundry")
+	compile project(":spring-cloud-app-broker-security-credhub")
+	compile("org.springframework.boot:spring-boot-starter")
+	compile("org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}")
+	compile("org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}")
+	compile("org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}")
 
 	annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 	annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor")
diff --git a/spring-cloud-app-broker-core/build.gradle b/spring-cloud-app-broker-core/build.gradle
index 39a6750..4df7745 100644
--- a/spring-cloud-app-broker-core/build.gradle
+++ b/spring-cloud-app-broker-core/build.gradle
@@ -28,13 +28,12 @@ dependencyManagement {
 }
 
 dependencies {
-	api project(":spring-cloud-app-broker-deployer")
-	api("io.projectreactor:reactor-core")
-	api("org.apache.commons:commons-text:1.4")
-	api("org.springframework.cloud:spring-cloud-open-service-broker-core:${openServiceBrokerVersion}")
-
-	implementation("org.springframework:spring-core")
-	implementation("org.springframework:spring-context")
+	compile project(":spring-cloud-app-broker-deployer")
+	compile("org.springframework:spring-core")
+	compile("org.springframework:spring-context")
+	compile("io.projectreactor:reactor-core")
+	compile("org.springframework.cloud:spring-cloud-open-service-broker-core:${openServiceBrokerVersion}")
+	compile("org.apache.commons:commons-text:1.4")
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
 
diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle b/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle
index cf6b034..b9a012d 100644
--- a/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle
+++ b/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle
@@ -23,12 +23,11 @@ dependencyManagement {
 }
 
 dependencies {
-	implementation project(":spring-cloud-app-broker-deployer")
-	implementation("org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}")
-	implementation("org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}")
-	api("org.immutables:value:${immutablesVersion}")
-
-	implementation("org.springframework.boot:spring-boot-starter-validation")
+	compile project(":spring-cloud-app-broker-deployer")
+	compile("org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}")
+	compile("org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}")
+	compile("org.springframework.boot:spring-boot-starter-validation")
+	compile("org.immutables:value:${immutablesVersion}")
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
diff --git a/spring-cloud-app-broker-deployer/build.gradle b/spring-cloud-app-broker-deployer/build.gradle
index de2e073..d534823 100644
--- a/spring-cloud-app-broker-deployer/build.gradle
+++ b/spring-cloud-app-broker-deployer/build.gradle
@@ -23,6 +23,6 @@ dependencyManagement {
 }
 
 dependencies {
-	implementation("org.springframework:spring-core")
-	implementation("io.projectreactor:reactor-core")
+	compile("org.springframework:spring-core")
+	compile("io.projectreactor:reactor-core")
 }
diff --git a/spring-cloud-app-broker-integration-tests/build.gradle b/spring-cloud-app-broker-integration-tests/build.gradle
index b00c217..615b234 100644
--- a/spring-cloud-app-broker-integration-tests/build.gradle
+++ b/spring-cloud-app-broker-integration-tests/build.gradle
@@ -41,9 +41,8 @@ ext['jetty.version'] = "9.4.8.v20171121"
 apply plugin: 'org.springframework.boot'
 
 dependencies {
-	implementation project(":spring-cloud-starter-app-broker-cloudfoundry")
-
-	implementation("org.springframework.boot:spring-boot-starter-webflux")
+	compile project(":spring-cloud-starter-app-broker-cloudfoundry")
+	compile("org.springframework.boot:spring-boot-starter-webflux")
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
diff --git a/spring-cloud-app-broker-security-credhub/build.gradle b/spring-cloud-app-broker-security-credhub/build.gradle
index 2e8d735..1206f8f 100644
--- a/spring-cloud-app-broker-security-credhub/build.gradle
+++ b/spring-cloud-app-broker-security-credhub/build.gradle
@@ -23,8 +23,8 @@ dependencyManagement {
 }
 
 dependencies {
-	implementation project(":spring-cloud-app-broker-core")
-	implementation("org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}")
+	compile project(":spring-cloud-app-broker-core")
+	compile("org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}")
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
diff --git a/spring-cloud-starter-app-broker-cloudfoundry/build.gradle b/spring-cloud-starter-app-broker-cloudfoundry/build.gradle
index c7eb8f0..992137b 100644
--- a/spring-cloud-starter-app-broker-cloudfoundry/build.gradle
+++ b/spring-cloud-starter-app-broker-cloudfoundry/build.gradle
@@ -23,12 +23,11 @@ dependencyManagement {
 }
 
 dependencies {
-	api project(":spring-cloud-starter-app-broker")
-	api project(":spring-cloud-app-broker-deployer-cloudfoundry")
-	api project(":spring-cloud-app-broker-security-credhub")
-
-	api("org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}")
-	api("org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}")
+	compile project(":spring-cloud-starter-app-broker")
+	compile project(":spring-cloud-app-broker-deployer-cloudfoundry")
+	compile project(":spring-cloud-app-broker-security-credhub")
+	compile("org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}")
+	compile("org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}")
 }
 
 install {
diff --git a/spring-cloud-starter-app-broker/build.gradle b/spring-cloud-starter-app-broker/build.gradle
index 5882889..6c49f53 100644
--- a/spring-cloud-starter-app-broker/build.gradle
+++ b/spring-cloud-starter-app-broker/build.gradle
@@ -23,9 +23,9 @@ dependencyManagement {
 }
 
 dependencies {
-	api project(":spring-cloud-app-broker-core")
-	api project(":spring-cloud-app-broker-autoconfigure")
-	api("org.springframework.cloud:spring-cloud-starter-open-service-broker:${openServiceBrokerVersion}")
+	compile project(":spring-cloud-app-broker-core")
+	compile project(":spring-cloud-app-broker-autoconfigure")
+	compile("org.springframework.cloud:spring-cloud-starter-open-service-broker:${openServiceBrokerVersion}")
 }
 
 install {