diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index 0ac8feaa..3483e284 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -8,6 +8,7 @@ on:
         type: string
 env:
   IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
+  SOURCE_ORG: fedora
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref || github.run_id }}-${{ inputs.fedora_version }}
@@ -34,6 +35,32 @@ jobs:
           - base
           - lazurite
           - vauxite
+        include:
+          - image_name: base
+            source_org: fedora-ostree-desktops
+            fedora_version: 40
+          - image_name: base
+            source_org: fedora-ostree-desktops
+            source_image: base-atomic
+            fedora_version: 41
+          - image_name: lazurite
+            source_org: fedora-ostree-desktops
+            fedora_version: 40
+          - image_name: lazurite
+            source_org: fedora-ostree-desktops
+            fedora_version: 41
+            source_image: lxqt-atomic
+          - image_name: vauxite
+            source_org: fedora-ostree-desktops
+            fedora_version: 40
+          - image_name: vauxite
+            source_org: fedora-ostree-desktops
+            fedora_version: 41
+            source_image: xfce-atomic
+          - image_name: sericea
+            source_image: fedora-sway-atomic
+          - image_name: onyx
+            source_image: fedora-budgie-atomic
 
     steps:
       # Checkout push-to-registry action GitHub repository
@@ -43,12 +70,15 @@ jobs:
       - name: Matrix Variables
         shell: bash
         run: |
-          if [[ "${{ matrix.image_name }}" == "mate" ]]; then
-              echo "SOURCE_IMAGE=base" >> $GITHUB_ENV
+          if [[ -n "${{ matrix.source_org }}" ]]; then
+            echo "SOURCE_ORG=${{ matrix.source_org }}" >> $GITHUB_ENV
+          fi
+          
+          if [[ -n "${{ matrix.source_image }}" ]]; then
+            echo "SOURCE_IMAGE=fedora-${{ matrix.image_name }}" >> $GITHUB_ENV
           else
-              echo "SOURCE_IMAGE=${{ matrix.image_name }}" >> $GITHUB_ENV
+            echo "SOURCE_IMAGE=${{ matrix.source_image }}" >> $GITHUB_ENV
           fi
-          echo "SOURCE_ORG=fedora-ostree-desktops" >> $GITHUB_ENV
           echo "IMAGE_NAME=${{ matrix.image_name }}-main" >> $GITHUB_ENV
 
       - name: Generate tags
diff --git a/Containerfile b/Containerfile
index 681dd3f3..3b86fecc 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}"
 ARG SOURCE_IMAGE="${SOURCE_IMAGE:-silverblue}"
-ARG SOURCE_ORG="${SOURCE_ORG:-fedora-ostree-desktops}"
+ARG SOURCE_ORG="${SOURCE_ORG:-fedora}"
 ARG BASE_IMAGE="quay.io/${SOURCE_ORG}/${SOURCE_IMAGE}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
 ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.7-200.fc40.x86_64}"