diff --git a/plugins/named-containers/post-deploy b/plugins/named-containers/post-deploy
index 40c8576fa49..56d3c9141bc 100755
--- a/plugins/named-containers/post-deploy
+++ b/plugins/named-containers/post-deploy
@@ -6,7 +6,7 @@ APP="$1"; APP_ROOT="$DOKKU_ROOT/$APP"
 for container in "$APP_ROOT"/CONTAINER.*; do
   DYNO=$(echo "$container" | sed -r 's/.*CONTAINER\.(.*)/\1/') || true
   NAME="$APP.$DYNO"
-  PREVIOUS=$(docker ps -a -q -f name="$NAME\$") || true
+  PREVIOUS=$(docker ps -a -q -f name="^.?$NAME\$") || true
   if [[ -n $PREVIOUS ]]; then
     docker rename "$NAME" "$NAME.$(date +%s)" > /dev/null
   fi