diff --git a/Containerfile.in b/Containerfile.in
index 5b39cc5b..9ee2b001 100644
--- a/Containerfile.in
+++ b/Containerfile.in
@@ -104,8 +104,8 @@ RUN --mount=type=tmpfs,dst=/boot \
     /ctx/build_files/shared/build.sh && \
     /ctx/build_files/base/01-packages.sh && \
     /ctx/build_files/base/02-install-common-kernel-akmods.sh && \
-    /ctx/build_files/base/nvidia.sh && \
-    /ctx/build_files/base/03-fetch.sh
+    /ctx/build_files/base/03-fetch.sh && \
+    /ctx/build_files/base/04-nvidia.sh
 #endif
 
 # /* aurora-nvidia-open:stable with ZFS */
@@ -123,9 +123,9 @@ RUN --mount=type=tmpfs,dst=/boot \
     /ctx/build_files/shared/build.sh && \
     /ctx/build_files/base/01-packages.sh && \
     /ctx/build_files/base/02-install-common-kernel-akmods.sh && \
-    /ctx/build_files/base/nvidia.sh && \
-    /ctx/build_files/base/zfs.sh && \
-    /ctx/build_files/base/03-fetch.sh
+    /ctx/build_files/base/03-fetch.sh && \
+    /ctx/build_files/base/04-nvidia.sh && \
+    /ctx/build_files/base/zfs.sh
 #endif
 
 # /* Everything that can be done offline after things are in place should be done here */
diff --git a/build_files/base/nvidia.sh b/build_files/base/04-nvidia.sh
similarity index 86%
rename from build_files/base/nvidia.sh
rename to build_files/base/04-nvidia.sh
index d1f958e5..28dae8ed 100755
--- a/build_files/base/nvidia.sh
+++ b/build_files/base/04-nvidia.sh
@@ -14,4 +14,7 @@ tee /usr/lib/bootc/kargs.d/00-nvidia.toml <<EOF
 kargs = ["rd.driver.blacklist=nouveau", "modprobe.blacklist=nouveau", "nvidia-drm.modeset=1", "initcall_blacklist=simpledrm_platform_driver_init"]
 EOF
 
+rsync -rvKl /ctx/system_files/nvidia/ /
+systemctl enable ublue-nvidia-flatpak-runtime-sync.service
+
 echo "::endgroup::"