diff --git a/scripts/install_go.sh b/scripts/install_go.sh
index daf52589..7a78a702 100755
--- a/scripts/install_go.sh
+++ b/scripts/install_go.sh
@@ -12,16 +12,20 @@ function main() {
   fi
 
   local version expected_sha dir
-  version="1.25.7"
-  expected_sha="12a6e116cffdcd071988cf3c30216a3f08f54d2cfbb45fff67e375823fd0c3b9"
+  version="1.25.6"
+  expected_sha="0ed64e3b9cb9b1c2ec57880dae2427b0ee2676f2ae2fb53c2e1bb838c500f9fb"
   dir="/tmp/go${version}"
 
   mkdir -p "${dir}"
 
   if [[ ! -f "${dir}/bin/go" ]]; then
-    local url
-    # Use cflinuxfs4 binary for all stacks (compatible with cflinuxfs5)
-    url="https://buildpacks.cloudfoundry.org/dependencies/go/go_${version}_linux_x64_cflinuxfs4_${expected_sha:0:8}.tgz"
+    local url stack_for_download
+    # Use cflinuxfs4 binary for cflinuxfs5 (compatible)
+    stack_for_download="${CF_STACK}"
+    if [[ "${CF_STACK}" == "cflinuxfs5" ]]; then
+      stack_for_download="cflinuxfs4"
+    fi
+    url="https://buildpacks.cloudfoundry.org/dependencies/go/go_${version}_linux_x64_${stack_for_download}_${expected_sha:0:8}.tgz"
 
     echo "-----> Download go ${version}"
     curl "${url}" \
diff --git a/scripts/package.sh b/scripts/package.sh
index af45cd72..9314014d 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -95,7 +95,6 @@ function package::buildpack() {
   stack_flag="--any-stack"
   if [[ "${stack}" != "any" ]]; then
     stack_flag="--stack=${stack}"
-    export CF_STACK="${stack}"
   fi
 
   local file