diff --git a/plugins/builder-cnb/builder-build b/plugins/builder-cnb/builder-build
index 83f1e89a4..29ba83d0a 100755
--- a/plugins/builder-cnb/builder-build
+++ b/plugins/builder-cnb/builder-build
@@ -13,6 +13,8 @@ trigger-builder-cnb-builder-build() {
     return
   fi
 
+  dokku_log_info1 "Building $APP from cnb (experimental)..."
+
   if ! command -v "pack" &>/dev/null; then
     dokku_log_fail "Missing pack, install it"
   fi
diff --git a/plugins/builder-dockerfile/builder-build b/plugins/builder-dockerfile/builder-build
index a443da29b..dce61d6bb 100755
--- a/plugins/builder-dockerfile/builder-build
+++ b/plugins/builder-dockerfile/builder-build
@@ -12,6 +12,8 @@ trigger-builder-dockerfile-builder-build() {
     return
   fi
 
+  dokku_log_info1 "Building $APP from Dockerfile"
+
   local IMAGE=$(get_app_image_name "$APP")
   local DOCKER_BUILD_LABEL_ARGS="--label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=com.dokku.app-name=$APP"
 
diff --git a/plugins/builder-herokuish/builder-build b/plugins/builder-herokuish/builder-build
index 76be1b392..ee4b50123 100755
--- a/plugins/builder-herokuish/builder-build
+++ b/plugins/builder-herokuish/builder-build
@@ -12,6 +12,15 @@ trigger-builder-herokuish-builder-build() {
     return
   fi
 
+  local stack="$(plugn trigger buildpack-stack-name "$APP")"
+  if [[ -n "$stack" ]]; then
+    dokku_log_info1 "Building $APP from $stack"
+    DOKKU_IMAGE="$stack"
+  else
+    dokku_log_info1 "Building $APP from herokuish"
+  fi
+
+
   local IMAGE=$(get_app_image_name "$APP")
   local DOKKU_APP_CACHE_DIR="$DOKKU_ROOT/$APP/cache"
   local DOKKU_APP_HOST_CACHE_DIR="$DOKKU_HOST_ROOT/$APP/cache"
@@ -21,8 +30,6 @@ trigger-builder-herokuish-builder-build() {
 
   pushd "$SOURCECODE_WORK_DIR" &>/dev/null
 
-  DOKKU_IMAGE="$(plugn trigger buildpack-stack-name "$APP")"
-
   eval "$(config_export app "$APP")"
   plugn trigger builder-create-dokku-image "$BUILDER_TYPE" "$APP" "$SOURCECODE_WORK_DIR" "$DOKKU_IMAGE"
   NEW_DOKKU_IMAGE=$(plugn trigger builder-dokku-image "$BUILDER_TYPE" "$APP" "$SOURCECODE_WORK_DIR" "$DOKKU_IMAGE")
diff --git a/plugins/buildpacks/triggers.go b/plugins/buildpacks/triggers.go
index e5e20d6e5..ff198d4e0 100644
--- a/plugins/buildpacks/triggers.go
+++ b/plugins/buildpacks/triggers.go
@@ -30,8 +30,6 @@ func TriggerBuildpackStackName(appName string) error {
 		return nil
 	}
 
-	fmt.Println(os.Getenv("DOKKU_IMAGE"))
-
 	return nil
 }
 
diff --git a/plugins/common/functions b/plugins/common/functions
index 9c107192e..7fbd0b396 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -713,9 +713,6 @@ dokku_receive() {
   local DOKKU_CNB_EXPERIMENTAL="$(config_get "$APP" DOKKU_CNB_EXPERIMENTAL || true)"
   if [[ "$DOKKU_CNB_EXPERIMENTAL" == "1" ]]; then
     IMAGE_SOURCE_TYPE="cnb"
-    dokku_log_info1 "Building $APP from $IMAGE_SOURCE_TYPE (experimental)..."
-  else
-    dokku_log_info1 "Building $APP from $IMAGE_SOURCE_TYPE..."
   fi
 
   DOKKU_QUIET_OUTPUT=1 config_set --no-restart "$APP" DOKKU_APP_TYPE="$IMAGE_SOURCE_TYPE"