diff --git a/package/pom.xml b/package/pom.xml
index 3d499e528c..5ef6ee5ab8 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -142,44 +142,193 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.eclipse.jkube</groupId>
-                        <artifactId>kubernetes-maven-plugin</artifactId>
-                        <version>${kubernetes-maven-plugin.version}</version>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>3.1.0</version>
                         <executions>
+
+                            <execution>
+                                <id>amd64</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>build</argument>
+                                        <argument>--tag</argument>
+                                        <argument>arcadedata/arcadedb:latest-amd64</argument>
+                                        <argument>--tag</argument>
+                                        <argument>arcadedata/arcadedb:${project.version}-amd64</argument>
+                                        <argument>--platform</argument>
+                                        <argument>linux/amd64</argument>
+                                        <argument>--build-arg</argument>
+                                        <argument>TARGET=target/arcadedb-${project.version}.dir/arcadedb-${project.version}</argument>
+                                        <argument>-f</argument>
+                                        <argument>${project.basedir}/src/main/docker/Dockerfile</argument>
+                                        <argument>.</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+
                             <execution>
-                                <id>default</id>
+                                <id>arm64</id>
                                 <phase>package</phase>
                                 <goals>
-                                    <goal>build</goal>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>build</argument>
+                                        <argument>--tag</argument>
+                                        <argument>arcadedata/arcadedb:latest-arm64</argument>
+                                        <argument>--tag</argument>
+                                        <argument>arcadedata/arcadedb:${project.version}-arm64</argument>
+                                        <argument>--platform</argument>
+                                        <argument>linux/arm64</argument>
+                                        <argument>--build-arg</argument>
+                                        <argument>TARGET=target/arcadedb-${project.version}.dir/arcadedb-${project.version}</argument>
+                                        <argument>-f</argument>
+                                        <argument>${project.basedir}/src/main/docker/Dockerfile</argument>
+                                        <argument>.</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>latest_push_amd</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>push</argument>
+                                        <argument>arcadedata/arcadedb:latest-amd64</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>latest_push_arm</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>push</argument>
+                                        <argument>arcadedata/arcadedb:latest-arm64</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>latest_amend</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>manifest</argument>
+                                        <argument>create</argument>
+                                        <argument>arcadedata/arcadedb:latest</argument>
+                                        <argument>--amend</argument>
+                                        <argument>arcadedata/arcadedb:latest-amd64</argument>
+                                        <argument>--amend</argument>
+                                        <argument>arcadedata/arcadedb:latest-arm64</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>latest_push</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>manifest</argument>
+                                        <argument>push</argument>
+                                        <argument>arcadedata/arcadedb:latest</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>version_push_amd</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>push</argument>
+                                        <argument>arcadedata/arcadedb:${project.version}-amd64</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>version_push_arm</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>exec</goal>
                                 </goals>
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>push</argument>
+                                        <argument>arcadedata/arcadedb:${project.version}-arm64</argument>
+                                    </arguments>
+                                </configuration>
                             </execution>
+
                             <execution>
-                                <id>deploy</id>
+                                <id>version_amend</id>
                                 <phase>deploy</phase>
                                 <goals>
-                                    <goal>push</goal>
+                                    <goal>exec</goal>
                                 </goals>
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>manifest</argument>
+                                        <argument>create</argument>
+                                        <argument>arcadedata/arcadedb:${project.version}</argument>
+                                        <argument>--amend</argument>
+                                        <argument>arcadedata/arcadedb:${project.version}-amd64</argument>
+                                        <argument>--amend</argument>
+                                        <argument>arcadedata/arcadedb:${project.version}-arm64</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>version_push</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>manifest</argument>
+                                        <argument>push</argument>
+                                        <argument>arcadedata/arcadedb:${project.version}</argument>
+                                    </arguments>
+                                </configuration>
                             </execution>
                         </executions>
-                        <configuration>
-                            <verbose>true</verbose>
-                            <images>
-                                <image>
-                                    <name>arcadedata/arcadedb</name>
-                                    <build>
-                                        <dockerFile>${project.basedir}/src/main/docker/Dockerfile</dockerFile>
-                                        <contextDir>${project.build.directory}/arcadedb-${project.version}.dir</contextDir>
-                                        <args>
-                                            <docker.buildArg.ARCH>arm64v8/,amd64/,winamd64/,arm32v7/</docker.buildArg.ARCH>
-                                        </args>
-                                        <tags>
-                                            <tag>latest</tag>
-                                            <tag>${project.version}</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/package/src/main/docker/Dockerfile b/package/src/main/docker/Dockerfile
index 506fb95c7f..e15acac517 100644
--- a/package/src/main/docker/Dockerfile
+++ b/package/src/main/docker/Dockerfile
@@ -14,10 +14,12 @@
 # limitations under the License.
 #
 
-ARG ARCH=
+ARG ARCH
 
 FROM ${ARCH}eclipse-temurin:11
 
+ARG TARGET
+
 LABEL maintainer="Arcade Data LTD (info@arcadedb.com)"
 
 ENV JAVA_OPTS=" "
@@ -30,10 +32,13 @@ ENV ARCADEDB_JMX="-Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxre
 
 RUN useradd -ms /bin/bash arcadedb
 
+COPY --chown=arcadedb:arcadedb ${TARGET} /home/arcadedb
+
+RUN chmod +x /home/arcadedb/bin/*.sh
+
 WORKDIR /home/arcadedb
 
-COPY --chown=arcadedb:arcadedb ./maven/arcadedb-* ./
-RUN chmod +x ./bin/*.sh
+USER arcadedb
 
 # Volumes available
 VOLUME [ "/home/arcadedb/databases"]