diff --git a/docker/pulsar-all/pom.xml b/docker/pulsar-all/pom.xml
index b934bd1f2fcee..4da3d78c234e2 100644
--- a/docker/pulsar-all/pom.xml
+++ b/docker/pulsar-all/pom.xml
@@ -151,17 +151,17 @@
                 <configuration>
                   <images>
                     <image>
-                      <name>${docker.organization}/pulsar-all</name>
+                      <name>${docker.organization}/${docker.image}-all</name>
                       <build>
                         <contextDir>${project.basedir}</contextDir>
                         <tags>
-                          <tag>latest</tag>
+                          <tag>${docker.tag}</tag>
                           <tag>${project.version}-${git.commit.id.abbrev}</tag>
                         </tags>
                         <args>
                           <PULSAR_IO_DIR>target/apache-pulsar-io-connectors-${project.version}-bin</PULSAR_IO_DIR>
                           <PULSAR_OFFLOADER_TARBALL>target/pulsar-offloader-distribution-${project.version}-bin.tar.gz</PULSAR_OFFLOADER_TARBALL>
-                          <PULSAR_IMAGE>${docker.organization}/pulsar:${project.version}-${git.commit.id.abbrev}</PULSAR_IMAGE>
+                          <PULSAR_IMAGE>${docker.organization}/${docker.image}:${project.version}-${git.commit.id.abbrev}</PULSAR_IMAGE>
                         </args>
                         <buildx>
                           <platforms>
diff --git a/docker/pulsar/pom.xml b/docker/pulsar/pom.xml
index 0f97504e9bb64..8e458bf6eb298 100644
--- a/docker/pulsar/pom.xml
+++ b/docker/pulsar/pom.xml
@@ -85,7 +85,7 @@
                 <configuration>
                   <images>
                     <image>
-                      <name>${docker.organization}/pulsar</name>
+                      <name>${docker.organization}/${docker.image}</name>
                       <build>
                         <args>
                           <PULSAR_TARBALL>target/pulsar-server-distribution-${project.version}-bin.tar.gz</PULSAR_TARBALL>
@@ -96,7 +96,7 @@
                         </args>
                         <contextDir>${project.basedir}</contextDir>
                         <tags>
-                          <tag>latest</tag>
+                          <tag>${docker.tag}</tag>
                           <tag>${project.version}-${git.commit.id.abbrev}</tag>
                         </tags>
                         <buildx>
diff --git a/pom.xml b/pom.xml
index c3c4da6f8650d..b2bb04b1874f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,6 +105,8 @@ flexible messaging model and an intuitive client API.</description>
     <testRetryCount>1</testRetryCount>
     <testJacocoAgentArgument></testJacocoAgentArgument>
     <docker.organization>apachepulsar</docker.organization>
+    <docker.image>pulsar</docker.image>
+    <docker.tag>latest</docker.tag>
     <skipSourceReleaseAssembly>false</skipSourceReleaseAssembly>
     <skipBuildDistribution>false</skipBuildDistribution>
     <shadePluginPhase>package</shadePluginPhase>
diff --git a/tests/docker-images/java-test-image/pom.xml b/tests/docker-images/java-test-image/pom.xml
index 5bf9dca36ff05..b726143990b2b 100644
--- a/tests/docker-images/java-test-image/pom.xml
+++ b/tests/docker-images/java-test-image/pom.xml
@@ -147,15 +147,19 @@
                 <phase>package</phase>
                 <goals>
                   <goal>build</goal>
+                  <goal>tag</goal>
                 </goals>
                 <configuration>
                   <images>
                     <image>
                       <name>${docker.organization}/java-test-image</name>
                       <build>
+                        <args>
+                          <PULSAR_IMAGE>${docker.organization}/${docker.image}:${project.version}-${git.commit.id.abbrev}</PULSAR_IMAGE>
+                        </args>
                         <contextDir>${project.basedir}</contextDir>
                         <tags>
-                          <tag>latest</tag>
+                          <tag>${docker.tag}</tag>
                           <tag>${project.version}</tag>
                         </tags>
                         <noCache>true</noCache>
diff --git a/tests/docker-images/latest-version-image/Dockerfile b/tests/docker-images/latest-version-image/Dockerfile
index dfcd28fd36d8d..028c9d9690fb6 100644
--- a/tests/docker-images/latest-version-image/Dockerfile
+++ b/tests/docker-images/latest-version-image/Dockerfile
@@ -18,6 +18,8 @@
 #
 
 # build go lang examples first in a separate layer
+ARG PULSAR_ALL_IMAGE
+ARG PULSAR_IMAGE
 
 FROM apachepulsar/pulsar:latest as pulsar-function-go
 
@@ -44,12 +46,12 @@ RUN cd /go/src/github.com/apache/pulsar/pulsar-function-go/pf && go install
 RUN cd /go/src/github.com/apache/pulsar/pulsar-function-go/examples && go install ./...
 
 # Reference pulsar-all to copy connectors from there
-FROM apachepulsar/pulsar-all:latest as pulsar-all
+FROM $PULSAR_ALL_IMAGE as pulsar-all
 
 ########################################
 ###### Main image build
 ########################################
-FROM apachepulsar/pulsar:latest
+FROM $PULSAR_IMAGE
 
 # Switch to run as the root user to simplify building container and then running
 # supervisord. Each of the pulsar components are spawned by supervisord and their
diff --git a/tests/docker-images/latest-version-image/pom.xml b/tests/docker-images/latest-version-image/pom.xml
index bc54140dfc0ba..0db9d12569277 100644
--- a/tests/docker-images/latest-version-image/pom.xml
+++ b/tests/docker-images/latest-version-image/pom.xml
@@ -121,11 +121,15 @@
                 <configuration>
                   <images>
                     <image>
-                      <name>${docker.organization}/pulsar-test-latest-version</name>
+                      <name>${docker.organization}/${docker.image}-test-latest-version</name>
                       <build>
                         <contextDir>${project.basedir}</contextDir>
+                        <args>
+                          <PULSAR_IMAGE>${docker.organization}/${docker.image}:${project.version}-${git.commit.id.abbrev}</PULSAR_IMAGE>
+                          <PULSAR_ALL_IMAGE>${docker.organization}/${docker.image}-all:${project.version}-${git.commit.id.abbrev}</PULSAR_ALL_IMAGE>
+                        </args>
                         <tags>
-                          <tag>latest</tag>
+                          <tag>${docker.tag}</tag>
                           <tag>${project.version}</tag>
                         </tags>
                         <noCache>true</noCache>