diff --git a/scripts/.util/tools.sh b/scripts/.util/tools.sh
index 76af56f0..a3df593a 100644
--- a/scripts/.util/tools.sh
+++ b/scripts/.util/tools.sh
@@ -40,7 +40,7 @@ function util::tools::ginkgo::install() {
     pushd /tmp > /dev/null || return
       GOBIN="${dir}" \
         go install \
-          github.com/onsi/ginkgo/v2/ginkgo@latest
+          github.com/onsi/ginkgo/ginkgo@latest
     popd > /dev/null || return
   fi
 }
diff --git a/scripts/install_go.sh b/scripts/install_go.sh
index daf52589..6e998957 100755
--- a/scripts/install_go.sh
+++ b/scripts/install_go.sh
@@ -5,23 +5,22 @@ set -u
 set -o pipefail
 
 function main() {
-  if [[ "${CF_STACK:-}" != "cflinuxfs4" && "${CF_STACK:-}" != "cflinuxfs5" ]]; then
+  if [[ "${CF_STACK:-}" != "cflinuxfs3" && "${CF_STACK:-}" != "cflinuxfs4" ]]; then
     echo "       **ERROR** Unsupported stack"
     echo "                 See https://docs.cloudfoundry.org/devguide/deploy-apps/stacks.html for more info"
     exit 1
   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"
+    url="https://buildpacks.cloudfoundry.org/dependencies/go/go_${version}_linux_x64_${CF_STACK}_${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