diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
index 43d43fc..0c4e7e4 100644
--- a/.github/workflows/base.yml
+++ b/.github/workflows/base.yml
@@ -7,7 +7,7 @@ name: base
 
 on:
   schedule:
-    - cron: '0 5 * * *'  # 4 am every day
+    - cron: '0 4 * * *'  # 4 am every day
   push:
     paths:
         - 'base.Dockerfile'
diff --git a/.github/workflows/kernel-akmods.yml b/.github/workflows/kernel-akmods.yml
index dbe5b65..17a904b 100644
--- a/.github/workflows/kernel-akmods.yml
+++ b/.github/workflows/kernel-akmods.yml
@@ -7,7 +7,7 @@ name: kernel-akmods
 
 on:
   schedule:
-    - cron: '0 4 * * *'  # 4 am every day
+    - cron: '0 5 * * *'  # 5 am every day
   push:
     paths:
         - 'kernel-akmods.Dockerfile'
diff --git a/Dockerfile b/Dockerfile
index 07f6a27..cc24fef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${SOURCE_IMAGE}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
 
 
-FROM ghcr.io/andersrh/my-ostree-os-base2:main-38 AS builder
+FROM ghcr.io/andersrh/my-ostree-os-kernel-akmods:main-38 AS builder
 
 ARG IMAGE_NAME="${IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
diff --git a/base.Dockerfile b/base.Dockerfile
index d2f31ab..ca11b25 100644
--- a/base.Dockerfile
+++ b/base.Dockerfile
@@ -3,7 +3,8 @@ ARG SOURCE_IMAGE="${SOURCE_IMAGE:-kinoite}"
 ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${SOURCE_IMAGE}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
  
-FROM ghcr.io/andersrh/my-ostree-os-kernel-akmods:main-38 AS builder
+
+FROM quay.io/fedora-ostree-desktops/kinoite:38 AS builder
 
 ARG CACHEBUST=2
 
@@ -11,12 +12,12 @@ ARG IMAGE_NAME="${IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 
 
+# install RPM-fusion
+RUN rpm-ostree install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+
 # 32-bit dependencies for the Nvidia driver.
-#RUN rpm-ostree install glibc.i686 mesa-dri-drivers.i686 mesa-filesystem.i686 mesa-libEGL.i686 mesa-libGL.i686 mesa-libgbm.i686 mesa-libglapi.i686 mesa-vulkan-drivers.i686
+RUN rpm-ostree install glibc.i686 mesa-dri-drivers.i686 mesa-filesystem.i686 mesa-libEGL.i686 mesa-libGL.i686 mesa-libgbm.i686 mesa-libglapi.i686 mesa-vulkan-drivers.i686
 # install nonfree codecs
 RUN rpm-ostree override remove libavcodec-free libavfilter-free libavformat-free libavutil-free libpostproc-free libswresample-free libswscale-free mesa-va-drivers --install libavcodec-freeworld
 RUN mv /etc/yum.repos.d/rpmfusion-free.repo /tmp/rpmfusion-free.repo && rpm-ostree install mesa-va-drivers-freeworld && mv /tmp/rpmfusion-free.repo /etc/yum.repos.d/rpmfusion-free.repo
 RUN rpm-ostree install ffmpeg ffmpeg-libs intel-media-driver pipewire-codec-aptx libva-intel-driver libva-utils
-
-# install Nvidia software
-RUN rpm-ostree install nvidia-vaapi-driver nvidia-persistenced opencl-filesystem
diff --git a/kernel-akmods.Dockerfile b/kernel-akmods.Dockerfile
index f1fd1ef..868c9e9 100644
--- a/kernel-akmods.Dockerfile
+++ b/kernel-akmods.Dockerfile
@@ -22,14 +22,11 @@ RUN dnf -y install akmod-nvidia akmod-VirtualBox
 COPY akmods.sh /tmp/akmods.sh
 RUN /tmp/akmods.sh
 
-FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS builder
+FROM ghcr.io/andersrh/my-ostree-os-base2:main-38 AS builder
 
 ARG IMAGE_NAME="${IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 
-# install RPM-fusion
-RUN rpm-ostree install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
-
 COPY --from=ghcr.io/ublue-os/akmods-nvidia:38-535 /rpms /tmp/akmods-rpms
 
 RUN rpm-ostree install \
@@ -79,3 +76,6 @@ RUN rpm-ostree uninstall xorg-x11-drv-nvidia-power
 RUN semodule --verbose --install /usr/share/selinux/packages/nvidia-container.pp
 RUN ln -s /usr/bin/ld.bfd /etc/alternatives/ld
 RUN ln -s /etc/alternatives/ld /usr/bin/ld
+
+# install Nvidia software
+RUN rpm-ostree install nvidia-vaapi-driver nvidia-persistenced opencl-filesystem