diff --git a/plugins/app-json/internal-functions b/plugins/app-json/internal-functions
index 37599fbf0..a3351df47 100755
--- a/plugins/app-json/internal-functions
+++ b/plugins/app-json/internal-functions
@@ -38,7 +38,7 @@ execute_script() {
 
   IMAGE=$(get_deploying_app_image_name "$APP" "$IMAGE_TAG")
   if [[ "$PHASE_SCRIPT_KEY" == "release" ]]; then
-    SCRIPT_CMD=$(get_release_cmd "$APP" "$IMAGE" 2>/dev/null || true)
+    SCRIPT_CMD=$(get_release_cmd "$APP" "$IMAGE_TAG" 2>/dev/null || true)
   else
     SCRIPT_CMD=$(get_phase_script "$IMAGE" "$PHASE_SCRIPT_KEY" 2>/dev/null || true)
   fi
diff --git a/tests/unit/20_build-env.bats b/tests/unit/20_build-env.bats
index 688d088a0..8b59c61c5 100644
--- a/tests/unit/20_build-env.bats
+++ b/tests/unit/20_build-env.bats
@@ -74,7 +74,7 @@ teardown() {
 @test "(build-env) DOKKU_ROOT cache bind is used by default" {
   deploy_app
 
-  BUILD_CID=$(docker ps -a |grep $TEST_APP |grep /bin/bash | awk '{print $1}')
+  BUILD_CID=$(docker ps -a | grep $TEST_APP | grep /bin/bash | awk '{print $1}' | head -n1)
   run /bin/bash -c "docker inspect --format '{{ .HostConfig.Binds }}' $BUILD_CID | tr -d '[]' | cut -f1 -d:"
   echo "output: $output"
   echo "status: $status"
@@ -87,7 +87,7 @@ teardown() {
   echo export DOKKU_HOST_ROOT="$TMP_ROOT" > $DOKKU_ROOT/.dokkurc/HOST_ROOT
   DOKKU_HOST_ROOT="$TMP_ROOT" deploy_app
 
-  BUILD_CID=$(docker ps -a |grep $TEST_APP |grep /bin/bash | awk '{print $1}')
+  BUILD_CID=$(docker ps -a | grep $TEST_APP | grep /bin/bash | awk '{print $1}' | head -n1)
   run /bin/bash -c "docker inspect --format '{{ .HostConfig.Binds }}' $BUILD_CID | tr -d '[]' | cut -f1 -d:"
   echo "output: $output"
   echo "status: $status"