diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 262ab51c..1f3142e4 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -91,51 +91,37 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create and push latest manifest image to Docker Hub
+        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
         uses: Noelware/docker-manifest-action@master
         with:
-          images: purplei2p/i2pd:latest
-          inputs: purplei2p/i2pd:latest-amd64,purplei2p/i2pd:latest-i386,purplei2p/i2pd:latest-arm64,purplei2p/i2pd:latest-armv7
+          inputs: purplei2p/i2pd:latest
+          images: purplei2p/i2pd:latest-amd64,purplei2p/i2pd:latest-i386,purplei2p/i2pd:latest-arm64,purplei2p/i2pd:latest-armv7
           push: true
 
       - name: Create and push latest manifest image to GHCR
+        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
         uses: Noelware/docker-manifest-action@master
         with:
-          images: ghcr.io/purplei2p/i2pd:latest
-          inputs: ghcr.io/purplei2p/i2pd:latest-amd64,ghcr.io/purplei2p/i2pd:latest-i386,ghcr.io/purplei2p/i2pd:latest-arm64,ghcr.io/purplei2p/i2pd:latest-armv7
+          inputs: ghcr.io/purplei2p/i2pd:latest
+          images: ghcr.io/purplei2p/i2pd:latest-amd64,ghcr.io/purplei2p/i2pd:latest-i386,ghcr.io/purplei2p/i2pd:latest-arm64,ghcr.io/purplei2p/i2pd:latest-armv7
           push: true
 
       - name: Store release version to env
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
         run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
 
-      - name: Create and push release manifest image to Docker Hub
+      - name: Create and push release manifest to Docker Hub
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
         uses: Noelware/docker-manifest-action@master
         with:
-          images: purplei2p/i2pd:latest-release
-          inputs: purplei2p/i2pd:latest-amd64,purplei2p/i2pd:latest-i386,purplei2p/i2pd:latest-arm64,purplei2p/i2pd:latest-armv7
+          inputs: purplei2p/i2pd:latest,purplei2p/i2pd:latest-release,purplei2p/i2pd:release-${{ env.RELEASE_VERSION }}
+          images: purplei2p/i2pd:latest-amd64,purplei2p/i2pd:latest-i386,purplei2p/i2pd:latest-arm64,purplei2p/i2pd:latest-armv7
           push: true
 
-      - name: Create and push release manifest image to GHCR
+      - name: Create and push release manifest to GHCR
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
         uses: Noelware/docker-manifest-action@master
         with:
-          images: ghcr.io/purplei2p/i2pd:latest-release
-          inputs: ghcr.io/purplei2p/i2pd:latest-amd64,ghcr.io/purplei2p/i2pd:latest-i386,ghcr.io/purplei2p/i2pd:latest-arm64,ghcr.io/purplei2p/i2pd:latest-armv7
-          push: true
-
-      - name: Create and push versioned manifest image to Docker Hub
-        if: ${{ startsWith(github.ref, 'refs/tags/') }}
-        uses: Noelware/docker-manifest-action@master
-        with:
-          images: purplei2p/i2pd:release-${{ env.RELEASE_VERSION }}
-          inputs: purplei2p/i2pd:latest-amd64,purplei2p/i2pd:latest-i386,purplei2p/i2pd:latest-arm64,purplei2p/i2pd:latest-armv7
-          push: true
-
-      - name: Create and push versioned manifest image to GHCR
-        if: ${{ startsWith(github.ref, 'refs/tags/') }}
-        uses: Noelware/docker-manifest-action@master
-        with:
-          images: ghcr.io/purplei2p/i2pd:release-${{ env.RELEASE_VERSION }}
-          inputs: ghcr.io/purplei2p/i2pd:latest-amd64,ghcr.io/purplei2p/i2pd:latest-i386,ghcr.io/purplei2p/i2pd:latest-arm64,ghcr.io/purplei2p/i2pd:latest-armv7
+          inputs: ghcr.io/purplei2p/i2pd:latest,ghcr.io/purplei2p/i2pd:latest-release,ghcr.io/purplei2p/i2pd:release-${{ env.RELEASE_VERSION }}
+          images: ghcr.io/purplei2p/i2pd:latest-amd64,ghcr.io/purplei2p/i2pd:latest-i386,ghcr.io/purplei2p/i2pd:latest-arm64,ghcr.io/purplei2p/i2pd:latest-armv7
           push: true