diff --git a/docker/pulsar-all/pom.xml b/docker/pulsar-all/pom.xml
index 6d8c656f1dd41..8c7174c04c286 100644
--- a/docker/pulsar-all/pom.xml
+++ b/docker/pulsar-all/pom.xml
@@ -138,46 +138,7 @@
                 <phase>package</phase>
                 <goals>
                   <goal>build</goal>
-                </goals>
-                <configuration>
-                  <images>
-                    <image>
-                      <name>${docker.organization}/pulsar-all</name>
-                      <build>
-                        <contextDir>${project.basedir}</contextDir>
-                        <tags>
-                          <tag>latest</tag>
-                          <tag>${project.version}</tag>
-                        </tags>
-                      </build>
-                    </image>
-                  </images>
-                </configuration>
-              </execution>
-              <execution>
-                <id>push-latest</id>
-                <goals>
-                  <goal>push</goal>
-                </goals>
-                <configuration>
-                  <images>
-                    <image>
-                      <name>${docker.organization}/pulsar-all</name>
-                      <build>
-                        <contextDir>${project.basedir}</contextDir>
-                        <tags>
-                          <tag>latest</tag>
-                        </tags>
-                      </build>
-                    </image>
-                  </images>
-                </configuration>
-              </execution>
-              <execution>
-                <id>add-no-repo</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>build</goal>
+                  <goal>tag</goal>
                 </goals>
                 <configuration>
                   <images>
@@ -187,11 +148,12 @@
                         <contextDir>${project.basedir}</contextDir>
                         <tags>
                           <tag>latest</tag>
-                          <tag>${project.version}</tag>
                         </tags>
                       </build>
                     </image>
                   </images>
+                  <tagName>latest</tagName>
+                  <repo>${docker.organization}</repo>
                 </configuration>
               </execution>
             </executions>
diff --git a/docker/pulsar/pom.xml b/docker/pulsar/pom.xml
index a458cea39763a..ab47f075ebb48 100644
--- a/docker/pulsar/pom.xml
+++ b/docker/pulsar/pom.xml
@@ -116,46 +116,7 @@
                 <phase>package</phase>
                 <goals>
                   <goal>build</goal>
-                </goals>
-                <configuration>
-                  <images>
-                    <image>
-                      <name>${docker.organization}/pulsar</name>
-                      <build>
-                        <contextDir>${project.basedir}</contextDir>
-                        <tags>
-                          <tag>latest</tag>
-                          <tag>${project.version}</tag>
-                        </tags>
-                      </build>
-                    </image>
-                  </images>
-                </configuration>
-              </execution>
-              <execution>
-                <id>push-latest</id>
-                <goals>
-                  <goal>push</goal>
-                </goals>
-                <configuration>
-                  <images>
-                    <image>
-                      <name>${docker.organization}/pulsar</name>
-                      <build>
-                        <contextDir>${project.basedir}</contextDir>
-                        <tags>
-                          <tag>latest</tag>
-                        </tags>
-                      </build>
-                    </image>
-                  </images>
-                </configuration>
-              </execution>
-              <execution>
-                <id>add-no-repo</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>build</goal>
+                  <goal>tag</goal>
                 </goals>
                 <configuration>
                   <images>
@@ -165,11 +126,12 @@
                         <contextDir>${project.basedir}</contextDir>
                         <tags>
                           <tag>latest</tag>
-                          <tag>${project.version}</tag>
                         </tags>
                       </build>
                     </image>
                   </images>
+                  <tagName>latest</tagName>
+                  <repo>${docker.organization}</repo>
                 </configuration>
               </execution>
             </executions>