diff --git a/ci/scripts/common.sh b/ci/scripts/common.sh
index 0c0f901c50..dee9721c1f 100644
--- a/ci/scripts/common.sh
+++ b/ci/scripts/common.sh
@@ -1,5 +1,9 @@
 source /opt/concourse-java.sh
 
+if [[ -d $PWD/gradle ]]; then
+	EXPORT GRADLE_USER_HOMR=`pwd`/gradle
+fi
+
 setup_symlinks
 if [[ -d $PWD/embedmongo && ! -d $HOME/.embedmongo ]]; then
 	ln -s "$PWD/embedmongo" "$HOME/.embedmongo"
diff --git a/ci/tasks/build-project.yml b/ci/tasks/build-project.yml
index 61c86eb759..d672e0ebb1 100644
--- a/ci/tasks/build-project.yml
+++ b/ci/tasks/build-project.yml
@@ -7,7 +7,7 @@ outputs:
 - name: git-repo
 caches:
 - path: gradle
-- path: build/downloads
+- path: maven
 - path: embedmongo
 params:
   BRANCH:
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
index 646c572eca..e76636023f 100644
--- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
+++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
@@ -43,7 +43,7 @@ task buildApp(type: GradleBuild) {
 }
 
 task downloadJdk(type: Download) {
-	def destFolder = new File(rootProject.buildDir, "downloads/jdk/bellsoft")
+	def destFolder = new File(project.gradle.gradleUserHomeDir, "caches/springboot/downloads/jdk/bellsoft")
 	destFolder.mkdirs()
 	src "https://download.bell-sw.com/java/${jdkVersion}/bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz"
 	dest destFolder
@@ -53,7 +53,7 @@ task downloadJdk(type: Download) {
 
 task syncJdkDownloads(type: Sync) {
 	dependsOn downloadJdk
-	from "${rootProject.buildDir}/downloads/jdk/bellsoft/"
+	from "${project.gradle.gradleUserHomeDir}/caches/springboot/downloads/jdk/bellsoft/"
 	include "bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz"
 	into "${project.buildDir}/downloads/jdk/bellsoft/"
 }
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle
index e287ed0a16..71592ea0aa 100644
--- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle
+++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle
@@ -44,7 +44,7 @@ task buildApp(type: GradleBuild) {
 }
 
 task downloadJdk(type: Download) {
-	def destFolder = new File(rootProject.buildDir, "downloads/jdk/oracle")
+	def destFolder = new File(project.gradle.gradleUserHomeDir, "caches/springboot/downloads/jdk/oracle")
 	destFolder.mkdirs()
 	src "https://download.oracle.com/java/17/archive/jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz"
 	dest destFolder
@@ -54,7 +54,7 @@ task downloadJdk(type: Download) {
 
 task syncJdkDownloads(type: Sync) {
 	dependsOn downloadJdk
-	from "${rootProject.buildDir}/downloads/jdk/oracle/"
+	from "${project.gradle.gradleUserHomeDir}/caches/springboot/downloads/jdk/oracle/"
 	include "jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz"
 	into "${project.buildDir}/downloads/jdk/oracle/"
 }