diff --git a/pom.xml b/pom.xml
index 9854434..ebfaa8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,6 +197,10 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-smallrye-jwt</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-container-image-jib</artifactId>
+    </dependency>
 
     <!-- JNA -->
     <dependency>
@@ -348,47 +352,6 @@
       </plugin>
 
       <plugin>
-        <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>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>
-      </plugin>
-
-      <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <version>${antrun-plugin.version}</version>
         <executions>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 80a4620..1e6de8a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -64,6 +64,15 @@
 # Deployment
 docker.registry = docker.benkard.de
 
+quarkus.container-image.build = true
+quarkus.container-image.push = true
+quarkus.container-image.group = mulk
+quarkus.container-image.name = mulkcms2
+quarkus.container-image.registry = docker.benkard.de
+
+quarkus.jib.base-jvm-image = adoptopenjdk:14-jre-hotspot
+quarkus.jib.jvm-arguments = -XX:+UnlockExperimentalVMOptions,-XX:+UseShenandoahGC,-XX:ShenandoahGCHeuristics=compact
+
 kubernetes.deployment.target = kubernetes
 kubernetes.group = mulk
 kubernetes.name = mulkcms2