diff --git a/Jenkinsfile b/Jenkinsfile
index c0c10e08..fc492e90 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,11 +25,13 @@ pipeline {
 
 			steps {
 				script {
-					def image = docker.build("${p['docker.java.build.image']}", "ci/")
-					docker.withRegistry('', "${p['dockerhub.credentials']}") {
-						image.push()
-					}
-				}
+				    docker.withRegistry('', "${p['dockerhub.credentials']}") {
+					    def image = docker.build("${p['docker.java.build.image']}", "ci/")
+					    docker.withRegistry('', "${p['dockerhub.credentials']}") {
+						    image.push()
+					    }
+				    }
+                }
 			}
 		}
 		stage("Test: baseline (main)") {
@@ -159,7 +161,6 @@ pipeline {
 
 			steps {
 				script {
-
 					docker.image("${p['docker.java.build.image-proxy']}").inside(p['docker.java.inside.basic']) {
 						PROJECT_VERSION = sh(
 								script: "ci/version.sh",
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index 65ae14a3..692bb93c 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -1,16 +1,16 @@
 # Java versions
 java.legacy.tag=8u362-b09-jdk-focal
-java.main.tag=17.0.6_10-jdk-focal
+java.main.tag=17.0.11_9-jdk-jammy
 java.next.tag=20-jdk-jammy
 
 # Docker container images - standard
-docker.java.legacy.image=tae-docker-virtual.usw1.packages.broadcom.com/library/eclipse-temurin:${java.legacy.tag}
-docker.java.main.image=tae-docker-virtual.usw1.packages.broadcom.com/library/eclipse-temurin:${java.main.tag}
-docker.java.next.image=tae-docker-virtual.usw1.packages.broadcom.com/library/eclipse-temurin:${java.next.tag}
+docker.java.legacy.image=library/eclipse-temurin:${java.legacy.tag}
+docker.java.main.image=library/eclipse-temurin:${java.main.tag}
+docker.java.next.image=library/eclipse-temurin:${java.next.tag}
 
 # Docker container images - for release
 docker.java.build.image=springci/spring-ws-eclipse-temurin-with-gpg:${java.main.tag}
-docker.java.build.image-proxy=tae-docker-virtual.usw1.packages.broadcom.com/${docker.java.build.image}
+docker.java.build.image-proxy=${docker.java.build.image}
 
 # Docker environment settings
 docker.java.inside.basic=-v $HOME:/tmp/jenkins-home