diff --git a/.forgejo/workflows/build-image.yaml b/.forgejo/workflows/build-image.yaml
index e65f864..d5fbc43 100644
--- a/.forgejo/workflows/build-image.yaml
+++ b/.forgejo/workflows/build-image.yaml
@@ -1,8 +1,5 @@
 on:
   push:
-    paths:
-      - 'containers/**'
-      - '.forgejo/workflows/build-image.yaml'
   schedule:
     - cron: '0 5 * * *'
 jobs:
@@ -208,3 +205,32 @@ jobs:
           --compression-level=${{ vars.COMPRESSION_LEVEL }}
           ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-nvidia-ver4a.expiring
           ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:$(buildah inspect -t image -f '{{ index .OCIv1.Config.Labels "org.opencontainers.image.version" }}' ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-nvidia-ver4a)-nvidia-ver4a
+      - if: '!cancelled()'
+        run: >
+          podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main && podman image prune -f &&
+          podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-ver4a && podman image prune -f &&
+          podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-nvidia && podman image prune -f &&
+          podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-nvidia-ver4a && podman image prune -f
+#   build-gnome:
+#     runs-on: oci-builder
+#     steps:
+#       - uses: actions/checkout@v4
+#       - run:  cd ${{ env.GITHUB_WORKSPACE }}
+#       - run:  podman login -u ${{ vars.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} ${{ vars.REGISTRY_DOMAIN }}
+#       # base
+#       - run:  mkdir cache
+#         # Waits for a CI pull lock to be released before starting a new pull
+#       - run:  flock -x /tmp/CI-podman-pull-lock -c 'podman pull quay.io/fedora-ostree-desktops/silverblue:42'
+#       - run:  podman build . -f Dockerfile.gnome --userns container --security-opt no-new-privileges --no-cache --pull=never -v ${PWD}/cache:/var/cache/libdnf5:Z --squash --build-arg REGISTRY_DOMAIN=${{ vars.REGISTRY_DOMAIN }} --build-arg NAMESPACE=${{ vars.NAMESPACE }} -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main --annotation quay.expires-after=
+#       - run:  podman push --compression-format=zstd --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main
+#       - run:  podman build -f Dockerfile.scratch --from ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main --label quay.expires-after=4w --annotation quay.expires-after=4w
+#       - run:  podman push --compression-format=zstd --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:$(podman image inspect -f '{{ index .Labels "org.opencontainers.image.version" }}' ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main)
+#       # base + nvidia
+#       - run:  podman build . -f Dockerfile.gnome-nvidia --userns container --security-opt no-new-privileges --no-cache --pull=never -v ${PWD}/cache:/var/cache/libdnf5:Z --squash --build-arg REGISTRY_DOMAIN=${{ vars.REGISTRY_DOMAIN }} --build-arg NAMESPACE=${{ vars.NAMESPACE }} -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main-nvidia --annotation quay.expires-after=
+#       - run:  podman push --compression-format=zstd --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main-nvidia ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main-nvidia
+#       - run:  podman build -f Dockerfile.scratch --from ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main-nvidia -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main-nvidia --label quay.expires-after=4w --annotation quay.expires-after=4w
+#       - run:  podman push --compression-format=zstd --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main-nvidia ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:$(podman image inspect -f '{{ index .Labels "org.opencontainers.image.version" }}' ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main)-nvidia
+#       - if: '!cancelled()'
+#         run: >
+#            podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main && podman image prune -f &&
+#            podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main-nvidia && podman image prune -f
diff --git a/containers/Dockerfile.gnome b/Dockerfile.gnome
similarity index 100%
rename from containers/Dockerfile.gnome
rename to Dockerfile.gnome
diff --git a/containers/Dockerfile.gnome-nvidia b/Dockerfile.gnome-nvidia
similarity index 100%
rename from containers/Dockerfile.gnome-nvidia
rename to Dockerfile.gnome-nvidia
diff --git a/containers/Dockerfile.kde b/Dockerfile.kde
similarity index 100%
rename from containers/Dockerfile.kde
rename to Dockerfile.kde
diff --git a/containers/Dockerfile.kde-nvidia b/Dockerfile.kde-nvidia
similarity index 100%
rename from containers/Dockerfile.kde-nvidia
rename to Dockerfile.kde-nvidia
diff --git a/containers/Dockerfile.kde-nvidia-ver4a b/Dockerfile.kde-nvidia-ver4a
similarity index 100%
rename from containers/Dockerfile.kde-nvidia-ver4a
rename to Dockerfile.kde-nvidia-ver4a
diff --git a/containers/Dockerfile.kde-ver4a b/Dockerfile.kde-ver4a
similarity index 100%
rename from containers/Dockerfile.kde-ver4a
rename to Dockerfile.kde-ver4a
diff --git a/Dockerfile.scratch b/Dockerfile.scratch
new file mode 100644
index 0000000..8c075ec
--- /dev/null
+++ b/Dockerfile.scratch
@@ -0,0 +1,2 @@
+# This servres as a placeholder for the "-f" parameter to "podman build" e.g. if we set "--from" and "--label" to relabel an image.
+FROM scratch
diff --git a/containers/etc/dnf/dnf.conf b/etc/dnf/dnf.conf
similarity index 100%
rename from containers/etc/dnf/dnf.conf
rename to etc/dnf/dnf.conf
diff --git a/containers/etc/polkit-1/rules.d/80-libvirt-manage.rules b/etc/polkit-1/rules.d/80-libvirt-manage.rules
similarity index 100%
rename from containers/etc/polkit-1/rules.d/80-libvirt-manage.rules
rename to etc/polkit-1/rules.d/80-libvirt-manage.rules
diff --git a/containers/etc/polkit-1/rules.d/80-rpm-ostree.rules b/etc/polkit-1/rules.d/80-rpm-ostree.rules
similarity index 100%
rename from containers/etc/polkit-1/rules.d/80-rpm-ostree.rules
rename to etc/polkit-1/rules.d/80-rpm-ostree.rules
diff --git a/containers/etc/polkit-1/rules.d/80-systemd-unit-manage.rules b/etc/polkit-1/rules.d/80-systemd-unit-manage.rules
similarity index 100%
rename from containers/etc/polkit-1/rules.d/80-systemd-unit-manage.rules
rename to etc/polkit-1/rules.d/80-systemd-unit-manage.rules
diff --git a/containers/etc/profile.d/20-bat-manpager.sh b/etc/profile.d/20-bat-manpager.sh
similarity index 100%
rename from containers/etc/profile.d/20-bat-manpager.sh
rename to etc/profile.d/20-bat-manpager.sh
diff --git a/containers/etc/profile.d/20-less.sh b/etc/profile.d/20-less.sh
similarity index 100%
rename from containers/etc/profile.d/20-less.sh
rename to etc/profile.d/20-less.sh
diff --git a/containers/etc/profile.d/20-systemd-less.sh b/etc/profile.d/20-systemd-less.sh
similarity index 100%
rename from containers/etc/profile.d/20-systemd-less.sh
rename to etc/profile.d/20-systemd-less.sh
diff --git a/containers/etc/profile.d/bash-color-prompt.sh b/etc/profile.d/bash-color-prompt.sh
similarity index 100%
rename from containers/etc/profile.d/bash-color-prompt.sh
rename to etc/profile.d/bash-color-prompt.sh
diff --git a/containers/etc/ssh/sshd_config.d/20-disable-gssapi.conf b/etc/ssh/sshd_config.d/20-disable-gssapi.conf
similarity index 100%
rename from containers/etc/ssh/sshd_config.d/20-disable-gssapi.conf
rename to etc/ssh/sshd_config.d/20-disable-gssapi.conf
diff --git a/containers/etc/ssh/sshd_config.d/20-disable-passwords.conf b/etc/ssh/sshd_config.d/20-disable-passwords.conf
similarity index 100%
rename from containers/etc/ssh/sshd_config.d/20-disable-passwords.conf
rename to etc/ssh/sshd_config.d/20-disable-passwords.conf
diff --git a/containers/etc/sysctl.d/20-high-swappines.conf b/etc/sysctl.d/20-high-swappines.conf
similarity index 100%
rename from containers/etc/sysctl.d/20-high-swappines.conf
rename to etc/sysctl.d/20-high-swappines.conf
diff --git a/containers/etc/sysctl.d/20-no-page-cluster.conf b/etc/sysctl.d/20-no-page-cluster.conf
similarity index 100%
rename from containers/etc/sysctl.d/20-no-page-cluster.conf
rename to etc/sysctl.d/20-no-page-cluster.conf
diff --git a/containers/etc/systemd/resolved.conf b/etc/systemd/resolved.conf
similarity index 100%
rename from containers/etc/systemd/resolved.conf
rename to etc/systemd/resolved.conf
diff --git a/containers/etc/systemd/zram-generator.conf b/etc/systemd/zram-generator.conf
similarity index 100%
rename from containers/etc/systemd/zram-generator.conf
rename to etc/systemd/zram-generator.conf
diff --git a/containers/etc/vimrc.local b/etc/vimrc.local
similarity index 100%
rename from containers/etc/vimrc.local
rename to etc/vimrc.local
diff --git a/containers/etc/yum.repos.d/vscodium.repo b/etc/yum.repos.d/vscodium.repo
similarity index 100%
rename from containers/etc/yum.repos.d/vscodium.repo
rename to etc/yum.repos.d/vscodium.repo
diff --git a/containers/mpv_options b/mpv_options
similarity index 100%
rename from containers/mpv_options
rename to mpv_options
diff --git a/containers/usr.nvidia/lib/bootc/kargs.d/10-nvidia-drivers.toml b/usr.nvidia/lib/bootc/kargs.d/10-nvidia-drivers.toml
similarity index 100%
rename from containers/usr.nvidia/lib/bootc/kargs.d/10-nvidia-drivers.toml
rename to usr.nvidia/lib/bootc/kargs.d/10-nvidia-drivers.toml
diff --git a/containers/usr/lib/bootc/kargs.d/10-luks-discard.toml b/usr/lib/bootc/kargs.d/10-luks-discard.toml
similarity index 100%
rename from containers/usr/lib/bootc/kargs.d/10-luks-discard.toml
rename to usr/lib/bootc/kargs.d/10-luks-discard.toml