diff --git a/scripts/install_go.sh b/scripts/install_go.sh
index 6e998957..c882bd5d 100755
--- a/scripts/install_go.sh
+++ b/scripts/install_go.sh
@@ -5,7 +5,7 @@ set -u
 set -o pipefail
 
 function main() {
-  if [[ "${CF_STACK:-}" != "cflinuxfs3" && "${CF_STACK:-}" != "cflinuxfs4" ]]; then
+  if [[ "${CF_STACK:-}" != "cflinuxfs3" && "${CF_STACK:-}" != "cflinuxfs4" && "${CF_STACK:-}" != "cflinuxfs5" ]]; then
     echo "       **ERROR** Unsupported stack"
     echo "                 See https://docs.cloudfoundry.org/devguide/deploy-apps/stacks.html for more info"
     exit 1
diff --git a/scripts/package.sh b/scripts/package.sh
index 9314014d..af45cd72 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -95,6 +95,7 @@ function package::buildpack() {
   stack_flag="--any-stack"
   if [[ "${stack}" != "any" ]]; then
     stack_flag="--stack=${stack}"
+    export CF_STACK="${stack}"
   fi
 
   local file