diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dd3181c22..c41753b61 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -105,8 +105,11 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: registry.digitalocean.com/${{ env.IMAGE_NAME }}
+          flavor: |
+            latest=auto
+            prefix=${{ steps.set-network.outputs.NETWORK_NAME }}-,onlatest=true
           tags: |
-            type=semver,pattern={{version}},suffix=-${{ steps.set-network.outputs.NETWORK_NAME }},value=${{ needs.release-binary.outputs.VERSION }}
+            type=semver,pattern={{version}},value=${{ needs.release-binary.outputs.VERSION }}
           labels: |
             org.opencontainers.image.title="BDJuno for cheqd network"
             org.opencontainers.image.description="BDJuno for cheqd network"
@@ -126,8 +129,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
 
       - name: Push BDJuno image
-        run: |
-          docker push registry.digitalocean.com/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.tags }}
+        run: docker image push --all-tags registry.digitalocean.com/${{ env.IMAGE_NAME }}
 
   release-hasuracli:
     name: "Hasura CLI Docker Image"
@@ -165,8 +167,11 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: registry.digitalocean.com/cheqd/hasuracli
+          flavor: |
+            latest=auto
+            prefix=${{ steps.set-network.outputs.NETWORK_NAME }}-,onlatest=true
           tags: |
-            type=semver,pattern={{version}},suffix=-${{ steps.set-network.outputs.NETWORK_NAME }},value=${{ needs.release-binary.outputs.VERSION }}
+            type=semver,pattern={{version}},value=${{ needs.release-binary.outputs.VERSION }}
           labels: |
             org.opencontainers.image.title="Hasura CLI for BDJuno"
             org.opencontainers.image.description="Standalone Hasura CLI for cheqd network BDJuno configuration"
@@ -186,5 +191,4 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
 
       - name: Push Hasura CLI image
-        run: |
-          docker push registry.digitalocean.com/cheqd/hasuracli:${{ steps.meta.outputs.tags }}
+        run: docker image push --all-tags registry.digitalocean.com/cheqd/hasuracli