diff --git a/dokku b/dokku
index c3ca6a3d9..57dc78586 100755
--- a/dokku
+++ b/dokku
@@ -157,9 +157,10 @@ case "$1" in
       else
         CONTAINER_IDX_OFFSET=$((PROC_COUNT + 1))
       fi
-      find $DOKKU_ROOT/$APP -maxdepth 1 -name "CONTAINER.$PROC_TYPE.*" | sort -t . -k 4 -n | tail -n +$CONTAINER_IDX_OFFSET | xargs rm -f
-      find $DOKKU_ROOT/$APP -maxdepth 1 -name "IP.$PROC_TYPE.*" | sort -t . -k 4 -n | tail -n +$CONTAINER_IDX_OFFSET | xargs rm -f
-      find $DOKKU_ROOT/$APP -maxdepth 1 -name "PORT.$PROC_TYPE.*" | sort -t . -k 4 -n | tail -n +$CONTAINER_IDX_OFFSET | xargs rm -f
+      for container_state_filetype in CONTAINER IP PORT; do
+        cd $DOKKU_ROOT/$APP
+        find . -maxdepth 1 -name "$container_state_filetype.$PROC_TYPE.*" -printf "%f\n" | sort -t . -k 3 -n | tail -n +$CONTAINER_IDX_OFFSET | xargs rm -f
+      done
     done < "$DOKKU_SCALE_FILE"
 
     dokku_log_info1 "Running post-deploy"