diff --git a/Containerfile b/Containerfile
index 437ca54..6e95902 100644
--- a/Containerfile
+++ b/Containerfile
@@ -14,4 +14,11 @@ RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
     --mount=type=tmpfs,dst=/tmp \
     /ctx/build.sh
 
+RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
+    --mount=type=bind,from=nvidia,source=/,target=/nvidia \
+    --mount=type=cache,dst=/var/cache \
+    --mount=type=cache,dst=/var/log \
+    --mount=type=tmpfs,dst=/tmp \
+    /ctx/nvidia.sh
+
 RUN bootc container lint
diff --git a/build_files/build.sh b/build_files/build.sh
index d4b4d58..1246eb0 100755
--- a/build_files/build.sh
+++ b/build_files/build.sh
@@ -21,20 +21,3 @@ curl -fsSLo /etc/yum.repos.d/vscode.repo https://packages.microsoft.com/yumrepos
 rpm-ostree install code
 rm /etc/yum.repos.d/vscode.repo
 
-dnf5 install -y https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
-                https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
-dnf5 install -y --allowerasing ffmpeg x265-libs
-
-# https://rpmfusion.org/Howto/NVIDIA
-# https://www.tecmint.com/install-nvidia-drivers-in-linux
-# https://github.com/ublue-os/akmods
-# https://github.com/Comprehensive-Wall28/Nvidia-Fedora-Guide
-# following ublue-os nvidia installation
-dnf5 install -y xorg-x11-drv-nvidia-cuda # xorg-x11-drv-nvidia
-
-dnf5 install -y \
-    /nvidia/rpms/ublue-os/ublue-os-nvidia*.rpm \
-    /nvidia/rpms/kmods/kmod-nvidia*.rpm \
-
-dnf5 remove  -y rpmfusion-free-release rpmfusion-nonfree-release
-dnf5 clean all
diff --git a/build_files/nvidia.sh b/build_files/nvidia.sh
new file mode 100755
index 0000000..d4eea17
--- /dev/null
+++ b/build_files/nvidia.sh
@@ -0,0 +1,13 @@
+rpm-ostree install -y rpmdevtools akmods
+rpm-ostree install -y https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
+                      https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+rpm-ostree install -y ffmpeg x265-libs
+
+# https://rpmfusion.org/Howto/NVIDIA
+# https://www.tecmint.com/install-nvidia-drivers-in-linux
+# https://github.com/ublue-os/akmods
+# https://github.com/Comprehensive-Wall28/Nvidia-Fedora-Guide
+# following Nvidia-Fedora-Guide installation
+rpm-ostree install -y akmod-nvidia xorg-x11-drv-nvidia-cuda # xorg-x11-drv-nvidia
+
+dnf5 clean all
\ No newline at end of file