diff --git a/delete.sh b/delete.sh
index ae74a76..4106535 100755
--- a/delete.sh
+++ b/delete.sh
@@ -6,5 +6,12 @@ docker-compose -f docker-compose-jfrog.yml down
 sleep 5s
 
 # Check that containers were removed succesfully
-docker ps -a
+res=`docker ps -a | grep "/curex-local/kea_" | wc -l`
+if [ $res -eq 0 ]; then
+	echo "All KEA docker containers have been stopped and removed."
+else
+	echo "ERROR: Some KEA containers have not been removed."
+	docker ps -a
+	exit 1
+fi
 
diff --git a/deploy.sh b/deploy.sh
index 290f8d2..f985220 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -26,5 +26,5 @@ sleep 120
 docker-compose exec api php artisan migrate:fresh --seed --force
 
 #Check that everything is running succesfully
-docker ps -a
+docker ps -a | grep "^CONTAINER\|/curex-local/kea_"