diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml
index 7d9e1bc..d60239d 100644
--- a/.github/workflows/build_container.yml
+++ b/.github/workflows/build_container.yml
@@ -88,6 +88,13 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Log in to the docker.io registry
+        uses: docker/login-action@v3
+        with:
+          registry: docker.io
+          username: voxpupulibot
+          password: ${{ secrets.DOCKERHUB_BOT_ADMIN_TOKEN }}
+
       - name: Extract version number
         id: extract_version
         uses: actions/github-script@v7
@@ -118,3 +125,41 @@ jobs:
           docker buildx imagetools create -t ghcr.io/openvoxproject/openvoxdb:latest \
             ghcr.io/openvoxproject/openvoxdb:${{ matrix.release }}-${{ github.sha }}-arm64 \
             ghcr.io/openvoxproject/openvoxdb:${{ matrix.release }}-${{ github.sha }}-x86_64
+
+          # on docker.io we use the voxpupuli namespace because new organizations are not free anymore
+          docker buildx imagetools create -t docker.io/voxpupuli/openvoxdb:${{ steps.extract_version.outputs.version }}-${{ github.ref_name }} \
+            ghcr.io/openvoxproject/openvoxdb:${{ matrix.release }}-${{ github.sha }}-arm64 \
+            ghcr.io/openvoxproject/openvoxdb:${{ matrix.release }}-${{ github.sha }}-x86_64
+
+          docker buildx imagetools create -t docker.io/voxpupuli/openvoxdb:${{ steps.extract_version.outputs.version }}-latest \
+            ghcr.io/openvoxproject/openvoxdb:${{ matrix.release }}-${{ github.sha }}-arm64 \
+            ghcr.io/openvoxproject/openvoxdb:${{ matrix.release }}-${{ github.sha }}-x86_64
+
+          docker buildx imagetools create -t docker.io/voxpupuli/openvoxdb:${{ matrix.release }}-latest \
+            ghcr.io/openvoxproject/openvoxdb:${{ matrix.release }}-${{ github.sha }}-arm64 \
+            ghcr.io/openvoxproject/openvoxdb:${{ matrix.release }}-${{ github.sha }}-x86_64
+
+          docker buildx imagetools create -t docker.io/voxpupuli/openvoxdb:${{ matrix.release }} \
+            ghcr.io/openvoxproject/openvoxdb:${{ matrix.release }}-${{ github.sha }}-arm64 \
+            ghcr.io/openvoxproject/openvoxdb:${{ matrix.release }}-${{ github.sha }}-x86_64
+
+          docker buildx imagetools create -t docker.io/voxpupuli/openvoxdb:latest \
+            ghcr.io/openvoxproject/openvoxdb:${{ matrix.release }}-${{ github.sha }}-arm64 \
+            ghcr.io/openvoxproject/openvoxdb:${{ matrix.release }}-${{ github.sha }}-x86_64
+
+  update-dockerhub-description:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    needs:
+      - create-multi-arch-manifests
+    steps:
+      - name: Source checkout
+        uses: actions/checkout@v4
+
+      - name: Update Docker Hub Description
+        uses: peter-evans/dockerhub-description@v4
+        with:
+          username: voxpupulibot
+          password: ${{ secrets.DOCKERHUB_BOT_ADMIN_TOKEN }}
+          repository: voxpupuli/openvoxdb