diff --git a/CHANGELOG b/CHANGELOG
index 121edad44cfe27e712e57030af2b168940b28f2d..1e73d823a326a18af16e3e08072ea36b5f9aae7c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
-v1.10.1 2019-12-27
+v1.10.2 2019-12-27
 ------------------
+Fix update scripts to remove old containers
 
+v1.10.1 2019-12-27
+------------------
 Force rebuild to include Sodium support for PHP 7.2
diff --git a/run/scripts/update b/run/scripts/update
index 1befa806fdf088996a8c3f0f38f66ce7d080c55b..8ec773f1343a6fdbd7bd6670eaef01fe44a8e04e 100755
--- a/run/scripts/update
+++ b/run/scripts/update
@@ -1,37 +1,36 @@
 #!/bin/bash
 
 function removecontainer {
-  if [[ "$1" == "selective" ]]; then
-    IMAGEID=$(docker image ls -q registry.lakedrops.com/docker/l3d/$2 | grep -v ${NEWIMAGEID})
-  else
-    IMAGEID=$(docker image ls -q registry.lakedrops.com/docker/l3d/$2)
-  fi
-  if [[ -n ${IMAGEID} ]]; then
-    while true; do
-      ID=$(docker container ls --all -q -f ancestor=${IMAGEID})
-      if [[ -n ${ID} ]]; then
-        echo "Removing outdated container ..."
-        docker kill ${ID} >/dev/null
-        docker rm ${ID} >/dev/null
-      else
-        break
-      fi
-    done
-    if [[ "$1" == "selective" ]]; then
-      echo "Removing outdated image ..."
-      docker rmi ${IMAGEID} >/dev/null
+  while true; do
+    ID=$(docker container ls --all -q -f ancestor=$1 | head -1)
+    if [[ -n ${ID} ]]; then
+      echo "Removing outdated container ..."
+      docker kill ${ID} >/dev/null
+      docker rm ${ID} >/dev/null
+    else
+      break
     fi
+  done
+  if [[ "$2" == "rmi" ]]; then
+    echo "Removing outdated image ..."
+    docker rmi $1 >/dev/null
   fi
 }
 
 function cleanup {
   if [[ $L3D_FORCE_UPDATE -eq 1 ]]; then
-    removecontainer all php-${PHP_VERSION}
+    IMAGEIDS=( $(docker image ls -q registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}) )
+    for IMAGEID in $IMAGEIDS; do
+      removecontainer $IMAGEID
+    done
   else
-    NEWIMAGEID=$(docker image ls -q registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION} | head -1)
-    removecontainer selective php-${PHP_VERSION}
+    IMAGEID=$(docker image ls -q registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION} | head -1)
+    removecontainer $IMAGEID rmi
   fi
-  removecontainer all node:8-jessie-slim
+  IMAGEIDS=( $(docker image ls -q node:8-jessie-slim) )
+  for IMAGEID in $IMAGEIDS; do
+    removecontainer $IMAGEID
+  done
 }
 
 if [[ -n ${PHP_VERSION} ]]; then