diff --git a/builder-20/builder.toml b/builder-20/builder.toml
index f19dd713..d2b3207d 100644
--- a/builder-20/builder.toml
+++ b/builder-20/builder.toml
@@ -6,7 +6,7 @@ build-image = "heroku/heroku:20-cnb-build"
 run-image = "heroku/heroku:20-cnb"
 
 [lifecycle]
-version = "0.17.2"
+version = "0.18.1"
 
 [[buildpacks]]
   id = "heroku/go"
diff --git a/builder-22/builder.toml b/builder-22/builder.toml
index 53f0e442..c279d70a 100644
--- a/builder-22/builder.toml
+++ b/builder-22/builder.toml
@@ -6,7 +6,7 @@ build-image = "heroku/heroku:22-cnb-build"
 run-image = "heroku/heroku:22-cnb"
 
 [lifecycle]
-version = "0.17.2"
+version = "0.18.1"
 
 [[buildpacks]]
   id = "heroku/go"
diff --git a/builder-classic-22/builder.toml b/builder-classic-22/builder.toml
index ec6a5fbe..9e265bac 100644
--- a/builder-classic-22/builder.toml
+++ b/builder-classic-22/builder.toml
@@ -6,6 +6,9 @@ build-image = "heroku/heroku:22-cnb-build"
 run-image = "heroku/heroku:22-cnb"
 
 [lifecycle]
+# We have to use an older lifecycle version in this builder image since lifecycle 0.18.0
+# dropped support for Buildpack API versions <0.7, and cnb-shim is currently using v0.4:
+# https://github.com/heroku/cnb-shim/issues/69
 version = "0.17.2"
 
 [[buildpacks]]
diff --git a/buildpacks-20/builder.toml b/buildpacks-20/builder.toml
index ad7ca85e..a85a625f 100644
--- a/buildpacks-20/builder.toml
+++ b/buildpacks-20/builder.toml
@@ -6,6 +6,9 @@ build-image = "heroku/heroku:20-cnb-build"
 run-image = "heroku/heroku:20-cnb"
 
 [lifecycle]
+# We have to use an older lifecycle version in this builder image since lifecycle 0.18.0
+# dropped support for Buildpack API versions <0.7, and cnb-shim is currently using v0.4:
+# https://github.com/heroku/cnb-shim/issues/69
 version = "0.17.2"
 
 [[buildpacks]]
diff --git a/salesforce-functions/builder.toml b/salesforce-functions/builder.toml
index 3e00f328..333c0968 100644
--- a/salesforce-functions/builder.toml
+++ b/salesforce-functions/builder.toml
@@ -6,6 +6,11 @@ build-image = "heroku/heroku:22-cnb-build"
 run-image = "heroku/heroku:22-cnb"
 
 [lifecycle]
+# We have to use an older lifecycle version in this builder image since lifecycle 0.18.0
+# dropped support for Buildpack API versions <0.7, and:
+# - heroku/nodejs-function is still using the old Bash based NPM CNB (which is using Buildpack API 0.6)
+# - we know of at least one custom buildpack that's also using a legacy Buildpack API:
+#   https://github.com/CSGAMERSServices/puppeteer-heroku-buildpack
 version = "0.17.2"
 
 [[buildpacks]]