diff --git a/.github/workflows/deploy-devnet.yml b/.github/workflows/deploy-devnet.yml
index a1824ee757..c9fcec0fa7 100644
--- a/.github/workflows/deploy-devnet.yml
+++ b/.github/workflows/deploy-devnet.yml
@@ -75,12 +75,11 @@ jobs:
 
       - name: Commit container with deployed contracts
         run: |
-          docker commit $CONTAINER_NAME $FINAL_IMAGE
+          docker commit $CONTAINER_NAME $FINAL_IMAGE:latest
+          docker tag $FINAL_IMAGE:latest $FINAL_IMAGE:${{ env.COMMIT_SHA }}
 
       - name: Stop and remove container
-        run: |
-          docker commit $CONTAINER_NAME $FINAL_IMAGE:latest
-          docker tag $FINAL_IMAGE:latest $FINAL_IMAGE:${{ env.COMMIT_SHA }}         
+        run: docker rm -f $CONTAINER_NAME        
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v3