diff --git a/Containerfile b/Containerfile
index a6dd3d5..a5c219a 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,16 +1,14 @@
 FROM scratch AS ctx
 COPY build_files /
 
-FROM ghcr.io/ublue-os/akmods-nvidia-open:main-43 AS nvidia-kernel
-FROM ghcr.io/bazzite-org/nvidia-drivers:latest-f43-x86_64 AS nvidia-packages
+FROM ghcr.io/ublue-os/akmods-nvidia:main-43 AS nvidia
 
-FROM quay.io/fedora/fedora-bootc:43
+FROM ghcr.io/ublue-os/base-main:43
 
 RUN rm -r /opt && mkdir /opt
 
 RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
-    --mount=type=bind,from=nvidia-kernel,source=/,target=/nvidia-kernel \
-    --mount=type=bind,from=nvidia-packages,src=/,dst=/nvidia-packages \
+    --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 \
diff --git a/build_files/build.sh b/build_files/build.sh
index 7c171aa..4732dea 100755
--- a/build_files/build.sh
+++ b/build_files/build.sh
@@ -28,15 +28,13 @@ 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/ublue-os/bazzite
 # https://github.com/Comprehensive-Wall28/Nvidia-Fedora-Guide
-# this is a combination of bazzite & ublue-os nvidia installation
-# there is probably a better way to do it, but this works (I hope)
-dnf install -y \
-    /nvidia-kernel/rpms/ublue-os/ublue-os-nvidia*.rpm \
-    /nvidia-kernel/rpms/kmods/kmod-nvidia*.rpm \
-    /nvidia-packages/nvidia-kmod-common-* \
-    /nvidia-packages/nvidia-modprobe-5*
+# 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