diff --git a/docker/pulsar-all/pom.xml b/docker/pulsar-all/pom.xml
index f040a930ed538..9d4a4e53df9b0 100644
--- a/docker/pulsar-all/pom.xml
+++ b/docker/pulsar-all/pom.xml
@@ -66,17 +66,6 @@
   </dependencies>
 
   <profiles>
-    <profile>
-      <id>git-commit-id-no-git</id>
-      <activation>
-        <file>
-          <missing>${basedir}/../../.git</missing>
-        </file>
-      </activation>
-      <properties>
-        <git.commit.id.abbrev>no-git</git.commit.id.abbrev>
-      </properties>
-    </profile>
     <profile>
       <id>docker</id>
       <!-- include the docker image only when docker profile is active -->
@@ -157,14 +146,10 @@
                       <name>${docker.organization}/${docker.image}-all:${docker.tag}</name>
                       <build>
                         <contextDir>${project.basedir}</contextDir>
-                        <skipTag>${docker.skip.tag}</skipTag>
-                        <tags>
-                          <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}/${docker.image}:${project.version}-${git.commit.id.abbrev}</PULSAR_IMAGE>
+                          <PULSAR_IMAGE>${docker.organization}/${docker.image}:${docker.tag}</PULSAR_IMAGE>
                           <PULSAR_IO_KINESIS_KPL_IMAGE>${PULSAR_IO_KINESIS_KPL_IMAGE}</PULSAR_IO_KINESIS_KPL_IMAGE>
                         </args>
                         <buildx>
diff --git a/docker/pulsar/pom.xml b/docker/pulsar/pom.xml
index 040d96ded8f2d..43f11fbefbb06 100644
--- a/docker/pulsar/pom.xml
+++ b/docker/pulsar/pom.xml
@@ -48,17 +48,6 @@
   </dependencies>
 
   <profiles>
-    <profile>
-      <id>git-commit-id-no-git</id>
-      <activation>
-        <file>
-          <missing>${basedir}/../../.git</missing>
-        </file>
-      </activation>
-      <properties>
-        <git.commit.id.abbrev>no-git</git.commit.id.abbrev>
-      </properties>
-    </profile>
     <profile>
       <id>docker</id>
       <build>
@@ -86,10 +75,6 @@
                           <IMAGE_JDK_MAJOR_VERSION>${IMAGE_JDK_MAJOR_VERSION}</IMAGE_JDK_MAJOR_VERSION>
                         </args>
                         <contextDir>${project.basedir}</contextDir>
-                        <skipTag>${docker.skip.tag}</skipTag>
-                        <tags>
-                          <tag>${project.version}-${git.commit.id.abbrev}</tag>
-                        </tags>
                         <buildx>
                           <platforms>
                             <platform>${docker.platforms}</platform>
@@ -127,7 +112,6 @@
       <id>docker-push</id>
       <properties>
         <docker.skip.push>false</docker.skip.push>
-        <docker.skip.tag>true</docker.skip.tag>
         <docker.platforms>linux/amd64,linux/arm64</docker.platforms>
       </properties>
     </profile>
diff --git a/pom.xml b/pom.xml
index b846a7a7ccb3b..a6b7bfba51085 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,6 @@ flexible messaging model and an intuitive client API.</description>
     -->
     <docker.platforms></docker.platforms>
     <docker.skip.push>true</docker.skip.push>
-    <docker.skip.tag>false</docker.skip.tag>
 
     <!-- required for running tests on JDK11+ -->
     <test.additional.args>
@@ -167,7 +166,8 @@ flexible messaging model and an intuitive client API.</description>
     <surefire.shutdown>kill</surefire.shutdown>
     <docker.organization>apachepulsar</docker.organization>
     <docker.image>pulsar</docker.image>
-    <docker.tag>latest</docker.tag>
+    <!-- git.commit.id.abbrev will be injected by git-commit-id-plugin-->
+    <docker.tag>${project.version}-${git.commit.id.abbrev}</docker.tag>
     <skipSourceReleaseAssembly>false</skipSourceReleaseAssembly>
     <skipBuildDistribution>false</skipBuildDistribution>
     <skipDeployConnector>false</skipDeployConnector>
@@ -2410,6 +2410,17 @@ flexible messaging model and an intuitive client API.</description>
   </build>
 
   <profiles>
+    <profile>
+      <id>git-commit-id-no-git</id>
+      <activation>
+        <file>
+          <missing>${basedir}/.git</missing>
+        </file>
+      </activation>
+      <properties>
+        <docker.tag>${project.version}-no-git</docker.tag>
+      </properties>
+    </profile>
     <profile>
       <!-- used for running integration tests on Java 8 -->
       <id>integration-test-java8</id>
diff --git a/tests/docker-images/java-test-image/pom.xml b/tests/docker-images/java-test-image/pom.xml
index 3d265d37dba61..4085e8a37c514 100644
--- a/tests/docker-images/java-test-image/pom.xml
+++ b/tests/docker-images/java-test-image/pom.xml
@@ -152,7 +152,6 @@
                 <phase>package</phase>
                 <goals>
                   <goal>build</goal>
-                  <goal>tag</goal>
                 </goals>
                 <configuration>
                   <images>
@@ -160,7 +159,7 @@
                       <name>${docker.organization}/java-test-image:${docker.tag}</name>
                       <build>
                         <args>
-                          <PULSAR_IMAGE>${docker.organization}/${docker.image}:${project.version}-${git.commit.id.abbrev}</PULSAR_IMAGE>
+                          <PULSAR_IMAGE>${docker.organization}/${docker.image}:${docker.tag}</PULSAR_IMAGE>
                         </args>
                         <contextDir>${project.basedir}</contextDir>
                         <noCache>true</noCache>
diff --git a/tests/docker-images/latest-version-image/pom.xml b/tests/docker-images/latest-version-image/pom.xml
index 29108e529b771..0339fb84c87c0 100644
--- a/tests/docker-images/latest-version-image/pom.xml
+++ b/tests/docker-images/latest-version-image/pom.xml
@@ -156,7 +156,6 @@
                 <phase>package</phase>
                 <goals>
                   <goal>build</goal>
-                  <goal>tag</goal>
                 </goals>
                 <configuration>
                   <images>
@@ -165,7 +164,7 @@
                       <build>
                         <contextDir>${project.basedir}</contextDir>
                         <args>
-                          <PULSAR_ALL_IMAGE>${docker.organization}/${docker.image}-all:${project.version}-${git.commit.id.abbrev}</PULSAR_ALL_IMAGE>
+                          <PULSAR_ALL_IMAGE>${docker.organization}/${docker.image}-all:${docker.tag}</PULSAR_ALL_IMAGE>
                         </args>
                         <noCache>true</noCache>
                         <buildx>