diff --git a/README.md b/README.md
index c1a3888fee2aead796a67ced366a934f8105a431..248a95f73f30cc491b597eb586b77e2b78a1f451 100644
--- a/README.md
+++ b/README.md
@@ -319,8 +319,19 @@ include:
     file: rails-kubernetes.yml
 
 variables:
-  # rails specific:
-  CNB_ENV_VARS: "MY_ENV_VAR=bla MY_VAR_FROM_ENV" # specify environment variables to be present at container build time, optionally with a value, or else the value is taken from the environment
+  # Rails specific optional configuration:
+
+  # Set environment variables to be present at container build time, separated by newlines.
+  # If no value is defined it is taken from the environment.
+  CNB_ENV_VARS: |
+    MY_ENV_VAR="hello world"
+    MY_VAR_FROM_ENV
+  # pass extra arguments to the `pack` command
+  CNB_EXTRA_ARGS: "--verbose"
+  # override default builder
+  CNB_BUILDER: "heroku/buildpacks:20"
+  # override pack CLI version
+  CNB_PACK_VERSION: "0.22.0"
 ```
 
 Recommended [values](#values-handling):
diff --git a/helm-chart.yml b/helm-chart.yml
index c0dd4d012d48e35eda0a7b76ea92fe74787bec21..141c345fc05975d43311b5f7817a609a8088a62d 100644
--- a/helm-chart.yml
+++ b/helm-chart.yml
@@ -11,7 +11,7 @@ image:
 variables:
   HELM_EXPERIMENTAL_OCI: 1
   AUTO_RELEASE: "true"
-  PIPELINE_IMAGE_TAG: bb9c8edb701da31d025523c18254d204e5ac4c88
+  PIPELINE_IMAGE_TAG: d57ef6d2e372b7065e536e8fae57ea63c6633ca4
 
 stages:
   - lint
diff --git a/monorepo.yml b/monorepo.yml
index c9f54d571bd1b41fbc108cae6ddde2fc05f85352..03facc30d66ea8de7de50a8ba23d7942626d222d 100644
--- a/monorepo.yml
+++ b/monorepo.yml
@@ -12,7 +12,7 @@ include:
   - /includes/open-mr.yml
 
 variables:
-  PIPELINE_IMAGE_TAG: bb9c8edb701da31d025523c18254d204e5ac4c88
+  PIPELINE_IMAGE_TAG: d57ef6d2e372b7065e536e8fae57ea63c6633ca4
 
 image: git.panter.ch:5001/catladder/gitlab-ci/pipeline:$PIPELINE_IMAGE_TAG
 
diff --git a/panter-kubernetes-base.yml b/panter-kubernetes-base.yml
index b0ce3afdb78e77186585e9b51a0523510c6bee95..cec8b1cec7c743501cac790df7bcd26d863d26d4 100644
--- a/panter-kubernetes-base.yml
+++ b/panter-kubernetes-base.yml
@@ -12,7 +12,7 @@ include:
   - /includes/open-mr.yml
 
 variables:
-  PIPELINE_IMAGE_TAG: bb9c8edb701da31d025523c18254d204e5ac4c88
+  PIPELINE_IMAGE_TAG: d57ef6d2e372b7065e536e8fae57ea63c6633ca4
   CUSTOMER_NAME: panter
   APP_NAME: demo
   COMPONENT_NAME: web
diff --git a/rails-kubernetes.yml b/rails-kubernetes.yml
index 11b3cb7512eab9a1644e3d393989f4521b14fd7c..d8b8eaaa019798078f5d683702ba1753e03e676f 100644
--- a/rails-kubernetes.yml
+++ b/rails-kubernetes.yml
@@ -3,8 +3,6 @@ include:
 
 variables:
   CNB_BUILDER: "heroku/buildpacks:18"
-  CNB_ENV_VARS: "BUNDLE_GIT__PANTER__CH"
-  CNB_EXTRA_ARGS: ""
   CNB_PACK_VERSION: "0.20.0"
 
 # rails needs no app build
@@ -23,5 +21,5 @@ docker-build:
     - chmod +x /usr/local/bin/pack
     # replace private git ssh gem sources with https to make bundler with credentials via env var work
     - sed --in-place 's|git@\([^:]*\):|https://\1/|g' Gemfile Gemfile.lock
-    - for v in $CNB_ENV_VARS; do env_args="$env_args --env $v"; done
+    - env_args=$(IFS=$'\n'; for var in $CNB_ENV_VARS; do echo -n "--env $var "; done)
     - pack build $IMAGE_NAME:$IMAGE_TAG --builder $CNB_BUILDER --publish --cache-image $CACHE_IMAGE $env_args $CNB_EXTRA_ARGS