diff --git a/.forgejo/workflows/build-image.yaml b/.forgejo/workflows/build-image.yaml
index 557bf2f..e65f864 100644
--- a/.forgejo/workflows/build-image.yaml
+++ b/.forgejo/workflows/build-image.yaml
@@ -1,5 +1,8 @@
 on:
   push:
+    paths:
+      - 'containers/**'
+      - '.forgejo/workflows/build-image.yaml'
   schedule:
     - cron: '0 5 * * *'
 jobs:
diff --git a/Dockerfile.gnome b/containers/Dockerfile.gnome
similarity index 100%
rename from Dockerfile.gnome
rename to containers/Dockerfile.gnome
diff --git a/Dockerfile.gnome-nvidia b/containers/Dockerfile.gnome-nvidia
similarity index 100%
rename from Dockerfile.gnome-nvidia
rename to containers/Dockerfile.gnome-nvidia
diff --git a/Dockerfile.kde b/containers/Dockerfile.kde
similarity index 100%
rename from Dockerfile.kde
rename to containers/Dockerfile.kde
diff --git a/Dockerfile.kde-nvidia b/containers/Dockerfile.kde-nvidia
similarity index 100%
rename from Dockerfile.kde-nvidia
rename to containers/Dockerfile.kde-nvidia
diff --git a/Dockerfile.kde-nvidia-ver4a b/containers/Dockerfile.kde-nvidia-ver4a
similarity index 100%
rename from Dockerfile.kde-nvidia-ver4a
rename to containers/Dockerfile.kde-nvidia-ver4a
diff --git a/Dockerfile.kde-ver4a b/containers/Dockerfile.kde-ver4a
similarity index 100%
rename from Dockerfile.kde-ver4a
rename to containers/Dockerfile.kde-ver4a
diff --git a/etc/dnf/dnf.conf b/containers/etc/dnf/dnf.conf
similarity index 100%
rename from etc/dnf/dnf.conf
rename to containers/etc/dnf/dnf.conf
diff --git a/etc/polkit-1/rules.d/80-libvirt-manage.rules b/containers/etc/polkit-1/rules.d/80-libvirt-manage.rules
similarity index 100%
rename from etc/polkit-1/rules.d/80-libvirt-manage.rules
rename to containers/etc/polkit-1/rules.d/80-libvirt-manage.rules
diff --git a/etc/polkit-1/rules.d/80-rpm-ostree.rules b/containers/etc/polkit-1/rules.d/80-rpm-ostree.rules
similarity index 100%
rename from etc/polkit-1/rules.d/80-rpm-ostree.rules
rename to containers/etc/polkit-1/rules.d/80-rpm-ostree.rules
diff --git a/etc/polkit-1/rules.d/80-systemd-unit-manage.rules b/containers/etc/polkit-1/rules.d/80-systemd-unit-manage.rules
similarity index 100%
rename from etc/polkit-1/rules.d/80-systemd-unit-manage.rules
rename to containers/etc/polkit-1/rules.d/80-systemd-unit-manage.rules
diff --git a/etc/profile.d/20-bat-manpager.sh b/containers/etc/profile.d/20-bat-manpager.sh
similarity index 100%
rename from etc/profile.d/20-bat-manpager.sh
rename to containers/etc/profile.d/20-bat-manpager.sh
diff --git a/etc/profile.d/20-less.sh b/containers/etc/profile.d/20-less.sh
similarity index 100%
rename from etc/profile.d/20-less.sh
rename to containers/etc/profile.d/20-less.sh
diff --git a/etc/profile.d/20-systemd-less.sh b/containers/etc/profile.d/20-systemd-less.sh
similarity index 100%
rename from etc/profile.d/20-systemd-less.sh
rename to containers/etc/profile.d/20-systemd-less.sh
diff --git a/etc/profile.d/bash-color-prompt.sh b/containers/etc/profile.d/bash-color-prompt.sh
similarity index 100%
rename from etc/profile.d/bash-color-prompt.sh
rename to containers/etc/profile.d/bash-color-prompt.sh
diff --git a/etc/ssh/sshd_config.d/20-disable-gssapi.conf b/containers/etc/ssh/sshd_config.d/20-disable-gssapi.conf
similarity index 100%
rename from etc/ssh/sshd_config.d/20-disable-gssapi.conf
rename to containers/etc/ssh/sshd_config.d/20-disable-gssapi.conf
diff --git a/etc/ssh/sshd_config.d/20-disable-passwords.conf b/containers/etc/ssh/sshd_config.d/20-disable-passwords.conf
similarity index 100%
rename from etc/ssh/sshd_config.d/20-disable-passwords.conf
rename to containers/etc/ssh/sshd_config.d/20-disable-passwords.conf
diff --git a/etc/sysctl.d/20-high-swappines.conf b/containers/etc/sysctl.d/20-high-swappines.conf
similarity index 100%
rename from etc/sysctl.d/20-high-swappines.conf
rename to containers/etc/sysctl.d/20-high-swappines.conf
diff --git a/etc/sysctl.d/20-no-page-cluster.conf b/containers/etc/sysctl.d/20-no-page-cluster.conf
similarity index 100%
rename from etc/sysctl.d/20-no-page-cluster.conf
rename to containers/etc/sysctl.d/20-no-page-cluster.conf
diff --git a/etc/systemd/resolved.conf b/containers/etc/systemd/resolved.conf
similarity index 100%
rename from etc/systemd/resolved.conf
rename to containers/etc/systemd/resolved.conf
diff --git a/etc/systemd/zram-generator.conf b/containers/etc/systemd/zram-generator.conf
similarity index 100%
rename from etc/systemd/zram-generator.conf
rename to containers/etc/systemd/zram-generator.conf
diff --git a/etc/vimrc.local b/containers/etc/vimrc.local
similarity index 100%
rename from etc/vimrc.local
rename to containers/etc/vimrc.local
diff --git a/etc/yum.repos.d/vscodium.repo b/containers/etc/yum.repos.d/vscodium.repo
similarity index 100%
rename from etc/yum.repos.d/vscodium.repo
rename to containers/etc/yum.repos.d/vscodium.repo
diff --git a/mpv_options b/containers/mpv_options
similarity index 100%
rename from mpv_options
rename to containers/mpv_options
diff --git a/usr.nvidia/lib/bootc/kargs.d/10-nvidia-drivers.toml b/containers/usr.nvidia/lib/bootc/kargs.d/10-nvidia-drivers.toml
similarity index 100%
rename from usr.nvidia/lib/bootc/kargs.d/10-nvidia-drivers.toml
rename to containers/usr.nvidia/lib/bootc/kargs.d/10-nvidia-drivers.toml
diff --git a/usr/lib/bootc/kargs.d/10-luks-discard.toml b/containers/usr/lib/bootc/kargs.d/10-luks-discard.toml
similarity index 100%
rename from usr/lib/bootc/kargs.d/10-luks-discard.toml
rename to containers/usr/lib/bootc/kargs.d/10-luks-discard.toml