diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index ffbe6149..336a4018 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -9,7 +9,7 @@ on:
         value: '
           {
             "version": [
-              "39", 
+              "39",
               "40",
               "41"
             ],
@@ -19,10 +19,38 @@ on:
               "flatpak_refs"
             ],
             "image_repo": [
-              "ghcr.io/ublue-os"
+              "ghcr.io/ublue-os",
+              "quay.io/fedora-ostree-desktops"
             ],
-            "image_name": [
-              "base-main"
+            "include": [
+              {
+                "image_repo": "ghcr.io/ublue-os",
+                "image_name": "base-main",
+              },
+              {
+                "image_repo": "quay.io/fedora-ostree-desktops",
+                "version": "40",
+                "image_name": "base"
+              },
+              {
+                "image_repo": "quay.io/fedora-ostree-desktops",
+                "version": "41",
+                "image_name": "base-atomic"
+              }
+            ],
+            "exclude": [
+              {
+                "image_repo": "quay.io/fedora-ostree-desktops",
+                "version": "39"
+              },
+              {
+                "image_repo": "quay.io/fedora-ostree-desktops",
+                "flatpaks": "flatpak_refs_dir"
+              },
+              {
+                "image_repo": "quay.io/fedora-ostree-desktops",
+                "flatpaks": "flatpak_refs"
+              }
             ]
           }'
       VARIANT: