diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index 35b659b..de484bf 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -8,11 +8,6 @@ on:
       BUILD_MATRIX:
         value: '
           {
-            "version": [
-              "39", 
-              "40",
-              "41"
-            ],
             "flatpaks": [
               "false",
               "flatpak_refs_dir",
@@ -25,38 +20,31 @@ on:
             "include": [
               {
                 "image_repo": "ghcr.io/ublue-os",
-                "image_name": "base-main"
-              },
-              {
-                "image_repo": "quay.io/fedora-ostree-desktops",
-                "image_name": "base"
-              },
-              {
-                "image_repo": "quay.io/fedora-ostree-desktops",
-                "image_name": "base-atomic"
-              }
-            ],
-            "exclude": [
-              {
-                "image_repo": "quay.io/fedora-ostree-desktops",
-                "image_name": "base",
+                "image_name": "base-main",
                 "version": "39"
               },
               {
-                "image_repo": "quay.io/fedora-ostree-desktops",
-                "image_name": "base",
+                "image_repo": "ghcr.io/ublue-os",
+                "image_name": "base-main",
+                "version": "40"
+              },
+              {
+                "image_repo": "ghcr.io/ublue-os",
+                "image_name": "base-main",
                 "version": "41"
               },
               {
                 "image_repo": "quay.io/fedora-ostree-desktops",
-                "image_name": "base-atomic",
-                "version": "39"
+                "image_name": "base"
+                "version": "40"
               },
               {
                 "image_repo": "quay.io/fedora-ostree-desktops",
                 "image_name": "base-atomic",
-                "version": "40"
-              },
+                "version": "41"
+              }
+            ],
+            "exclude": [
               {
                 "image_repo": "quay.io/fedora-ostree-desktops",
                 "flatpaks": "flatpak_refs_dir"