diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 77dc9f175f1dbff1ba3ce0b31f286f57b5596be9..207bf47c85ba30ea9c8454a71c6fa176689957ba 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -67,7 +67,12 @@ jobs:
     - name: run pptr tests - ${{ env.ATLAS_URL }}
       run: |
         docker exec --env ATLAS_URL=${ATLAS_URL} -t -w /iav ${DOCKER_E2E_PPTR} npm run e2e
-    - name: cleanup, stop container ${{ env.DOCKER_CONTAINER_NAME }}
+    - name: cleanup, stop container ${{ env.DOCKER_CONTAINER_NAME }} && ${{ env.DOCKER_E2E_PPTR }}
+      if: success()
+      run: |
+        docker stop ${DOCKER_CONTAINER_NAME}
+        docker stop ${DOCKER_E2E_PPTR}
+    - name: cleanup, remove image ${{ env.DOCKER_IMAGE_NAME }}:${{ env.DOCKER_IMAGE_TAG }}
       if: success()
       run: |
         docker rmi ${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}