diff --git a/azure-pipelines-automated-testing.yml b/azure-pipelines-automated-testing.yml
index ae989a2d..f7494d9c 100644
--- a/azure-pipelines-automated-testing.yml
+++ b/azure-pipelines-automated-testing.yml
@@ -169,6 +169,9 @@ stages:
               # Remove container
               echo "Cleaning up container..."
               docker rm $container_id
+
+              # TODO: REMOVE Delete all playwright containers
+              docker rmi $(docker images | grep "playwright-tests")
           env:
             JIRA_API_KEY: $(JIRA_API_KEY)
             PLAYWRIGHT_JUNIT_OUTPUT_FILE: "test-results/results.xml"
@@ -193,6 +196,10 @@ stages:
             targetPath: '$(System.DefaultWorkingDirectory)/ortoni-report'
             artifact: 'playwright-merged-report'
             publishLocation: 'pipeline'
+        - script: |
+            docker rmi $(dockerImageName):$(imageTag) -f
+          displayName: 'Cleanup Docker Image'
+          condition: always()
 
   - ${{ else }}:
     # Dev Build/Deploy