diff --git a/Containerfile b/Containerfile
index 14e5855ef24..057e8522734 100644
--- a/Containerfile
+++ b/Containerfile
@@ -10,8 +10,8 @@ FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bluefin
 ARG IMAGE_NAME="${IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 
-COPY etc /etc
 COPY usr /usr
+COPY etc/yum.repos.d/ /etc/yum.repos.d/
 
 COPY --from=cgr.dev/chainguard/cosign:latest /usr/bin/cosign /usr/bin/cosign
 
@@ -24,8 +24,6 @@ ADD build.sh /tmp/build.sh
 
 RUN /tmp/build.sh && \
     pip install --prefix=/usr yafti && \
-    systemctl unmask dconf-update.service && \
-    systemctl enable dconf-update.service && \
     systemctl enable rpm-ostree-countme.service && \
     systemctl enable tailscaled.service && \
     fc-cache -f /usr/share/fonts/ubuntu && \
@@ -51,8 +49,8 @@ ARG IMAGE_NAME="${IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 
 # dx specific files come from the dx directory in this repo
-COPY dx/etc /etc
 COPY dx/usr /usr
+COPY dx/etc/yum.repos.d/ /etc/yum.repos.d/
 COPY workarounds.sh /tmp/workarounds.sh
 
 RUN wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo
@@ -112,7 +110,6 @@ RUN ostree container commit
 # Image for Framework laptops
 FROM bluefin AS bluefin-framework
 
-COPY framework/etc /etc
 COPY framework/usr /usr
 
 RUN rpm-ostree install tlp tlp-rdw stress-ng
diff --git a/dx/etc/dconf/db/local.d/01-ublue-dx b/dx/usr/etc/dconf/db/local.d/01-ublue-dx
similarity index 100%
rename from dx/etc/dconf/db/local.d/01-ublue-dx
rename to dx/usr/etc/dconf/db/local.d/01-ublue-dx
diff --git a/dx/etc/distrobox/distrobox.ini b/dx/usr/etc/distrobox/distrobox.ini
similarity index 100%
rename from dx/etc/distrobox/distrobox.ini
rename to dx/usr/etc/distrobox/distrobox.ini
diff --git a/framework/etc/dconf/db/local.d/01-ublue-framework b/framework/usr/etc/dconf/db/local.d/01-ublue-framework
similarity index 100%
rename from framework/etc/dconf/db/local.d/01-ublue-framework
rename to framework/usr/etc/dconf/db/local.d/01-ublue-framework
diff --git a/framework/etc/systemd/system/fprintd.service b/framework/usr/etc/systemd/system/fprintd.service
similarity index 100%
rename from framework/etc/systemd/system/fprintd.service
rename to framework/usr/etc/systemd/system/fprintd.service
diff --git a/framework/etc/tlp.d/50-framework.conf b/framework/usr/etc/tlp.d/50-framework.conf
similarity index 100%
rename from framework/etc/tlp.d/50-framework.conf
rename to framework/usr/etc/tlp.d/50-framework.conf
diff --git a/etc/dconf/db/gdm.d/01-ublue b/usr/etc/dconf/db/gdm.d/01-ublue
similarity index 100%
rename from etc/dconf/db/gdm.d/01-ublue
rename to usr/etc/dconf/db/gdm.d/01-ublue
diff --git a/etc/dconf/db/local.d/01-ublue b/usr/etc/dconf/db/local.d/01-ublue
similarity index 100%
rename from etc/dconf/db/local.d/01-ublue
rename to usr/etc/dconf/db/local.d/01-ublue
diff --git a/etc/dconf/profile/gdm b/usr/etc/dconf/profile/gdm
similarity index 100%
rename from etc/dconf/profile/gdm
rename to usr/etc/dconf/profile/gdm
diff --git a/etc/dconf/profile/user b/usr/etc/dconf/profile/user
similarity index 100%
rename from etc/dconf/profile/user
rename to usr/etc/dconf/profile/user
diff --git a/etc/distrobox/distrobox.conf b/usr/etc/distrobox/distrobox.conf
similarity index 100%
rename from etc/distrobox/distrobox.conf
rename to usr/etc/distrobox/distrobox.conf
diff --git a/etc/distrobox/distrobox.ini b/usr/etc/distrobox/distrobox.ini
similarity index 100%
rename from etc/distrobox/distrobox.ini
rename to usr/etc/distrobox/distrobox.ini
diff --git a/etc/environment b/usr/etc/environment
similarity index 100%
rename from etc/environment
rename to usr/etc/environment
diff --git a/etc/profile.d/bluefin-firstboot.sh b/usr/etc/profile.d/bluefin-firstboot.sh
similarity index 100%
rename from etc/profile.d/bluefin-firstboot.sh
rename to usr/etc/profile.d/bluefin-firstboot.sh
diff --git a/etc/profile.d/nix-app-icons.sh b/usr/etc/profile.d/nix-app-icons.sh
similarity index 100%
rename from etc/profile.d/nix-app-icons.sh
rename to usr/etc/profile.d/nix-app-icons.sh
diff --git a/etc/skel.d/.config/autostart/bluefin-firstboot.desktop b/usr/etc/skel.d/.config/autostart/bluefin-firstboot.desktop
similarity index 100%
rename from etc/skel.d/.config/autostart/bluefin-firstboot.desktop
rename to usr/etc/skel.d/.config/autostart/bluefin-firstboot.desktop
diff --git a/etc/systemd/system/dconf-update.service b/usr/etc/systemd/system/dconf-update.service
similarity index 100%
rename from etc/systemd/system/dconf-update.service
rename to usr/etc/systemd/system/dconf-update.service
diff --git a/etc/yafti.yml b/usr/etc/yafti.yml
similarity index 100%
rename from etc/yafti.yml
rename to usr/etc/yafti.yml
diff --git a/usr/lib/systemd/system-preset/95-dconf-update.preset b/usr/lib/systemd/system-preset/95-dconf-update.preset
new file mode 100644
index 00000000000..1cdf8efb25e
--- /dev/null
+++ b/usr/lib/systemd/system-preset/95-dconf-update.preset
@@ -0,0 +1 @@
+enable dconf-update.service
\ No newline at end of file