diff --git a/.forgejo/workflows/build-fedora-40.yml b/.forgejo/workflows/build-fedora-40.yml
index 5f2dfdb..5b7a92d 100644
--- a/.forgejo/workflows/build-fedora-40.yml
+++ b/.forgejo/workflows/build-fedora-40.yml
@@ -23,6 +23,9 @@ jobs:
         uses: actions/checkout@v3
       - name: Fulfill Package Manager Cache
         run: dnf makecache -y --releasever 40
+      - name: Sign in to Image Index
+        run: buildah login code.lightstands.xyz \
+            --username ${{ env.GITHUB_ACTOR }} --password ${{ secrets.PUBLICATION_TOKEN }}
       - name: Build Minimal Images
         run: |
           cd fedora-40-minimal && \
@@ -30,21 +33,15 @@ jobs:
           buildah build --arch aarch64 \
             --pid=host --ipc=host --network=host --userns=host --uts=host -v /var/cache/dnf:/var/cache/dnf \
             --manifest code.lightstands.xyz/standcoded/fedora-minimal:40 .
-        env:
-          BUILDAH_ISOLATION: chroot
-      - name: Build Images
+      - name: Push Minimal Images
+        run: buildah manifest push code.lightstands.xyz/standcoded/fedora-minimal:40 --all
+      - name: Build Complete Images
         run: |
           cd fedora-40 && \
           buildah manifest create code.lightstands.xyz/standcoded/fedora:40 && \
           buildah build --arch aarch64 \
             --pid=host --ipc=host --network=host --userns=host --uts=host -v /var/cache/dnf:/var/cache/dnf \
             --manifest code.lightstands.xyz/standcoded/fedora:40 .
-        env:
-          BUILDAH_ISOLATION: chroot
-      - name: Push Images
-        run: |
-          buildah login code.lightstands.xyz \
-            --username ${{ env.GITHUB_ACTOR }} --password ${{ secrets.PUBLICATION_TOKEN }} && \
-          buildah manifest push code.lightstands.xyz/standcoded/fedora-minimal:40 --all && \
-          buildah manifest push code.lightstands.xyz/standcoded/fedora:40 --all
+      - name: Push Complete Images
+        run: buildah manifest push code.lightstands.xyz/standcoded/fedora:40 --all