diff --git a/plugins/builder-herokuish/builder-release b/plugins/builder-herokuish/builder-release
index 23e7d4ed5..f0a72f890 100755
--- a/plugins/builder-herokuish/builder-release
+++ b/plugins/builder-herokuish/builder-release
@@ -14,12 +14,6 @@ trigger-builder-herokuish-builder-release() {
   fi
 
   local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG")
-  if fn-plugn-trigger-exists "pre-release-buildpack"; then
-    dokku_log_warn "Deprecated: please upgrade plugin to use 'pre-release-builder' plugin trigger instead of pre-release-buildpack"
-    plugn trigger pre-release-buildpack "$APP" "$IMAGE_TAG"
-  fi
-  plugn trigger pre-release-builder "$BUILDER_TYPE" "$APP" "$IMAGE"
-
   TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-${DOKKU_PID}-${FUNCNAME[0]}.XXXXXX")"
   trap "rm -rf '$TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
 
@@ -36,6 +30,17 @@ trigger-builder-herokuish-builder-release() {
   DOKKU_APP_USER=$(config_get "$APP" DOKKU_APP_USER || true)
   DOKKU_APP_USER=${DOKKU_APP_USER:="herokuishuser"}
 
+  if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-herokuish/dockerfiles/builder-pre-release.Dockerfile" --build-arg APP_IMAGE="$IMAGE" --build-arg "DOKKU_APP_USER=$DOKKU_APP_USER" -t "$IMAGE" "$TMP_WORK_DIR"; then
+    dokku_log_warn "Failure injecting environment variables"
+    return 1
+  fi
+
+  if fn-plugn-trigger-exists "pre-release-buildpack"; then
+    dokku_log_warn "Deprecated: please upgrade plugin to use 'pre-release-builder' plugin trigger instead of pre-release-buildpack"
+    plugn trigger pre-release-buildpack "$APP" "$IMAGE_TAG"
+  fi
+  plugn trigger pre-release-builder "$BUILDER_TYPE" "$APP" "$IMAGE"
+
   if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-herokuish/dockerfiles/builder-release.Dockerfile" --build-arg APP_IMAGE="$IMAGE" --build-arg "DOKKU_APP_USER=$DOKKU_APP_USER" -t "$IMAGE" "$TMP_WORK_DIR"; then
     dokku_log_warn "Failure injecting environment variables"
     return 1
diff --git a/plugins/builder-herokuish/dockerfiles/builder-pre-release.Dockerfile b/plugins/builder-herokuish/dockerfiles/builder-pre-release.Dockerfile
new file mode 100644
index 000000000..bef15548b
--- /dev/null
+++ b/plugins/builder-herokuish/dockerfiles/builder-pre-release.Dockerfile
@@ -0,0 +1,5 @@
+ARG APP_IMAGE
+FROM $APP_IMAGE
+
+ARG DOKKU_APP_USER herokuishuser
+COPY --chown=$DOKKU_APP_USER 00-global-env.sh 01-app-env.sh /app/.profile.d/