diff --git a/.maven-dockerinclude b/.maven-dockerinclude
new file mode 100644
index 0000000..69b3cfc
--- /dev/null
+++ b/.maven-dockerinclude
@@ -0,0 +1,2 @@
+target/*-runner.jar
+target/lib/*
diff --git a/pom.xml b/pom.xml
index 8fb8e45..4d9dfed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,12 +16,12 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <compiler-plugin.version>3.8.1</compiler-plugin.version>
-    <dockerfile-plugin.version>1.4.13</dockerfile-plugin.version>
-    <quarkus-plugin.version>1.3.1.Final</quarkus-plugin.version>
-    <surefire-plugin.version>3.0.0-M4</surefire-plugin.version>
-    <spotless-plugin.version>1.30.0</spotless-plugin.version>
     <antrun-plugin.version>1.8</antrun-plugin.version>
+    <compiler-plugin.version>3.8.1</compiler-plugin.version>
+    <docker-plugin.version>0.33.0</docker-plugin.version>
+    <quarkus-plugin.version>1.3.1.Final</quarkus-plugin.version>
+    <spotless-plugin.version>1.30.0</spotless-plugin.version>
+    <surefire-plugin.version>3.0.0-M4</surefire-plugin.version>
 
     <!-- <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id> -->
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
@@ -348,23 +348,44 @@
       </plugin>
 
       <plugin>
-        <groupId>com.spotify</groupId>
-        <artifactId>dockerfile-maven-plugin</artifactId>
-        <version>${dockerfile-plugin.version}</version>
+        <groupId>io.fabric8</groupId>
+        <artifactId>docker-maven-plugin</artifactId>
+        <version>${docker-plugin.version}</version>
+
+        <configuration>
+          <images>
+            <image>
+              <name>docker.benkard.de/mulk/mulkcms2</name>
+              <alias>master</alias>
+              <build>
+                <contextDir>${project.basedir}</contextDir>
+                <dockerFile>${project.basedir}/src/main/docker/Dockerfile.jvm</dockerFile>
+                <tags>
+                  <tag>latest</tag>
+                  <tag>${project.version}</tag>
+                </tags>
+              </build>
+            </image>
+          </images>
+        </configuration>
+
         <executions>
           <execution>
-            <id>default</id>
+            <id>build</id>
+            <phase>install</phase>
             <goals>
               <goal>build</goal>
+            </goals>
+          </execution>
+
+          <execution>
+            <id>deploy</id>
+            <phase>deploy</phase>
+            <goals>
               <goal>push</goal>
             </goals>
           </execution>
         </executions>
-        <configuration>
-          <dockerfile>src/main/docker/Dockerfile.jvm</dockerfile>
-          <repository>docker.benkard.de/mulk/mulkcms2</repository>
-          <tag>${project.version}</tag>
-        </configuration>
       </plugin>
 
       <plugin>