diff --git a/.github/workflows/create-package.yml b/.github/workflows/create-package.yml
index 108850a5..803888c3 100644
--- a/.github/workflows/create-package.yml
+++ b/.github/workflows/create-package.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -64,8 +64,8 @@ jobs:
                 | tar -C "${HOME}"/bin -xz pack
               env:
                 PACK_VERSION: 0.18.1
-            - if: ${{ false }}
-              name: Enable pack Experimental
+            - name: Enable pack Experimental
+              if: ${{ false }}
               run: |
                 #!/usr/bin/env bash
 
@@ -84,8 +84,8 @@ jobs:
                     ${{ env.HOME }}/.pack
                     ${{ env.HOME }}/carton-cache
                 restore-keys: ${{ runner.os }}-go-
-            - id: version
-              name: Compute Version
+            - name: Compute Version
+              id: version
               run: |
                 #!/usr/bin/env bash
 
@@ -128,15 +128,15 @@ jobs:
                 INCLUDE_DEPENDENCIES: "false"
                 OS: linux
                 VERSION: ${{ steps.version.outputs.version }}
-            - id: package
-              name: Package Buildpack
+            - name: Package Buildpack
+              id: package
               run: |
                 #!/usr/bin/env bash
 
                 set -euo pipefail
 
                 if [[ -n "${PUBLISH+x}" ]]; then
-                  pack package-buildpack \
+                  pack buildpack package \
                     "${PACKAGE}:${VERSION}" \
                     --config "${HOME}"/package.toml \
                     --publish
@@ -144,7 +144,7 @@ jobs:
                   crane tag "${PACKAGE}:${VERSION}" latest
                   echo "::set-output name=digest::$(crane digest "${PACKAGE}:${VERSION}")"
                 else
-                  pack package-buildpack \
+                  pack buildpack package \
                     "${PACKAGE}:${VERSION}" \
                     --config "${HOME}"/package.toml \
                     --format "${FORMAT}"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1bf92aec..33547404 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -39,8 +39,8 @@ jobs:
                 | tar -C "${HOME}"/bin -xz pack
               env:
                 PACK_VERSION: 0.18.1
-            - if: ${{ false }}
-              name: Enable pack Experimental
+            - name: Enable pack Experimental
+              if: ${{ false }}
               run: |
                 #!/usr/bin/env bash
 
@@ -58,8 +58,8 @@ jobs:
                     ${{ env.HOME }}/.pack
                     ${{ env.HOME }}/carton-cache
                 restore-keys: ${{ runner.os }}-go-
-            - id: version
-              name: Compute Version
+            - name: Compute Version
+              id: version
               run: |
                 #!/usr/bin/env bash
 
@@ -109,7 +109,7 @@ jobs:
                 set -euo pipefail
 
                 if [[ -n "${PUBLISH+x}" ]]; then
-                  pack package-buildpack \
+                  pack buildpack package \
                     "${PACKAGE}:${VERSION}" \
                     --config "${HOME}"/package.toml \
                     --publish
@@ -117,7 +117,7 @@ jobs:
                   crane tag "${PACKAGE}:${VERSION}" latest
                   echo "::set-output name=digest::$(crane digest "${PACKAGE}:${VERSION}")"
                 else
-                  pack package-buildpack \
+                  pack buildpack package \
                     "${PACKAGE}:${VERSION}" \
                     --config "${HOME}"/package.toml \
                     --format "${FORMAT}"
diff --git a/.github/workflows/update-apache-tomcat.yml b/.github/workflows/update-apache-tomcat.yml
index bf10fee4..b80fe511 100644
--- a/.github/workflows/update-apache-tomcat.yml
+++ b/.github/workflows/update-apache-tomcat.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-azure-application-insights.yml b/.github/workflows/update-azure-application-insights.yml
index 7125553f..8dbee7f2 100644
--- a/.github/workflows/update-azure-application-insights.yml
+++ b/.github/workflows/update-azure-application-insights.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-bellsoft-liberica.yml b/.github/workflows/update-bellsoft-liberica.yml
index a0de7779..770bbe91 100644
--- a/.github/workflows/update-bellsoft-liberica.yml
+++ b/.github/workflows/update-bellsoft-liberica.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-ca-certificates.yml b/.github/workflows/update-ca-certificates.yml
index 84f2d765..b1c89f6c 100644
--- a/.github/workflows/update-ca-certificates.yml
+++ b/.github/workflows/update-ca-certificates.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-clojure-tools.yml b/.github/workflows/update-clojure-tools.yml
index c01a035c..71cae159 100644
--- a/.github/workflows/update-clojure-tools.yml
+++ b/.github/workflows/update-clojure-tools.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-dist-zip.yml b/.github/workflows/update-dist-zip.yml
index f924e521..7f1ee951 100644
--- a/.github/workflows/update-dist-zip.yml
+++ b/.github/workflows/update-dist-zip.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-draft-release.yml b/.github/workflows/update-draft-release.yml
index 2a9377f2..5f486840 100644
--- a/.github/workflows/update-draft-release.yml
+++ b/.github/workflows/update-draft-release.yml
@@ -13,8 +13,8 @@ jobs:
               uses: release-drafter/release-drafter@v5
               env:
                 GITHUB_TOKEN: ${{ secrets.JAVA_GITHUB_TOKEN }}
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
diff --git a/.github/workflows/update-encrypt-at-rest.yml b/.github/workflows/update-encrypt-at-rest.yml
index d5a56f03..ce6e535f 100644
--- a/.github/workflows/update-encrypt-at-rest.yml
+++ b/.github/workflows/update-encrypt-at-rest.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-environment-variables.yml b/.github/workflows/update-environment-variables.yml
index 18d94f5e..10fcd66f 100644
--- a/.github/workflows/update-environment-variables.yml
+++ b/.github/workflows/update-environment-variables.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-executable-jar.yml b/.github/workflows/update-executable-jar.yml
index fd2df530..244dde7e 100644
--- a/.github/workflows/update-executable-jar.yml
+++ b/.github/workflows/update-executable-jar.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-google-stackdriver.yml b/.github/workflows/update-google-stackdriver.yml
index 51c10518..d707c7ae 100644
--- a/.github/workflows/update-google-stackdriver.yml
+++ b/.github/workflows/update-google-stackdriver.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-gradle.yml b/.github/workflows/update-gradle.yml
index 3f392769..62c9b773 100644
--- a/.github/workflows/update-gradle.yml
+++ b/.github/workflows/update-gradle.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-image-labels.yml b/.github/workflows/update-image-labels.yml
index 775974d6..df7548c8 100644
--- a/.github/workflows/update-image-labels.yml
+++ b/.github/workflows/update-image-labels.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-leiningen.yml b/.github/workflows/update-leiningen.yml
index a8687162..204c53af 100644
--- a/.github/workflows/update-leiningen.yml
+++ b/.github/workflows/update-leiningen.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-maven.yml b/.github/workflows/update-maven.yml
index 8b0c739e..3662613a 100644
--- a/.github/workflows/update-maven.yml
+++ b/.github/workflows/update-maven.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-pipeline.yml b/.github/workflows/update-pipeline.yml
index 6779037a..0f5f54f4 100644
--- a/.github/workflows/update-pipeline.yml
+++ b/.github/workflows/update-pipeline.yml
@@ -25,8 +25,8 @@ jobs:
 
                 GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/pipeline-builder/cmd/octo
             - uses: actions/checkout@v2
-            - id: pipeline
-              name: Update Pipeline
+            - name: Update Pipeline
+              id: pipeline
               run: |
                 #!/usr/bin/env bash
 
diff --git a/.github/workflows/update-procfile.yml b/.github/workflows/update-procfile.yml
index 0c6ad0e8..18138e6c 100644
--- a/.github/workflows/update-procfile.yml
+++ b/.github/workflows/update-procfile.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-sbt.yml b/.github/workflows/update-sbt.yml
index a3cfa246..2c8e3b86 100644
--- a/.github/workflows/update-sbt.yml
+++ b/.github/workflows/update-sbt.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-spring-boot.yml b/.github/workflows/update-spring-boot.yml
index c00fe934..90e2efe7 100644
--- a/.github/workflows/update-spring-boot.yml
+++ b/.github/workflows/update-spring-boot.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml
diff --git a/.github/workflows/update-watchexec.yml b/.github/workflows/update-watchexec.yml
index 9e9b1a72..409ca29d 100644
--- a/.github/workflows/update-watchexec.yml
+++ b/.github/workflows/update-watchexec.yml
@@ -9,8 +9,8 @@ jobs:
         runs-on:
             - ubuntu-latest
         steps:
-            - if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
-              name: Docker login gcr.io
+            - name: Docker login gcr.io
+              if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }}
               uses: docker/login-action@v1
               with:
                 password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }}
@@ -67,8 +67,8 @@ jobs:
               env:
                 YJ_VERSION: 5.0.0
             - uses: actions/checkout@v2
-            - id: package
-              name: Update Package Dependency
+            - name: Update Package Dependency
+              id: package
               run: |
                 #!/usr/bin/env bash
 
@@ -85,13 +85,19 @@ jobs:
                     --version "${NEW_VERSION}"
 
                   git add builder.toml
-                elif [[ -e package.toml ]]; then
+                fi
+
+                if [[ -e package.toml ]]; then
                   OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].uri | capture(\".*${DEPENDENCY}:(?<version>.+)\") | .version")
 
                   update-package-dependency \
                     --buildpack-toml buildpack.toml \
+                    --id "${BP_DEPENDENCY:-$DEPENDENCY}" \
+                    --version "${NEW_VERSION}"
+
+                  update-package-dependency \
                     --package-toml package.toml \
-                    --id "${DEPENDENCY}" \
+                    --id "${PKG_DEPENDENCY:-$DEPENDENCY}" \
                     --version "${NEW_VERSION}"
 
                   git add buildpack.toml package.toml