diff --git a/.github/workflows/create-package.yml b/.github/workflows/create-package.yml
index ec9f5f894..f672408e7 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 0ef32a7cf..4bae961fb 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-jdk-11.yml b/.github/workflows/update-jdk-11.yml
index f51fcc209..a978192b2 100644
--- a/.github/workflows/update-jdk-11.yml
+++ b/.github/workflows/update-jdk-11.yml
@@ -47,8 +47,8 @@ jobs:
                 product: liberica
                 type: jdk
                 version: "11"
-            - id: buildpack
-              name: Update Buildpack Dependency
+            - name: Update Buildpack Dependency
+              id: buildpack
               run: |
                 #!/usr/bin/env bash
 
diff --git a/.github/workflows/update-jdk-16.yml b/.github/workflows/update-jdk-16.yml
index 5cc7bef05..710bdd517 100644
--- a/.github/workflows/update-jdk-16.yml
+++ b/.github/workflows/update-jdk-16.yml
@@ -47,8 +47,8 @@ jobs:
                 product: liberica
                 type: jdk
                 version: "16"
-            - id: buildpack
-              name: Update Buildpack Dependency
+            - name: Update Buildpack Dependency
+              id: buildpack
               run: |
                 #!/usr/bin/env bash
 
diff --git a/.github/workflows/update-jdk-17.yml b/.github/workflows/update-jdk-17.yml
index 04e79cf27..f5e3ebc70 100644
--- a/.github/workflows/update-jdk-17.yml
+++ b/.github/workflows/update-jdk-17.yml
@@ -47,8 +47,8 @@ jobs:
                 product: liberica
                 type: jdk
                 version: "17"
-            - id: buildpack
-              name: Update Buildpack Dependency
+            - name: Update Buildpack Dependency
+              id: buildpack
               run: |
                 #!/usr/bin/env bash
 
diff --git a/.github/workflows/update-jdk-8.yml b/.github/workflows/update-jdk-8.yml
index 10a116bed..a830e5732 100644
--- a/.github/workflows/update-jdk-8.yml
+++ b/.github/workflows/update-jdk-8.yml
@@ -47,8 +47,8 @@ jobs:
                 product: liberica
                 type: jdk
                 version: "8"
-            - id: buildpack
-              name: Update Buildpack Dependency
+            - name: Update Buildpack Dependency
+              id: buildpack
               run: |
                 #!/usr/bin/env bash
 
diff --git a/.github/workflows/update-jre-11.yml b/.github/workflows/update-jre-11.yml
index ed26bf41a..0d4d277bd 100644
--- a/.github/workflows/update-jre-11.yml
+++ b/.github/workflows/update-jre-11.yml
@@ -47,8 +47,8 @@ jobs:
                 product: liberica
                 type: jre
                 version: "11"
-            - id: buildpack
-              name: Update Buildpack Dependency
+            - name: Update Buildpack Dependency
+              id: buildpack
               run: |
                 #!/usr/bin/env bash
 
diff --git a/.github/workflows/update-jre-16.yml b/.github/workflows/update-jre-16.yml
index 9a09fd7ad..a1a416b36 100644
--- a/.github/workflows/update-jre-16.yml
+++ b/.github/workflows/update-jre-16.yml
@@ -47,8 +47,8 @@ jobs:
                 product: liberica
                 type: jre
                 version: "16"
-            - id: buildpack
-              name: Update Buildpack Dependency
+            - name: Update Buildpack Dependency
+              id: buildpack
               run: |
                 #!/usr/bin/env bash
 
diff --git a/.github/workflows/update-jre-17.yml b/.github/workflows/update-jre-17.yml
index 7ecc990be..7f99feeb6 100644
--- a/.github/workflows/update-jre-17.yml
+++ b/.github/workflows/update-jre-17.yml
@@ -47,8 +47,8 @@ jobs:
                 product: liberica
                 type: jre
                 version: "17"
-            - id: buildpack
-              name: Update Buildpack Dependency
+            - name: Update Buildpack Dependency
+              id: buildpack
               run: |
                 #!/usr/bin/env bash
 
diff --git a/.github/workflows/update-jre-8.yml b/.github/workflows/update-jre-8.yml
index ee2b7fb9f..c77c12391 100644
--- a/.github/workflows/update-jre-8.yml
+++ b/.github/workflows/update-jre-8.yml
@@ -47,8 +47,8 @@ jobs:
                 product: liberica
                 type: jre
                 version: "8"
-            - id: buildpack
-              name: Update Buildpack Dependency
+            - name: Update Buildpack Dependency
+              id: buildpack
               run: |
                 #!/usr/bin/env bash
 
diff --git a/.github/workflows/update-native-image-11.yml b/.github/workflows/update-native-image-11.yml
index e71595e2a..f2a637068 100644
--- a/.github/workflows/update-native-image-11.yml
+++ b/.github/workflows/update-native-image-11.yml
@@ -47,8 +47,8 @@ jobs:
                 product: nik
                 type: core
                 version: "11"
-            - id: buildpack
-              name: Update Buildpack Dependency
+            - name: Update Buildpack Dependency
+              id: buildpack
               run: |
                 #!/usr/bin/env bash
 
diff --git a/.github/workflows/update-pipeline.yml b/.github/workflows/update-pipeline.yml
index 6779037a3..0f5f54f42 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