diff --git a/Jenkinsfile b/Jenkinsfile
index f8e9fa938..e4a68c463 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -46,6 +46,22 @@ pipeline {
 						}
 					}
 				}
+				stage('Publish JDK 15 + Cassandra 3.11') {
+					when {
+						changeset "ci/openjdk15-8-cassandra-3.11/**"
+					}
+					agent { label 'data' }
+					options { timeout(time: 30, unit: 'MINUTES') }
+
+					steps {
+						script {
+							def image = docker.build("springci/spring-data-openjdk15-8-cassandra-3.11", "ci/openjdk15-8-cassandra-3.11/")
+							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+								image.push()
+							}
+						}
+					}
+				}
 			}
 		}
 		stage("Test") {
@@ -96,6 +112,21 @@ pipeline {
 						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
 					}
 				}
+				stage("test: baseline (jdk15)") {
+					agent {
+						docker {
+							image 'springci/spring-data-openjdk15-8-cassandra-3.11:latest'
+							label 'data'
+							args '-v $HOME:/tmp/jenkins-home'
+						}
+					}
+					options { timeout(time: 30, unit: 'MINUTES') }
+					steps {
+						sh 'mkdir -p /tmp/jenkins-home'
+						sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,external-cassandra,java11 clean dependency:list verify -Dsort -U -B'
+					}
+				}
 			}
 		}
 		stage('Release to artifactory') {
diff --git a/ci/openjdk11-8-cassandra-3.11/Dockerfile b/ci/openjdk11-8-cassandra-3.11/Dockerfile
index 653764f8d..b552a7ee1 100644
--- a/ci/openjdk11-8-cassandra-3.11/Dockerfile
+++ b/ci/openjdk11-8-cassandra-3.11/Dockerfile
@@ -1,7 +1,7 @@
 FROM adoptopenjdk/openjdk11:latest
 
 RUN set -eux; \
-	CASSANDRA_URL='https://www-us.apache.org/dist/cassandra/3.11.5/apache-cassandra-3.11.5-bin.tar.gz'; \
+	CASSANDRA_URL='https://www-us.apache.org/dist/cassandra/3.11.9/apache-cassandra-3.11.9-bin.tar.gz'; \
 	curl -LfsSo /tmp/cassandra.tar.gz ${CASSANDRA_URL}; \
 		mkdir -p /opt/cassandra /opt/cassandra/data /opt/cassandra/logs; \
 		cd /opt/cassandra; \
@@ -11,7 +11,7 @@ RUN set -eux; \
 		useradd -d /home/jenkins-docker -m -u 1001 -U jenkins-docker;
 
 RUN set -eux; \
-	BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz'; \
+	BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u275b01.tar.gz'; \
 	curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
 		mkdir -p /opt/java/openjdk8; \
 		cd /opt/java/openjdk8; \
diff --git a/ci/openjdk15-8-cassandra-3.11/Dockerfile b/ci/openjdk15-8-cassandra-3.11/Dockerfile
new file mode 100644
index 000000000..c60c688e3
--- /dev/null
+++ b/ci/openjdk15-8-cassandra-3.11/Dockerfile
@@ -0,0 +1,23 @@
+FROM adoptopenjdk/openjdk15:latest
+
+RUN set -eux; \
+	CASSANDRA_URL='https://www-us.apache.org/dist/cassandra/3.11.9/apache-cassandra-3.11.9-bin.tar.gz'; \
+	curl -LfsSo /tmp/cassandra.tar.gz ${CASSANDRA_URL}; \
+		mkdir -p /opt/cassandra /opt/cassandra/data /opt/cassandra/logs; \
+		cd /opt/cassandra; \
+		tar -xf /tmp/cassandra.tar.gz --strip-components=1; \
+		rm -rf /tmp/cassandra.tar.gz; \
+		chmod -R a+rwx /opt/cassandra; \
+		useradd -d /home/jenkins-docker -m -u 1001 -U jenkins-docker;
+
+RUN set -eux; \
+	BINARY_URL='https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u275b01.tar.gz'; \
+	curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
+		mkdir -p /opt/java/openjdk8; \
+		cd /opt/java/openjdk8; \
+		tar -xf /tmp/openjdk.tar.gz --strip-components=1; \
+		rm -rf /tmp/openjdk.tar.gz;
+
+ENV PATH="/opt/java/openjdk8/bin:$PATH"
+ENV MAX_HEAP_SIZE=1500M
+ENV HEAP_NEWSIZE=300M
diff --git a/ci/openjdk8-cassandra-3.11/Dockerfile b/ci/openjdk8-cassandra-3.11/Dockerfile
index a410cea5d..c6c8fd469 100644
--- a/ci/openjdk8-cassandra-3.11/Dockerfile
+++ b/ci/openjdk8-cassandra-3.11/Dockerfile
@@ -1,7 +1,7 @@
 FROM adoptopenjdk/openjdk8:latest
 
 RUN set -eux; \
-	CASSANDRA_URL='https://www-us.apache.org/dist/cassandra/3.11.5/apache-cassandra-3.11.5-bin.tar.gz'; \
+	CASSANDRA_URL='https://www-us.apache.org/dist/cassandra/3.11.9/apache-cassandra-3.11.9-bin.tar.gz'; \
 	curl -LfsSo /tmp/cassandra.tar.gz ${CASSANDRA_URL}; \
 		mkdir -p /opt/cassandra /opt/cassandra/data /opt/cassandra/logs; \
 		cd /opt/cassandra; \