diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 2d2a4d7738..4104c39b8d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -61,24 +61,25 @@ jobs:
             PATHFINDER_FORCE_VERSION=${{ steps.generate_version.outputs.pathfinder_version }}
           builder: ${{ steps.buildx.outputs.name }}
           push: true
-          tags: ${{ github.sha }}
+          tags: mirko-testsnapshot-${{ github.sha }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
   # Add the release labels to the associated docker image.
   tag-release:
-    if: github.event_name == 'release'
+    needs: build-image
     runs-on: ubuntu-latest
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_HUB_USERNAME }}
-        password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-    - name: Pull image
-      run: docker pull eqlabs/pathfinder:${{ github.sha }}
-    - name: Tag image
-      run: |
-        docker tag eqlabs/pathfinder:${{ github.sha }} eqlabs/pathfinder:latest
-        docker tag eqlabs/pathfinder:${{ github.sha }} eqlabs/pathfinder:${{ github.event.release.tag_name }}
-    - name: Push image tags
-      run: docker push --all-tags eqlabs/pathfinder
\ No newline at end of file
+    steps:
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+      - name: Pull image
+        run: docker pull eqlabs/pathfinder:mirko-testsnapshot-${{ github.sha }}
+      - name: Tag image
+        run: |
+          docker tag eqlabs/pathfinder:mirko-testsnapshot-${{ github.sha }} eqlabs/pathfinder:mirko
+          # docker tag eqlabs/pathfinder:mirko-testsnapshot-${{ github.sha }} eqlabs/pathfinder:${{ github.event.release.tag_name }}
+      - name: Push image tags
+        run: docker push --all-tags eqlabs/pathfinder
\ No newline at end of file