diff --git a/plugins/builder-dockerfile/core-post-extract b/plugins/builder-dockerfile/core-post-extract
index 5334e8d3a..15e80c16e 100755
--- a/plugins/builder-dockerfile/core-post-extract
+++ b/plugins/builder-dockerfile/core-post-extract
@@ -10,7 +10,7 @@ trigger-builder-dockerfile-core-post-extract() {
   declare APP="$1" SOURCECODE_WORK_DIR="$2"
   local NEW_DOCKERFILE="$(fn-builder-dockerfile-computed-dockerfile-path "$APP")"
 
-  pushd "$TMP_WORK_DIR" >/dev/null
+  pushd "$SOURCECODE_WORK_DIR" >/dev/null
 
   if [[ -z "$NEW_DOCKERFILE" ]]; then
     return
diff --git a/plugins/builder-lambda/core-post-extract b/plugins/builder-lambda/core-post-extract
index a7a4b6a39..7d431379a 100755
--- a/plugins/builder-lambda/core-post-extract
+++ b/plugins/builder-lambda/core-post-extract
@@ -10,7 +10,7 @@ trigger-builder-lambda-core-post-extract() {
   declare APP="$1" SOURCECODE_WORK_DIR="$2"
   local NEW_LAMBDA_YML="$(fn-builder-lambda-computed-lambdayml-path "$APP")"
 
-  pushd "$TMP_WORK_DIR" >/dev/null
+  pushd "$SOURCECODE_WORK_DIR" >/dev/null
 
   if [[ -z "$NEW_LAMBDA_YML" ]]; then
     return
diff --git a/plugins/builder-nixpacks/core-post-extract b/plugins/builder-nixpacks/core-post-extract
index eaaa5dd5e..a3d42a4b2 100755
--- a/plugins/builder-nixpacks/core-post-extract
+++ b/plugins/builder-nixpacks/core-post-extract
@@ -10,7 +10,7 @@ trigger-builder-nixpacks-core-post-extract() {
   declare APP="$1" SOURCECODE_WORK_DIR="$2"
   local NEW_NIXPACKS_YML="$(fn-builder-nixpacks-computed-nixpackstoml-path "$APP")"
 
-  pushd "$TMP_WORK_DIR" >/dev/null
+  pushd "$SOURCECODE_WORK_DIR" >/dev/null
 
   if [[ -z "$NEW_NIXPACKS_YML" ]]; then
     return
diff --git a/plugins/builder-pack/core-post-extract b/plugins/builder-pack/core-post-extract
index 4c50479e2..381d176f7 100755
--- a/plugins/builder-pack/core-post-extract
+++ b/plugins/builder-pack/core-post-extract
@@ -10,7 +10,7 @@ trigger-builder-pack-core-post-extract() {
   declare APP="$1" SOURCECODE_WORK_DIR="$2"
   local NEW_PROJECT_TOML="$(fn-builder-pack-computed-projecttoml-path "$APP")"
 
-  pushd "$TMP_WORK_DIR" >/dev/null
+  pushd "$SOURCECODE_WORK_DIR" >/dev/null
 
   if [[ -z "$NEW_PROJECT_TOML" ]]; then
     return
diff --git a/plugins/builder-railpack/core-post-extract b/plugins/builder-railpack/core-post-extract
index ad863c076..d78b8d7da 100755
--- a/plugins/builder-railpack/core-post-extract
+++ b/plugins/builder-railpack/core-post-extract
@@ -10,7 +10,7 @@ trigger-builder-railpack-core-post-extract() {
   declare APP="$1" SOURCECODE_WORK_DIR="$2"
   local NEW_RAILPACK_JSON="$(fn-builder-railpack-computed-railpackjson-path "$APP")"
 
-  pushd "$TMP_WORK_DIR" >/dev/null
+  pushd "$SOURCECODE_WORK_DIR" >/dev/null
 
   if [[ -z "$NEW_RAILPACK_JSON" ]]; then
     return
diff --git a/tests/unit/builder-dockerfile.bats b/tests/unit/builder-dockerfile.bats
index 794c31ca9..df1e02336 100644
--- a/tests/unit/builder-dockerfile.bats
+++ b/tests/unit/builder-dockerfile.bats
@@ -155,6 +155,29 @@ EOF
   assert_output "3001/udp 3000/tcp 3003"
 }
 
+@test "(builder-dockerfile) core-post-extract renames the configured dockerfile" {
+  local TMP_DIR
+  TMP_DIR="$(mktemp -d "/tmp/dokku-test-builder-dockerfile.XXXXXX")"
+  trap "rm -rf '$TMP_DIR'" RETURN
+  echo "FROM scratch" >"$TMP_DIR/second.Dockerfile"
+
+  run /bin/bash -c "dokku builder-dockerfile:set $TEST_APP dockerfile-path second.Dockerfile"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "PLUGIN_PATH=$PLUGIN_PATH PLUGIN_AVAILABLE_PATH=$PLUGIN_AVAILABLE_PATH PLUGIN_ENABLED_PATH=$PLUGIN_ENABLED_PATH PLUGIN_CORE_AVAILABLE_PATH=$PLUGIN_CORE_AVAILABLE_PATH DOKKU_LIB_ROOT=$DOKKU_LIB_ROOT $PLUGIN_ENABLED_PATH/builder-dockerfile/core-post-extract $TEST_APP $TMP_DIR HEAD"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "test -f $TMP_DIR/Dockerfile"
+  assert_success
+
+  run /bin/bash -c "test ! -e $TMP_DIR/second.Dockerfile"
+  assert_success
+}
+
 @test "(builder-dockerfile) ps:rebuild fetches files from image" {
   run /bin/bash -c "dokku --trace git:from-image $TEST_APP dokku/smoke-test-app:dockerfile"
   echo "output: $output"
diff --git a/tests/unit/builder-lambda.bats b/tests/unit/builder-lambda.bats
index 160e28b69..afbbcda9b 100644
--- a/tests/unit/builder-lambda.bats
+++ b/tests/unit/builder-lambda.bats
@@ -152,6 +152,29 @@ teardown() {
   assert_success
 }
 
+@test "(builder-lambda) core-post-extract renames the configured lambda.yml" {
+  local TMP_DIR
+  TMP_DIR="$(mktemp -d "/tmp/dokku-test-builder-lambda.XXXXXX")"
+  trap "rm -rf '$TMP_DIR'" RETURN
+  echo "---" >"$TMP_DIR/lambda2.yml"
+
+  run /bin/bash -c "dokku builder-lambda:set $TEST_APP lambdayml-path lambda2.yml"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "PLUGIN_PATH=$PLUGIN_PATH PLUGIN_AVAILABLE_PATH=$PLUGIN_AVAILABLE_PATH PLUGIN_ENABLED_PATH=$PLUGIN_ENABLED_PATH PLUGIN_CORE_AVAILABLE_PATH=$PLUGIN_CORE_AVAILABLE_PATH DOKKU_LIB_ROOT=$DOKKU_LIB_ROOT $PLUGIN_ENABLED_PATH/builder-lambda/core-post-extract $TEST_APP $TMP_DIR HEAD"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "test -f $TMP_DIR/lambda.yml"
+  assert_success
+
+  run /bin/bash -c "test ! -e $TMP_DIR/lambda2.yml"
+  assert_success
+}
+
 inject_lambda_yml() {
   local APP="$1"
   local APP_REPO_DIR="$2"
diff --git a/tests/unit/builder-nixpacks.bats b/tests/unit/builder-nixpacks.bats
index ecdd7d59a..657fd3596 100644
--- a/tests/unit/builder-nixpacks.bats
+++ b/tests/unit/builder-nixpacks.bats
@@ -131,6 +131,29 @@ teardown() {
   assert_output "['task.py', 'some', 'cron', 'task']"
 }
 
+@test "(builder-nixpacks) core-post-extract renames the configured nixpacks.toml" {
+  local TMP_DIR
+  TMP_DIR="$(mktemp -d "/tmp/dokku-test-builder-nixpacks.XXXXXX")"
+  trap "rm -rf '$TMP_DIR'" RETURN
+  echo "" >"$TMP_DIR/nixpacks.alt.toml"
+
+  run /bin/bash -c "dokku builder-nixpacks:set $TEST_APP nixpackstoml-path nixpacks.alt.toml"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "PLUGIN_PATH=$PLUGIN_PATH PLUGIN_AVAILABLE_PATH=$PLUGIN_AVAILABLE_PATH PLUGIN_ENABLED_PATH=$PLUGIN_ENABLED_PATH PLUGIN_CORE_AVAILABLE_PATH=$PLUGIN_CORE_AVAILABLE_PATH DOKKU_LIB_ROOT=$DOKKU_LIB_ROOT $PLUGIN_ENABLED_PATH/builder-nixpacks/core-post-extract $TEST_APP $TMP_DIR HEAD"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "test -f $TMP_DIR/nixpacks.toml"
+  assert_success
+
+  run /bin/bash -c "test ! -e $TMP_DIR/nixpacks.alt.toml"
+  assert_success
+}
+
 cron_run_wrapper() {
   local APP="$1"
   local APP_REPO_DIR="$2"
diff --git a/tests/unit/builder-pack.bats b/tests/unit/builder-pack.bats
index 8e21816af..0f335053d 100644
--- a/tests/unit/builder-pack.bats
+++ b/tests/unit/builder-pack.bats
@@ -228,6 +228,29 @@ teardown() {
   assert_output "['task.py', 'test']"
 }
 
+@test "(builder-pack) core-post-extract renames the configured project.toml" {
+  local TMP_DIR
+  TMP_DIR="$(mktemp -d "/tmp/dokku-test-builder-pack.XXXXXX")"
+  trap "rm -rf '$TMP_DIR'" RETURN
+  echo "" >"$TMP_DIR/project2.toml"
+
+  run /bin/bash -c "dokku builder-pack:set $TEST_APP projecttoml-path project2.toml"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "PLUGIN_PATH=$PLUGIN_PATH PLUGIN_AVAILABLE_PATH=$PLUGIN_AVAILABLE_PATH PLUGIN_ENABLED_PATH=$PLUGIN_ENABLED_PATH PLUGIN_CORE_AVAILABLE_PATH=$PLUGIN_CORE_AVAILABLE_PATH DOKKU_LIB_ROOT=$DOKKU_LIB_ROOT $PLUGIN_ENABLED_PATH/builder-pack/core-post-extract $TEST_APP $TMP_DIR HEAD"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "test -f $TMP_DIR/project.toml"
+  assert_success
+
+  run /bin/bash -c "test ! -e $TMP_DIR/project2.toml"
+  assert_success
+}
+
 cron_run_wrapper() {
   local APP="$1"
   local APP_REPO_DIR="$2"
diff --git a/tests/unit/builder-railpack.bats b/tests/unit/builder-railpack.bats
index 133e81542..82722be17 100644
--- a/tests/unit/builder-railpack.bats
+++ b/tests/unit/builder-railpack.bats
@@ -142,6 +142,29 @@ teardown() {
   assert_output "['task.py', 'some', 'cron', 'task']"
 }
 
+@test "(builder-railpack) core-post-extract renames the configured railpack.json" {
+  local TMP_DIR
+  TMP_DIR="$(mktemp -d "/tmp/dokku-test-builder-railpack.XXXXXX")"
+  trap "rm -rf '$TMP_DIR'" RETURN
+  echo "{}" >"$TMP_DIR/railpack.alt.json"
+
+  run /bin/bash -c "dokku builder-railpack:set $TEST_APP railpackjson-path railpack.alt.json"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "PLUGIN_PATH=$PLUGIN_PATH PLUGIN_AVAILABLE_PATH=$PLUGIN_AVAILABLE_PATH PLUGIN_ENABLED_PATH=$PLUGIN_ENABLED_PATH PLUGIN_CORE_AVAILABLE_PATH=$PLUGIN_CORE_AVAILABLE_PATH DOKKU_LIB_ROOT=$DOKKU_LIB_ROOT $PLUGIN_ENABLED_PATH/builder-railpack/core-post-extract $TEST_APP $TMP_DIR HEAD"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "test -f $TMP_DIR/railpack.json"
+  assert_success
+
+  run /bin/bash -c "test ! -e $TMP_DIR/railpack.alt.json"
+  assert_success
+}
+
 cron_run_wrapper() {
   local APP="$1"
   local APP_REPO_DIR="$2"