diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index cddadcffb59386f84c522712b4c80e46004ccc11..4726e88927485f6fafa300a866947e1ddbe86378 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -56,4 +56,7 @@ jobs:
         TEST_URL: http://localhost:3001
     - name: cleanup, stop container ${{ env.DOCKER_CONTAINER_NAME }}
       if: always()
-      run: docker stop ${DOCKER_CONTAINER_NAME} && docker rmi ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}
+      run: docker stop ${DOCKER_CONTAINER_NAME}
+    -name: cleanup, remove image ${{ env.DOCKER_IMAGE_NAME }}:${{ env.DOCKER_IMAGE_TAG }}
+      if: success()
+      run: docker rmi ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}