diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 80e05ff22..138269f1a 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -65,8 +65,8 @@ __Solution (Less solution, more helpful troubleshooting steps):__
   Find the failed phase's container image (*077581956a92* in this example)
 
     ```
-    root@dokku:~# docker ps -a  | grep builder
-    94d9515e6d93        077581956a92                "/build/builder"       29 minutes ago      Exited (0) 25 minutes ago                       cocky_bell
+    root@dokku:~# docker ps -a  | grep build
+    94d9515e6d93        077581956a92                "/build"       29 minutes ago      Exited (0) 25 minutes ago                       cocky_bell
     ```
 
   Start a new container with the failed image and poke around (i.e. ensure you can access the internet from within the container or attempt the failed command, if known)
diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands
index 10a74e392..860f13f71 100755
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -24,7 +24,7 @@ case "$1" in
         # https://github.com/progrium/dokku/issues/896 & https://github.com/progrium/dokku/issues/906
         DOCKER_ARGS=$(: | pluginhook docker-args $APP build)
         DOCKER_ARGS+=$(: | pluginhook docker-args-build $APP)
-        id=$(docker run -d -v $CACHE_DIR:/cache -e CACHE_PATH=/cache $DOCKER_ARGS $IMAGE /build/builder)
+        id=$(docker run -d -v $CACHE_DIR:/cache -e CACHE_PATH=/cache $DOCKER_ARGS $IMAGE /build)
         docker attach $id
         test "$(docker wait $id)" -eq 0
         docker commit $id $IMAGE > /dev/null
diff --git a/plugins/ps/functions b/plugins/ps/functions
index b41d46d8a..23cba6f07 100755
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -6,7 +6,7 @@ release_and_deploy() {
   source "$(dirname $0)/../common/functions"
   local APP="$1"; local IMAGE="dokku/$APP"
 
-  if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
+  if verify_image "$IMAGE"; then
     if is_image_herokuish_based "$IMAGE"; then
       IMAGE_SOURCE_TYPE="herokuish"
     else