diff --git a/l3d b/l3d
index 365b1baa019bb5b0053291e00cf02222752ec343..7aa4d26df891615e0aa5fff5dd290e5b0ab03e02 100755
--- a/l3d
+++ b/l3d
@@ -48,6 +48,7 @@ fi
 ID=$(docker container ls -q -f name=${COMPOSE_PROJECT_NAME}_l3d)
 
 if [[ "$1" == "update" ]]; then
+  IMAGEID=$(docker image ls -q registry.lakedrops.com/docker/l3d:php-${PHP_VERSION})
   echo "Updating the image ..."
   STATUS=$(docker pull registry.lakedrops.com/docker/l3d:php-${PHP_VERSION})
   if [[ "$STATUS" == *"Status: Image is up to date"* ]]; then
@@ -55,10 +56,16 @@ if [[ "$1" == "update" ]]; then
   else
     echo "Image updated"
     if [[ -n "$ID" ]]; then
-      echo "Removing outdated container ..."
-      docker stop ${COMPOSE_PROJECT_NAME}_l3d
-      docker rm ${COMPOSE_PROJECT_NAME}_l3d
-      ID=
+      while true; do
+        ID=$(docker container ls -q -f ancestor=${IMAGEID})
+        if [[ -n "$ID" ]]; then
+          echo "Removing outdated container ..."
+          docker stop ${ID}
+          docker rm ${ID}
+        else
+          break
+        fi
+      done
     fi
   fi
 fi