diff --git a/plugins/builder-dockerfile/core-post-extract b/plugins/builder-dockerfile/core-post-extract
index c25d64b6300..c121c86bb03 100755
--- a/plugins/builder-dockerfile/core-post-extract
+++ b/plugins/builder-dockerfile/core-post-extract
@@ -26,7 +26,7 @@ trigger-builder-dockerfile-core-post-extract() {
   fi
 
   mv "$NEW_DOCKERFILE" Dockerfile
-  popd &>/dev/null
+  popd &>/dev/null || pushd "/tmp" >/dev/null
 }
 
 trigger-builder-dockerfile-core-post-extract "$@"
diff --git a/plugins/builder-pack/core-post-extract b/plugins/builder-pack/core-post-extract
index a3fe85b955b..4c50479e2c1 100755
--- a/plugins/builder-pack/core-post-extract
+++ b/plugins/builder-pack/core-post-extract
@@ -24,7 +24,7 @@ trigger-builder-pack-core-post-extract() {
   if [[ "$NEW_PROJECT_TOML" != "project.toml" ]]; then
     mv "$NEW_PROJECT_TOML" project.toml
   fi
-  popd &>/dev/null
+  popd &>/dev/null || pushd "/tmp" >/dev/null
 }
 
 trigger-builder-pack-core-post-extract "$@"