diff --git a/heroku-24-build/Dockerfile b/heroku-24-build/Dockerfile
index a965f59..e916482 100644
--- a/heroku-24-build/Dockerfile
+++ b/heroku-24-build/Dockerfile
@@ -14,3 +14,7 @@ ENV CNB_GROUP_ID=1000
 # Stack IDs are deprecated, but we still set this for backwards compatibility:
 # https://github.com/buildpacks/spec/blob/platform/0.13/platform.md#iobuildpacksstack-labels
 ENV CNB_STACK_ID="heroku-24"
+
+# Match HOME operation done in [heroku-22](https://github.com/usiegj00/base-images/blob/3bed84a6cf88bc6535b1ef18acbc454f88c854d8/heroku-22-cnb/Dockerfile#L17). 
+# This is related to [the user HOME issue exposed here](https://github.com/heroku/base-images/pull/332).
+ENV HOME=/workspace
diff --git a/heroku-24/setup.sh b/heroku-24/setup.sh
index 6156a5e..053cd66 100755
--- a/heroku-24/setup.sh
+++ b/heroku-24/setup.sh
@@ -154,8 +154,8 @@ test "$(file --brief /etc/ssl/certs/java/cacerts)" = "Java KeyStore"
 # that we have to remove before creating our own (`userdel` will remove the group too).
 userdel ubuntu --remove
 
-groupadd heroku --gid 1000
-useradd heroku --uid 1000 --gid 1000 --shell /bin/bash --create-home
+groupadd dyno --gid 1000
+useradd dyno --uid 1000 --gid 1000 --shell /bin/bash --home /app --create-home
 
 rm -rf /root/*
 rm -rf /tmp/*