diff --git a/.gitignore b/.gitignore
index ce2ca919..91bdb582 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ log/
 **/.DS_Store
 /python_buildpack-*.zip
 .idea/
+build/buildpack.zip
diff --git a/VERSION b/VERSION
index a49ebe62..f8e233b2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.44
+1.9.0
diff --git a/manifest.yml b/manifest.yml
index bb3af44e..b22809c3 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -32,6 +32,7 @@ dependencies:
 - name: libffi
   version: 3.2.1
   cf_stacks:
+  - cflinuxfs5
   - cflinuxfs4
   - cflinuxfs3
   uri: https://buildpacks.cloudfoundry.org/dependencies/manual-binaries/python/libffi-3.2.1-linux-x64-5f5bf32c.tgz
@@ -41,6 +42,7 @@ dependencies:
 - name: libmemcache
   version: 1.0.18
   cf_stacks:
+  - cflinuxfs5
   - cflinuxfs4
   - cflinuxfs3
   uri: https://buildpacks.cloudfoundry.org/dependencies/manual-binaries/python/libmemcache-1.0.18-linux-x64-6d33aa02.tgz
@@ -70,6 +72,7 @@ dependencies:
   uri: https://buildpacks.cloudfoundry.org/dependencies/pip/pip_25.2_linux_noarch_any-stack_7dc1e988.tgz
   sha256: 7dc1e9882eb18f53150261c3a0cde7d5a39cdb18843c930ee01db8582f6b4f27
   cf_stacks:
+  - cflinuxfs5
   - cflinuxfs4
   - cflinuxfs3
   source: https://files.pythonhosted.org/packages/20/16/650289cd3f43d5a2fadfd98c68bd1e1e7f2550a1a5326768cddfbcedb2c5/pip-25.2.tar.gz
diff --git a/scripts/install_go.sh b/scripts/install_go.sh
index 6e998957..daf52589 100755
--- a/scripts/install_go.sh
+++ b/scripts/install_go.sh
@@ -5,22 +5,23 @@ set -u
 set -o pipefail
 
 function main() {
-  if [[ "${CF_STACK:-}" != "cflinuxfs3" && "${CF_STACK:-}" != "cflinuxfs4" ]]; then
+  if [[ "${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
   fi
 
   local version expected_sha dir
-  version="1.25.6"
-  expected_sha="0ed64e3b9cb9b1c2ec57880dae2427b0ee2676f2ae2fb53c2e1bb838c500f9fb"
+  version="1.25.7"
+  expected_sha="12a6e116cffdcd071988cf3c30216a3f08f54d2cfbb45fff67e375823fd0c3b9"
   dir="/tmp/go${version}"
 
   mkdir -p "${dir}"
 
   if [[ ! -f "${dir}/bin/go" ]]; then
     local url
-    url="https://buildpacks.cloudfoundry.org/dependencies/go/go_${version}_linux_x64_${CF_STACK}_${expected_sha:0:8}.tgz"
+    # 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"
 
     echo "-----> Download go ${version}"
     curl "${url}" \
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