diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 71c7b24..5e49fa0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,7 +39,7 @@ jobs:
           registry_token: ${{ github.token }}
           pr_event_number: ${{ github.event.number }}
           use_unstable_cli: true
-          cli_version: ":v0.8.4-installer"
+          cli_version: ":20d1950530218118c6c0fff1fe5ff6b37e5d1586-installer"
   rpm-ostree-rechunk:
     name: rpm-ostree re-encapsulate
     runs-on: ubuntu-latest
diff --git a/config/containerfiles/copyrpms/Containerfile b/containerfiles/copyrpms/Containerfile
similarity index 100%
rename from config/containerfiles/copyrpms/Containerfile
rename to containerfiles/copyrpms/Containerfile
diff --git a/config/scripts/regen-initramfs.sh b/files/scripts/regen-initramfs.sh
similarity index 100%
rename from config/scripts/regen-initramfs.sh
rename to files/scripts/regen-initramfs.sh
diff --git a/config/files/etc/dracut.conf.d/70-enable-zstd.conf b/files/system/etc/dracut.conf.d/70-enable-zstd.conf
similarity index 100%
rename from config/files/etc/dracut.conf.d/70-enable-zstd.conf
rename to files/system/etc/dracut.conf.d/70-enable-zstd.conf
diff --git a/config/files/etc/dracut.conf.d/80-enable-pcrphase.conf b/files/system/etc/dracut.conf.d/80-enable-pcrphase.conf
similarity index 100%
rename from config/files/etc/dracut.conf.d/80-enable-pcrphase.conf
rename to files/system/etc/dracut.conf.d/80-enable-pcrphase.conf
diff --git a/config/files/etc/locale.conf b/files/system/etc/locale.conf
similarity index 100%
rename from config/files/etc/locale.conf
rename to files/system/etc/locale.conf
diff --git a/config/files/etc/localtime b/files/system/etc/localtime
similarity index 100%
rename from config/files/etc/localtime
rename to files/system/etc/localtime
diff --git a/config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-2020 b/files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-2020
similarity index 100%
rename from config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-2020
rename to files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-2020
diff --git a/config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-40 b/files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-40
similarity index 100%
rename from config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-40
rename to files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-40
diff --git a/config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-41 b/files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-41
similarity index 100%
rename from config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-41
rename to files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-41
diff --git a/config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-42 b/files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-42
similarity index 100%
rename from config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-42
rename to files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-42
diff --git a/config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-latest b/files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-latest
similarity index 100%
rename from config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-latest
rename to files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-latest
diff --git a/config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-rawhide b/files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-rawhide
similarity index 100%
rename from config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-rawhide
rename to files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-rawhide
diff --git a/config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020 b/files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020
similarity index 100%
rename from config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020
rename to files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020
diff --git a/config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-40 b/files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-40
similarity index 100%
rename from config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-40
rename to files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-40
diff --git a/config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-41 b/files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-41
similarity index 100%
rename from config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-41
rename to files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-41
diff --git a/config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-42 b/files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-42
similarity index 100%
rename from config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-42
rename to files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-42
diff --git a/config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-latest b/files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-latest
similarity index 100%
rename from config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-latest
rename to files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-latest
diff --git a/config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-rawhide b/files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-rawhide
similarity index 100%
rename from config/files/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-rawhide
rename to files/system/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-rawhide
diff --git a/config/files/etc/sddm.conf.d/hidpi.conf b/files/system/etc/sddm.conf.d/hidpi.conf
similarity index 100%
rename from config/files/etc/sddm.conf.d/hidpi.conf
rename to files/system/etc/sddm.conf.d/hidpi.conf
diff --git a/config/files/etc/systemd/system/ostree-finalize-staged.service.d/override.conf b/files/system/etc/systemd/system/ostree-finalize-staged.service.d/override.conf
similarity index 100%
rename from config/files/etc/systemd/system/ostree-finalize-staged.service.d/override.conf
rename to files/system/etc/systemd/system/ostree-finalize-staged.service.d/override.conf
diff --git a/config/files/etc/systemd/system/tailscaled-restart.service b/files/system/etc/systemd/system/tailscaled-restart.service
similarity index 100%
rename from config/files/etc/systemd/system/tailscaled-restart.service
rename to files/system/etc/systemd/system/tailscaled-restart.service
diff --git a/config/files/etc/vconsole.conf b/files/system/etc/vconsole.conf
similarity index 100%
rename from config/files/etc/vconsole.conf
rename to files/system/etc/vconsole.conf
diff --git a/config/files/etc/yum.repos.d/1password.repo b/files/system/etc/yum.repos.d/1password.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/1password.repo
rename to files/system/etc/yum.repos.d/1password.repo
diff --git a/config/files/etc/yum.repos.d/fedora-40-kernel.repo b/files/system/etc/yum.repos.d/fedora-40-kernel.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/fedora-40-kernel.repo
rename to files/system/etc/yum.repos.d/fedora-40-kernel.repo
diff --git a/config/files/etc/yum.repos.d/fedora-rawhide.repo b/files/system/etc/yum.repos.d/fedora-rawhide.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/fedora-rawhide.repo
rename to files/system/etc/yum.repos.d/fedora-rawhide.repo
diff --git a/config/files/etc/yum.repos.d/google-chrome.repo b/files/system/etc/yum.repos.d/google-chrome.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/google-chrome.repo
rename to files/system/etc/yum.repos.d/google-chrome.repo
diff --git a/config/files/etc/yum.repos.d/koji.repo b/files/system/etc/yum.repos.d/koji.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/koji.repo
rename to files/system/etc/yum.repos.d/koji.repo
diff --git a/config/files/etc/yum.repos.d/local-rpms.repo b/files/system/etc/yum.repos.d/local-rpms.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/local-rpms.repo
rename to files/system/etc/yum.repos.d/local-rpms.repo
diff --git a/config/files/etc/yum.repos.d/rpmfusion-free-rawhide.repo b/files/system/etc/yum.repos.d/rpmfusion-free-rawhide.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/rpmfusion-free-rawhide.repo
rename to files/system/etc/yum.repos.d/rpmfusion-free-rawhide.repo
diff --git a/config/files/etc/yum.repos.d/rpmfusion-free-updates-testing.repo b/files/system/etc/yum.repos.d/rpmfusion-free-updates-testing.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/rpmfusion-free-updates-testing.repo
rename to files/system/etc/yum.repos.d/rpmfusion-free-updates-testing.repo
diff --git a/config/files/etc/yum.repos.d/rpmfusion-free-updates.repo b/files/system/etc/yum.repos.d/rpmfusion-free-updates.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/rpmfusion-free-updates.repo
rename to files/system/etc/yum.repos.d/rpmfusion-free-updates.repo
diff --git a/config/files/etc/yum.repos.d/rpmfusion-free.repo b/files/system/etc/yum.repos.d/rpmfusion-free.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/rpmfusion-free.repo
rename to files/system/etc/yum.repos.d/rpmfusion-free.repo
diff --git a/config/files/etc/yum.repos.d/rpmfusion-nonfree-nvidia-driver.repo b/files/system/etc/yum.repos.d/rpmfusion-nonfree-nvidia-driver.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/rpmfusion-nonfree-nvidia-driver.repo
rename to files/system/etc/yum.repos.d/rpmfusion-nonfree-nvidia-driver.repo
diff --git a/config/files/etc/yum.repos.d/rpmfusion-nonfree-rawhide.repo b/files/system/etc/yum.repos.d/rpmfusion-nonfree-rawhide.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/rpmfusion-nonfree-rawhide.repo
rename to files/system/etc/yum.repos.d/rpmfusion-nonfree-rawhide.repo
diff --git a/config/files/etc/yum.repos.d/rpmfusion-nonfree-steam.repo b/files/system/etc/yum.repos.d/rpmfusion-nonfree-steam.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/rpmfusion-nonfree-steam.repo
rename to files/system/etc/yum.repos.d/rpmfusion-nonfree-steam.repo
diff --git a/config/files/etc/yum.repos.d/rpmfusion-nonfree-updates-testing.repo b/files/system/etc/yum.repos.d/rpmfusion-nonfree-updates-testing.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/rpmfusion-nonfree-updates-testing.repo
rename to files/system/etc/yum.repos.d/rpmfusion-nonfree-updates-testing.repo
diff --git a/config/files/etc/yum.repos.d/rpmfusion-nonfree-updates.repo b/files/system/etc/yum.repos.d/rpmfusion-nonfree-updates.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/rpmfusion-nonfree-updates.repo
rename to files/system/etc/yum.repos.d/rpmfusion-nonfree-updates.repo
diff --git a/config/files/etc/yum.repos.d/rpmfusion-nonfree.repo b/files/system/etc/yum.repos.d/rpmfusion-nonfree.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/rpmfusion-nonfree.repo
rename to files/system/etc/yum.repos.d/rpmfusion-nonfree.repo
diff --git a/config/files/etc/yum.repos.d/tailscale.repo b/files/system/etc/yum.repos.d/tailscale.repo
similarity index 100%
rename from config/files/etc/yum.repos.d/tailscale.repo
rename to files/system/etc/yum.repos.d/tailscale.repo
diff --git a/config/files/rpms/.gitkeep b/files/system/rpms/.gitkeep
similarity index 100%
rename from config/files/rpms/.gitkeep
rename to files/system/rpms/.gitkeep
diff --git a/config/files/usr/sbin/finalize-ostree-uki.py b/files/system/usr/sbin/finalize-ostree-uki.py
similarity index 100%
rename from config/files/usr/sbin/finalize-ostree-uki.py
rename to files/system/usr/sbin/finalize-ostree-uki.py
diff --git a/config/files/usr/sbin/ostree-dnf-upgrade.py b/files/system/usr/sbin/ostree-dnf-upgrade.py
similarity index 100%
rename from config/files/usr/sbin/ostree-dnf-upgrade.py
rename to files/system/usr/sbin/ostree-dnf-upgrade.py
diff --git a/recipes/fedora-kinoite-laptop.yml b/recipes/fedora-kinoite-laptop.yml
index 36d2765..4319acc 100644
--- a/recipes/fedora-kinoite-laptop.yml
+++ b/recipes/fedora-kinoite-laptop.yml
@@ -20,11 +20,16 @@ modules:
   # copy only files needed by rpm and dracut
   - type: files
     files:
-      - etc/yum.repos.d: /etc/yum.repos.d
-      - etc/pki: /etc/pki
-      - etc/dracut.conf.d: /etc/dracut.conf.d
-      - usr/sbin: /usr/sbin
-      - rpms: /usr/share/local-rpm-repo
+      - source: system/etc/yum.repos.d
+        destination: /etc/yum.repos.d
+      - source: system/etc/pki
+        destination: /etc/pki
+      - source: system/etc/dracut.conf.d
+        destination: /etc/dracut.conf.d
+      - source: system/usr/sbin
+        destination: /usr/sbin
+      - source: system/rpms
+        destination: /usr/share/local-rpm-repo
 
   - type: containerfile
     containerfiles:
@@ -164,8 +169,10 @@ modules:
   # copy rest of customizations
   - type: files
     files:
-      - usr: /usr
-      - etc: /etc
+      - source: system/usr
+        destination: /usr
+      - source: system/etc
+        destination: /etc
 
   - type: systemd
     system: