diff --git a/.github/oxid-esales/cypress.sh b/.github/oxid-esales/cypress.sh
index c0ed921..01a10a4 100755
--- a/.github/oxid-esales/cypress.sh
+++ b/.github/oxid-esales/cypress.sh
@@ -1,5 +1,16 @@
 #!/bin/bash
 
+# Find and kill any container using port 5900
+CONTAINER_ID=$(docker ps --filter "publish=5900" -q)
+if [ -n "$CONTAINER_ID" ]; then
+    for id in $CONTAINER_ID; do
+        echo "Found container using port 5900: $id"
+        docker stop $id
+        docker rm $id
+        echo "Killed and removed container $id"
+    done
+fi
+
 # Update Selenium service ports in docker-compose.yml
 sed -i '/selenium:/,/ports:/ {/5900:5900/s/5900:5900/5980:5900/}' docker-compose.yml