diff --git a/Jenkinsfile b/Jenkinsfile
index 951ac757..ef733ae3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -76,7 +76,7 @@ pipeline {
 					}
 				}
 
-				stage("test: baseline (jdk16)") {
+				stage("test: baseline (jdk17)") {
 					agent {
 						label 'data'
 					}
@@ -87,14 +87,14 @@ pipeline {
 					steps {
 						script {
 							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-								docker.image('adoptopenjdk/openjdk16:latest').inside('-v $HOME:/tmp/jenkins-home') {
+								docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
 									sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
 									sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
 									sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'
 									sh 'rm -Rf `find . -name "newDB"`'
 									sh 'rm -Rf `find . -name "server" | grep -v "src"`'
 									sh 'rm -Rf `find . -name "*.log"`'
-									sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Duser.dir=$PWD -Djava.io.tmpdir=/tmp" ./mvnw -s settings.xml -P java11,remote-java16 clean dependency:list test -Dsort -U -B'
+									sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Duser.dir=$PWD -Djava.io.tmpdir=/tmp" ./mvnw -s settings.xml -P java11,remote-java17 clean dependency:list test -Dsort -U -B'
 								}
 							}
 						}
diff --git a/pom.xml b/pom.xml
index c4778fe0..55224793 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,10 +54,12 @@
 	</properties>
 
 	<repositories>
+
 		<repository>
 			<id>spring-libs-snapshot</id>
 			<url>https://repo.spring.io/libs-snapshot</url>
 		</repository>
+
 		<repository>
 			<id>geode-snapshot</id>
 			<name>Apache Geode Snapshots</name>
@@ -69,12 +71,14 @@
 				<enabled>true</enabled>
 			</releases>
 		</repository>
-<!--
+
+		<!--
 		<repository>
 			<id>apache-snapshots</id>
 			<url>https://repository.apache.org/content/repositories/orgapachegeode-1060</url>
 		</repository>
 -->
+
 	</repositories>
 
 	<pluginRepositories>
diff --git a/spring-data-geode/pom.xml b/spring-data-geode/pom.xml
index dec8c8df..6fa53702 100644
--- a/spring-data-geode/pom.xml
+++ b/spring-data-geode/pom.xml
@@ -332,7 +332,7 @@
 			</build>
 		</profile>
 		<profile>
-			<id>remote-java16</id>
+			<id>remote-java17</id>
 			<build>
 				<plugins>
 					<plugin>