diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index edaaa1d..ce9bedf 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Install Just
         uses: ./.github/actions/install-just
       - name: Maximize Build Space
-        uses: ublue-os/remove-unwanted-software@v7
+        uses: ublue-os/remove-unwanted-software@v8
       - name: Build Image
         shell: bash
         run: |
diff --git a/.github/workflows/build-iso.yml b/.github/workflows/build-iso.yml
index 9bae5d5..d57c4b6 100644
--- a/.github/workflows/build-iso.yml
+++ b/.github/workflows/build-iso.yml
@@ -60,7 +60,7 @@ jobs:
         if: >-
           contains(fromJson('["workflow_dispatch", "workflow_call"]'),
           github.event_name) || github.event.schedule == '41 6 * * 0'
-        uses: ublue-os/remove-unwanted-software@v7
+        uses: ublue-os/remove-unwanted-software@v8
       - name: Build ISO
         if: >-
           contains(fromJson('["workflow_dispatch", "workflow_call"]'),
diff --git a/Justfile b/Justfile
index d8078aa..b75c412 100644
--- a/Justfile
+++ b/Justfile
@@ -133,7 +133,7 @@ build image="bluefin":
     {{ PODMAN }} build "${BUILD_ARGS[@]}" .
     echo "::endgroup::"
 
-    if [[ "${UID}" -gt "0" ]]; then
+    if [[ "${UID}" -gt "0" && ! "${PODMAN}" =~ docker ]]; then
         just rechunk {{ image }}
     else
         {{ PODMAN }} rmi ghcr.io/ublue-os/"${BASE_IMAGE}":"${TAG_VERSION}"
@@ -145,6 +145,10 @@ rechunk image="bluefin":
     #!/usr/bin/env bash
     echo "::group:: Rechunk Build Prep"
     set ${SET_X:+-x} -eou pipefail
+    if [[ {{ PODMAN }} =~ docker ]]; then
+        echo "Rechunk does not currently support Docker... Exiting..."
+        exit 0
+    fi
     ID=$({{ PODMAN }} images --filter reference=localhost/{{ repo_image_name }}:{{ image }} --format "'{{ '{{.ID}}' }}'")
 
     if [[ -z "$ID" ]]; then