diff --git a/.github/workflows/fedora-bootc.yml b/.github/workflows/fedora-bootc.yml
new file mode 100644
index 0000000..ec69469
--- /dev/null
+++ b/.github/workflows/fedora-bootc.yml
@@ -0,0 +1,15 @@
+name: Build image 'fedora-bootc'
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'fedora-bootc/*'
+jobs:
+  build-image:
+    uses: ./.github/workflows/build-image.yml
+    with:
+      image_name: "fedora-bootc"
+      tags: unstable
+      publish: ${{ github.ref == 'refs/heads/main' }}
+      branch: main
diff --git a/.github/workflows/nightly-update-f40.yml b/.github/workflows/nightly-update-f40.yml
new file mode 100644
index 0000000..5481c9c
--- /dev/null
+++ b/.github/workflows/nightly-update-f40.yml
@@ -0,0 +1,14 @@
+name: Update f40 images
+on:
+  schedule:
+    # Every day at 2:49 AM
+    - cron: "49 2 * * *"
+
+jobs:
+  fedora-ci:
+    uses: ./.github/workflows/build-image.yml
+    with:
+      image_name: "fedora-ci"
+      tags: "40"
+      publish: true
+      branch: f40
diff --git a/.github/workflows/nightly-update-f41.yml b/.github/workflows/nightly-update-f41.yml
new file mode 100644
index 0000000..8c96c0f
--- /dev/null
+++ b/.github/workflows/nightly-update-f41.yml
@@ -0,0 +1,22 @@
+name: Update f41 images
+on:
+  schedule:
+    # Every day at 2:49 AM
+    - cron: "49 2 * * *"
+
+jobs:
+  fedora-ci:
+    uses: ./.github/workflows/build-image.yml
+    with:
+      image_name: "fedora-ci"
+      tags: '41'
+      publish: true
+      branch: f41
+
+  fedora-silverblue:
+    uses: ./.github/workflows/build-image.yml
+    with:
+      image_name: "fedora-silverblue"
+      tags: '41'
+      publish: true
+      branch: f41
diff --git a/.github/workflows/nightly-update-unstable.yml b/.github/workflows/nightly-update-unstable.yml
new file mode 100644
index 0000000..d159c41
--- /dev/null
+++ b/.github/workflows/nightly-update-unstable.yml
@@ -0,0 +1,31 @@
+name: Update unstable images
+on:
+  schedule:
+    # Every day at 2:49 AM
+    - cron: "49 2 * * *"
+
+jobs:
+  fedora-ci:
+    uses: ./.github/workflows/build-image.yml
+    with:
+      image_name: "fedora-ci"
+      tags: unstable
+      publish: true
+      branch: main
+
+  fedora-bootc:
+    uses: ./.github/workflows/build-image.yml
+    with:
+      image_name: "fedora-bootc"
+      tags: unstable
+      publish: true
+      branch: main
+
+  fedora-silverblue:
+    uses: ./.github/workflows/build-image.yml
+    needs: fedora-bootc
+    with:
+      image_name: "fedora-silverblue"
+      tags: unstable
+      publish: true
+      branch: main
diff --git a/.github/workflows/nightly-update.yml b/.github/workflows/nightly-update.yml
deleted file mode 100644
index 7dfc179..0000000
--- a/.github/workflows/nightly-update.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-name: Update all images
-on:
-  schedule:
-    # Every day at 2:49 AM
-    - cron: "49 2 * * *"
-
-jobs:
-  fedora-ci-40:
-    uses: ./.github/workflows/build-image.yml
-    with:
-      image_name: "fedora-ci"
-      tags: "40"
-      publish: true
-      branch: f40
-
-  fedora-ci-41:
-    uses: ./.github/workflows/build-image.yml
-    with:
-      image_name: "fedora-ci"
-      tags: '41'
-      publish: true
-      branch: f41
-
-  fedora-silverblue-41:
-    uses: ./.github/workflows/build-image.yml
-    with:
-      image_name: "fedora-silverblue"
-      tags: '41'
-      publish: true
-      branch: f41
-
-  fedora-ci-unstable:
-    uses: ./.github/workflows/build-image.yml
-    with:
-      image_name: "fedora-ci"
-      tags: unstable
-      publish: true
-      branch: main
-
-  fedora-silverblue-unstable:
-    uses: ./.github/workflows/build-image.yml
-    with:
-      image_name: "fedora-silverblue"
-      tags: unstable
-      publish: true
-      branch: main
diff --git a/fedora-bootc/Containerfile b/fedora-bootc/Containerfile
new file mode 100644
index 0000000..68bdc9d
--- /dev/null
+++ b/fedora-bootc/Containerfile
@@ -0,0 +1,10 @@
+FROM quay.io/fedora/fedora-bootc:41
+
+COPY copr-sharpenedblade-t2linux.repo /etc/yum.repos.d/
+
+RUN \
+    dnf swap -y \
+        --repo copr-sharpenedblade-t2linux --allowerasing \
+        kernel-core kernel-core && \
+    dnf install -y t2linux-release t2linux-repos && \
+    dnf clean all
diff --git a/fedora-silverblue/copr-sharpenedblade-t2linux.repo b/fedora-bootc/copr-sharpenedblade-t2linux.repo
similarity index 86%
rename from fedora-silverblue/copr-sharpenedblade-t2linux.repo
rename to fedora-bootc/copr-sharpenedblade-t2linux.repo
index 25cfd53..05c1abc 100644
--- a/fedora-silverblue/copr-sharpenedblade-t2linux.repo
+++ b/fedora-bootc/copr-sharpenedblade-t2linux.repo
@@ -1,4 +1,4 @@
-[copr:copr.fedorainfracloud.org:sharpenedblade:t2linux]
+[copr-sharpenedblade-t2linux]
 name=Copr repo for t2linux owned by sharpenedblade
 baseurl=https://download.copr.fedorainfracloud.org/results/sharpenedblade/t2linux/fedora-$releasever-$basearch/
 type=rpm-md
diff --git a/fedora-silverblue/Containerfile b/fedora-silverblue/Containerfile
index 239b3f2..9ca1b01 100644
--- a/fedora-silverblue/Containerfile
+++ b/fedora-silverblue/Containerfile
@@ -1,10 +1,8 @@
-FROM quay.io/fedora/fedora-silverblue:41
+FROM ghcr.io/t2linux/fedora-bootc:unstable
 
-COPY copr-sharpenedblade-t2linux.repo /etc/yum.repos.d/
-
-RUN rpm-ostree override replace --experimental --freeze \
-        --from repo="copr:copr.fedorainfracloud.org:sharpenedblade:t2linux" \
-        kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra && \
-    rpm-ostree install t2linux-repos t2linux-release && \
-    rpm-ostree install bootc dnf5 && \
-    ostree container commit
+RUN \
+    dnf group install -y --exclude=rootfiles \
+        workstation-product-environment && \ 
+    dnf install -y aajohan-comfortaa-fonts && \
+    dnf remove -y python3-botocore && \
+    dnf clean all