diff --git a/scm-packaging/docker/pom.xml b/scm-packaging/docker/pom.xml
index a120e43bc9..d179e2f51e 100644
--- a/scm-packaging/docker/pom.xml
+++ b/scm-packaging/docker/pom.xml
@@ -207,7 +207,6 @@
         <configuration>
           <repository>${docker.repository}</repository>
           <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-          <tag>${docker.tag}</tag>
           <contextDirectory>target/build</contextDirectory>
         </configuration>
         <executions>
@@ -217,6 +216,20 @@
             <goals>
               <goal>build</goal>
             </goals>
+            <configuration>
+              <tag>${docker.tag}</tag>
+            </configuration>
+          </execution>
+          <execution>
+            <id>build-latest</id>
+            <phase>package</phase>
+            <goals>
+              <goal>build</goal>
+            </goals>
+            <configuration>
+              <tag>latest</tag>
+              <skip>${docker.skipLatest}</skip>
+            </configuration>
           </execution>
           <execution>
             <id>push</id>
@@ -224,6 +237,20 @@
             <goals>
               <goal>push</goal>
             </goals>
+            <configuration>
+              <tag>${docker.tag}</tag>
+            </configuration>
+          </execution>
+          <execution>
+            <id>push-latest</id>
+            <phase>deploy</phase>
+            <goals>
+              <goal>push</goal>
+            </goals>
+            <configuration>
+              <tag>latest</tag>
+              <skip>${docker.skipLatest}</skip>
+            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/scm-packaging/docker/src/main/build/name.groovy b/scm-packaging/docker/src/main/build/name.groovy
index 657d26a45a..8b07bb67e0 100644
--- a/scm-packaging/docker/src/main/build/name.groovy
+++ b/scm-packaging/docker/src/main/build/name.groovy
@@ -24,6 +24,7 @@
 
 def repository = "docker.io/scmmanager/scm-manager"
 def version = project.version
+def skipLatest = "false"
 
 if (version.contains("SNAPSHOT")) {
   repository = "docker.io/cloudogu/scm-manager"
@@ -36,7 +37,9 @@ if (version.contains("SNAPSHOT")) {
   }
 
   version = version.replace("SNAPSHOT", snapshotVersion)
+  skipLatest = "true"
 }
 
 project.properties.setProperty("docker.repository", repository)
 project.properties.setProperty("docker.tag", version)
+project.properties.setProperty("docker.skipLatest", skipLatest)