diff --git a/.github/workflows/docker-image-official.yml b/.github/workflows/docker-image-official.yml
deleted file mode 100644
index f251f30..0000000
--- a/.github/workflows/docker-image-official.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Docker Image CI for Official aMule
-
-on:
-  workflow_dispatch:
-    
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-    if: github.event.repository.owner.id == github.event.sender.id
-
-    steps:
-    
-    - uses: actions/checkout@v2
-    
-    - name: Login to DockerHub
-      uses: docker/login-action@v1 
-      with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
-          
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1.0.1
-          
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-    
-    - name: Build and push
-      uses: docker/build-push-action@v2
-      with:
-          context: ./
-          file: ./official-2.3.3/Dockerfile
-          push: true
-          platforms: linux/arm,linux/arm64,linux/amd64
-          tags: minnyres/amule-dlp:official-2.3.3
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 40fee0b..9dc96bf 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -8,6 +8,7 @@ jobs:
     strategy:
       matrix:
         platform: [linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64/v8, linux/ppc64le, linux/s390x, linux/riscv64]
+        amule_version: [dlp, official-2.3.3]
 
     runs-on: ubuntu-latest
 
@@ -39,7 +40,9 @@ jobs:
       uses: docker/build-push-action@v2
       with:
           context: ./
-          file: ./Dockerfile
+          file: ./${{ matrix.amule_version }}/Dockerfile
           push: true
           platforms: ${{ matrix.platform }}
-          tags: minnyres/amule-dlp:${{ steps.setValues.outputs.CPU_ARCH }}
+          tags: minnyres/amule-dlp:${{ matrix.amule_version }}-${{ steps.setValues.outputs.CPU_ARCH }}
+          provenance: false
+          sbom: false
diff --git a/Dockerfile b/dlp/Dockerfile
similarity index 100%
rename from Dockerfile
rename to dlp/Dockerfile
diff --git a/official-2.3.3/Dockerfile b/official-2.3.3/Dockerfile
index 0daf91d..b013682 100644
--- a/official-2.3.3/Dockerfile
+++ b/official-2.3.3/Dockerfile
@@ -5,7 +5,7 @@ RUN buildDeps='g++ git bash patch file libtool automake make flex bison wget xz
     && apk add --no-cache $buildDeps \
     && mkdir -p /amule-build /app/lib
     
-COPY cryptopp.sh wxbase.sh upnp.sh autoconf.sh amule-fix-exception.patch /amule-build/
+COPY cryptopp.sh wxbase.sh upnp.sh autoconf.sh amule-fix-exception.patch config.sub config.guess /amule-build/
 
 # Build dependencies
 RUN cd /amule-build \