diff --git a/.github/pipeline-descriptor.yml b/.github/pipeline-descriptor.yml
index 42e4f6b..c30beb1 100644
--- a/.github/pipeline-descriptor.yml
+++ b/.github/pipeline-descriptor.yml
@@ -53,25 +53,25 @@ dependencies:
     version_pattern: "17\\.[\\d]+\\.[\\d]+"
     uses: docker://ghcr.io/paketo-buildpacks/actions/foojay-dependency:main
     with:
-      type: graalvm
+      type: jdk
       version: "17"
-      distro: oracle
+      distro: graalvm
   - name: Native Image 21
     id: native-image-svm
     version_pattern: "21\\.[\\d]+\\.[\\d]+"
     uses: docker://ghcr.io/paketo-buildpacks/actions/foojay-dependency:main
     with:
-      type: graalvm
+      type: jdk
       version: "21"
-      distro: oracle
+      distro: graalvm
   - name: Native Image 22
     id: native-image-svm
     version_pattern: "22\\.[\\d]+\\.[\\d]+"
     uses: docker://ghcr.io/paketo-buildpacks/actions/foojay-dependency:main
     with:
-      type: graalvm
+      type: jdk
       version: "22"
-      distro: oracle
+      distro: graalvm
 
   # ARM64
   - name: JDK 17 ARM64
@@ -106,25 +106,25 @@ dependencies:
     version_pattern: "17\\.[\\d]+\\.[\\d]+"
     uses: docker://ghcr.io/paketo-buildpacks/actions/foojay-dependency:main
     with:
-      type: graalvm
+      type: jdk
       version: "17"
-      distro: oracle
+      distro: graalvm
       arch: "arm64"
   - name: Native Image 21 ARM64
     id: native-image-svm
     version_pattern: "21\\.[\\d]+\\.[\\d]+"
     uses: docker://ghcr.io/paketo-buildpacks/actions/foojay-dependency:main
     with:
-      type: graalvm
+      type: jdk
       version: "21"
-      distro: oracle
+      distro: graalvm
       arch: "arm64"
   - name: Native Image 22 ARM64
     id: native-image-svm
     version_pattern: "22\\.[\\d]+\\.[\\d]+"
     uses: docker://ghcr.io/paketo-buildpacks/actions/foojay-dependency:main
     with:
-      type: graalvm
+      type: jdk
       version: "22"
-      distro: oracle
+      distro: graalvm
       arch: "arm64"
diff --git a/.github/workflows/pb-update-native-image-17-arm-64.yml b/.github/workflows/pb-update-native-image-17-arm-64.yml
index 960f6c6..a00fc94 100644
--- a/.github/workflows/pb-update-native-image-17-arm-64.yml
+++ b/.github/workflows/pb-update-native-image-17-arm-64.yml
@@ -28,8 +28,8 @@ jobs:
               uses: docker://ghcr.io/paketo-buildpacks/actions/foojay-dependency:main
               with:
                 arch: arm64
-                distro: oracle
-                type: graalvm
+                distro: graalvm
+                type: jdk
                 version: "17"
             - name: Update Buildpack Dependency
               id: buildpack
diff --git a/.github/workflows/pb-update-native-image-17.yml b/.github/workflows/pb-update-native-image-17.yml
index f0514d3..80bd8d1 100644
--- a/.github/workflows/pb-update-native-image-17.yml
+++ b/.github/workflows/pb-update-native-image-17.yml
@@ -27,8 +27,8 @@ jobs:
             - id: dependency
               uses: docker://ghcr.io/paketo-buildpacks/actions/foojay-dependency:main
               with:
-                distro: oracle
-                type: graalvm
+                distro: graalvm
+                type: jdk
                 version: "17"
             - name: Update Buildpack Dependency
               id: buildpack
diff --git a/.github/workflows/pb-update-native-image-21-arm-64.yml b/.github/workflows/pb-update-native-image-21-arm-64.yml
index fac8f7f..e14849d 100644
--- a/.github/workflows/pb-update-native-image-21-arm-64.yml
+++ b/.github/workflows/pb-update-native-image-21-arm-64.yml
@@ -28,8 +28,8 @@ jobs:
               uses: docker://ghcr.io/paketo-buildpacks/actions/foojay-dependency:main
               with:
                 arch: arm64
-                distro: oracle
-                type: graalvm
+                distro: graalvm
+                type: jdk
                 version: "21"
             - name: Update Buildpack Dependency
               id: buildpack
diff --git a/.github/workflows/pb-update-native-image-21.yml b/.github/workflows/pb-update-native-image-21.yml
index 4b1f144..2ebd424 100644
--- a/.github/workflows/pb-update-native-image-21.yml
+++ b/.github/workflows/pb-update-native-image-21.yml
@@ -27,8 +27,8 @@ jobs:
             - id: dependency
               uses: docker://ghcr.io/paketo-buildpacks/actions/foojay-dependency:main
               with:
-                distro: oracle
-                type: graalvm
+                distro: graalvm
+                type: jdk
                 version: "21"
             - name: Update Buildpack Dependency
               id: buildpack
diff --git a/.github/workflows/pb-update-native-image-22-arm-64.yml b/.github/workflows/pb-update-native-image-22-arm-64.yml
index aa4008c..aa3c6db 100644
--- a/.github/workflows/pb-update-native-image-22-arm-64.yml
+++ b/.github/workflows/pb-update-native-image-22-arm-64.yml
@@ -28,8 +28,8 @@ jobs:
               uses: docker://ghcr.io/paketo-buildpacks/actions/foojay-dependency:main
               with:
                 arch: arm64
-                distro: oracle
-                type: graalvm
+                distro: graalvm
+                type: jdk
                 version: "22"
             - name: Update Buildpack Dependency
               id: buildpack
diff --git a/.github/workflows/pb-update-native-image-22.yml b/.github/workflows/pb-update-native-image-22.yml
index fe82a9b..bd2e8b4 100644
--- a/.github/workflows/pb-update-native-image-22.yml
+++ b/.github/workflows/pb-update-native-image-22.yml
@@ -27,8 +27,8 @@ jobs:
             - id: dependency
               uses: docker://ghcr.io/paketo-buildpacks/actions/foojay-dependency:main
               with:
-                distro: oracle
-                type: graalvm
+                distro: graalvm
+                type: jdk
                 version: "22"
             - name: Update Buildpack Dependency
               id: buildpack