diff --git a/Jenkinsfile b/Jenkinsfile
index bf885237..0d4dab5d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@ pipeline {
 
 					steps {
 						script {
-							def image = docker.build("${p['docker.image']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg VAULT=${p['docker.vault.version']} -f ci/openjdk17-vault/Dockerfile .")
+							def image = docker.build("${p['docker.build.image.name']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg VAULT=${p['docker.vault.version']} -f ci/openjdk17-vault/Dockerfile .")
 							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 								image.push()
 							}
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index 1cfb2ca5..a49b0c0b 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -5,9 +5,10 @@ java.main.tag=17.0.3_7-jdk
 docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
 
 # Main docker image name using during the CI build
-docker.image=harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-vault-openjdk17-vault:${java.main.tag}-${'docker.vault.version'}
+docker.build.image.name=springci/spring-vault-openjdk17-vault:${java.main.tag}-${docker.vault.version}
+docker.image=harbor-repo.vmware.com/dockerhub-proxy-cache/${docker.build.image.name}
 
-# Supported versions of MongoDB
+# Supported versions of Vault
 docker.vault.version=1.11.1
 
 # Docker environment settings