diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b75e74d..d2aba10 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,4 +29,4 @@ jobs:
           cosign_private_key: ${{ secrets.SIGNING_SECRET }}
           registry_token: ${{ github.token }}
           pr_event_number: ${{ github.event.number }}
-          squash: true
+          squash: false
diff --git a/files/usr/.gitkeep b/files/system/usr/.gitkeep
similarity index 100%
rename from files/usr/.gitkeep
rename to files/system/usr/.gitkeep
diff --git a/files/usr/etc/NetworkManager/conf.d/90-disable-randomization.conf b/files/system/usr/etc/NetworkManager/conf.d/90-disable-randomization.conf
similarity index 100%
rename from files/usr/etc/NetworkManager/conf.d/90-disable-randomization.conf
rename to files/system/usr/etc/NetworkManager/conf.d/90-disable-randomization.conf
diff --git a/files/usr/etc/chrony.conf b/files/system/usr/etc/chrony.conf
similarity index 100%
rename from files/usr/etc/chrony.conf
rename to files/system/usr/etc/chrony.conf
diff --git a/files/usr/etc/sysctl.d/hardening.conf b/files/system/usr/etc/sysctl.d/hardening.conf
similarity index 100%
rename from files/usr/etc/sysctl.d/hardening.conf
rename to files/system/usr/etc/sysctl.d/hardening.conf
diff --git a/files/usr/etc/systemd/resolved.conf b/files/system/usr/etc/systemd/resolved.conf
similarity index 100%
rename from files/usr/etc/systemd/resolved.conf
rename to files/system/usr/etc/systemd/resolved.conf
diff --git a/files/usr/share/ublue-os/just/60-custom.just b/files/system/usr/share/ublue-os/just/60-custom.just
similarity index 100%
rename from files/usr/share/ublue-os/just/60-custom.just
rename to files/system/usr/share/ublue-os/just/60-custom.just
diff --git a/recipes/recipe.yml b/recipes/recipe.yml
index a96b25e..4a1e9e1 100644
--- a/recipes/recipe.yml
+++ b/recipes/recipe.yml
@@ -14,8 +14,9 @@ image-version: 40 # latest is also supported if you want new updates ASAP
 modules:
   - type: files
     files:
-      - source: usr
-        destination: /usr
+      - source: system
+        destination: /
+
   - type: rpm-ostree
     repos:
       - https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-%OS_VERSION%/ublue-os-staging-fedora-%OS_VERSION%.repo
@@ -55,6 +56,7 @@ modules:
       - firefox # default firefox removed in favor of flatpak
       - firefox-langpacks # langpacks needs to also be removed to prevent dependency problems
       - passim
+
   - type: default-flatpaks
     notify: true
     system:
@@ -68,11 +70,13 @@ modules:
         - org.tigervnc.vncviewer
         - org.videolan.VLC
       remove: []
+
   - type: gnome-extensions
     install:
       - space-barluchrioh.v25
       - just-perfection-desktopjust-perfection.v28
       - appindicatorsupportrgcjonas.gmail.com.v58
+
   - type: systemd
     system:
       disabled:
@@ -81,4 +85,5 @@ modules:
       masked:
         - cups
         - ModemManager
+
   - type: signing