diff --git a/docker/build-docker-image.sh b/docker/build-docker-image.sh
new file mode 100755
index 000000000..19a3b86ff
--- /dev/null
+++ b/docker/build-docker-image.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+#  Copyright 2017-2022 Adobe.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#          http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+BUILDER_NAME=$1
+TAG_NAME=$2
+
+docker buildx build --load --tag "${TAG_NAME}" --builder "${BUILDER_NAME}" .
diff --git a/docker/pom.xml b/docker/pom.xml
index 6481ec49a..b0e8c5d80 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -110,17 +110,67 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>io.fabric8</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
             <executions>
+              <execution>
+                <id>start-buildkit</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <executable>sh</executable>
+                  <arguments>
+                    <argument>start-buildkit.sh</argument>
+                    <argument>${docker-builder.image.name}</argument>
+                  </arguments>
+                </configuration>
+              </execution>
               <execution>
                 <id>build-docker-image</id>
                 <phase>package</phase>
                 <goals>
-                  <goal>build</goal>
+                  <goal>exec</goal>
                 </goals>
+                <configuration>
+                  <executable>sh</executable>
+                  <arguments>
+                    <argument>build-docker-image.sh</argument>
+                    <argument>${docker-builder.image.name}</argument>
+                    <argument>${docker.image.name}:${project.version}</argument>
+                  </arguments>
+                </configuration>
+              </execution>
+              <execution>
+                <id>stop-builder-container</id>
+                <phase>deploy</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <executable>docker</executable>
+                  <arguments>
+                    <argument>buildx</argument>
+                    <argument>rm</argument>
+                    <argument>${docker-builder.image.name}</argument>
+                  </arguments>
+                </configuration>
               </execution>
             </executions>
+            <configuration>
+              <includeProjectDependencies>true</includeProjectDependencies>
+              <includePluginDependencies>false</includePluginDependencies>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>com.adobe.testing</groupId>
+                <artifactId>s3mock</artifactId>
+                <classifier>exec</classifier>
+                <version>${project.version}</version>
+                <type>jar</type>
+              </dependency>
+            </dependencies>
           </plugin>
         </plugins>
       </build>
@@ -133,15 +183,26 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>io.fabric8</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
             <executions>
               <execution>
-                <id>tag-docker-image-commit-id</id>
-                <phase>install</phase>
+                <id>push-docker-image</id>
+                <phase>package</phase>
                 <goals>
-                  <goal>push</goal>
+                  <goal>exec</goal>
                 </goals>
+                <configuration>
+                  <executable>sh</executable>
+                  <arguments>
+                    <argument>push-docker-image.sh</argument>
+                    <argument>${docker-builder.image.name}</argument>
+                    <!-- Versioned tag name -->
+                    <argument>${docker.image.name}:${project.version}</argument>
+                    <!-- Latest tag name -->
+                    <argument>${docker.image.name}:latest</argument>
+                  </arguments>
+                </configuration>
               </execution>
             </executions>
           </plugin>
diff --git a/docker/push-docker-image.sh b/docker/push-docker-image.sh
new file mode 100755
index 000000000..16a7fb293
--- /dev/null
+++ b/docker/push-docker-image.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+#  Copyright 2017-2022 Adobe.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#          http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+BUILDER_NAME=$1
+VERSIONED_TAG_NAME=$2
+LATEST_TAG_NAME=$3
+
+docker buildx build --platform linux/amd64,linux/arm64 --push --tag "${VERSIONED_TAG_NAME}" --tag "${LATEST_TAG_NAME}" --builder "${BUILDER_NAME}" .
diff --git a/docker/start-buildkit.sh b/docker/start-buildkit.sh
new file mode 100755
index 000000000..2e774159e
--- /dev/null
+++ b/docker/start-buildkit.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+#  Copyright 2017-2022 Adobe.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#          http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+BUILDER_NAME=$1
+
+if [ "$(docker buildx ls | grep ${BUILDER_NAME} | wc -l)" -eq 0 ]; then \
+  docker buildx create --driver docker-container --name "${BUILDER_NAME}" ; \
+  docker buildx inspect --bootstrap --builder "${BUILDER_NAME}" ; \
+fi
diff --git a/pom.xml b/pom.xml
index 3773cb693..02df45c6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
     <java.version>8</java.version>
 
     <docker.image.name>adobe/s3mock</docker.image.name>
+    <docker-builder.image.name>s3mock-buildx</docker-builder.image.name>
     <!-- Run Docker build by default -->
     <skipDocker>false</skipDocker>
 
@@ -202,6 +203,11 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
           <version>${maven-enforcer-plugin.version}</version>