diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 45ceb6e3..2f350c0a 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -26,7 +26,7 @@ jobs:
         echo "app_ver=$(mvn -B help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
     -
       name: Build with Maven
-      run: mvn -B clean integration-test package assembly:single docker:build
+      run: mvn -B clean integration-test package docker:build
 
 # github_release:
     -
diff --git a/pom.xml b/pom.xml
index fbb968c3..ad3b1fbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
         <protobuf.version>3.19.1</protobuf.version>
         <testcontainers.version>1.16.2</testcontainers.version>
         <kafka-libs.version>6.1.4</kafka-libs.version>
+        <docker.base.image>eclipse-temurin:11</docker.base.image>
     </properties>
 
     <scm>
@@ -220,14 +221,6 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
             <plugin>
                 <!-- Build an executable JAR -->
                 <groupId>org.apache.maven.plugins</groupId>
@@ -243,24 +236,29 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>com.spotify</groupId>
+                <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.0</version>
+                <version>0.40.1</version>
                 <configuration>
-                    <imageName>obsidiandynamics/kafdrop</imageName>
-                    <forceTags>true</forceTags>
-                    <dockerDirectory>${project.build.directory}/docker-ready</dockerDirectory>
-                    <imageTags>
-                        <imageTag>${project.version}</imageTag>
-                        <imageTag>latest</imageTag>
-                    </imageTags>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>${project.build.finalName}-bin.tar.gz</include>
-                        </resource>
-                    </resources>
+                    <verbose>true</verbose>
+                    <sourceDirectory>src/main/assembly</sourceDirectory>
+                    <images>
+                        <image>
+                            <name>obsidiandynamics/kafdrop</name>
+                            <build>
+                                <tags>
+                                    <tag>${project.version}</tag>
+                                    <tag>latest</tag>
+                                </tags>
+                                <contextDir>${project.build.directory}/docker-ready</contextDir>
+                                <assembly>
+                                    <name>${project.build.finalName}</name>
+                                    <mode>tar</mode>
+                                    <descriptor>bin.xml</descriptor>
+                                </assembly>
+                            </build>
+                        </image>
+                    </images>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 5ff79a52..f02064f4 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,7 +1,7 @@
-FROM eclipse-temurin:11
+FROM ${docker.base.image}
 
 ADD kafdrop.sh /
-ADD kafdrop*tar.gz /
+ADD ${project.build.finalName} /${project.build.finalName}
 
 RUN chmod +x /kafdrop.sh