diff --git a/.forgejo/workflows/build-image.yaml b/.forgejo/workflows/build-image.yaml
index ffa1f38..b6b253e 100644
--- a/.forgejo/workflows/build-image.yaml
+++ b/.forgejo/workflows/build-image.yaml
@@ -1,6 +1,6 @@
 on: [push]
 jobs:
-  build-image:
+  build-images:
     runs-on: shell
     steps:
       - uses: actions/checkout@v4
@@ -8,5 +8,7 @@ jobs:
       - run:  podman login -u ${{ vars.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} ${{ vars.REGISTRY_DOMAIN }}
       - run:  podman build . -f Dockerfile.kde --no-cache --pull=always --squash -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41
       - run:  podman push --compression-format=zstd:chunked --compression-level=1 ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41 ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41
+      - run: podman build . -f Dockerfile.kde-nvidia --no-cache --pull=always --squash -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41-nvidia
+      - run: podman push --compression-format=zstd:chunked --compression-level=1 ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41-nvidia ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41-nvidia
       - if: '!cancelled()'
         run: podman image rm -f ${{ vars.REGISTRY_DOMAIN }}/${{ vars.MAIN_IMAGE }}:41 && podman image prune -f
diff --git a/Dockerfile.kde-nvidia b/Dockerfile.kde-nvidia
new file mode 100644
index 0000000..00162b8
--- /dev/null
+++ b/Dockerfile.kde-nvidia
@@ -0,0 +1,30 @@
+FROM quay.io/fedora-ostree-desktops/kinoite:41
+
+# Remove firefox
+RUN rpm-ostree override remove firefox firefox-langpacks
+
+# Add rpmfusion repositories
+RUN rpm-ostree install 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
+
+# Install ffmpeg (removing all the -free replacements is required)
+RUN rpm-ostree override remove libavcodec-free libavfilter-free libpostproc-free libswresample-free libswscale-free libavutil-free libavformat-free ffmpeg-free libavdevice-free --install=ffmpeg
+
+# Bulk of layered packages
+RUN rpm-ostree install virt-manager vim neovim bat btop pv restic zstd
+
+RUN systemctl enable libvirtd
+
+# Set vim as default editor
+RUN rpm-ostree override remove nano-default-editor --install vim-default-editor
+
+# Remove default color prompt (is replaced with a custom one)
+RUN rpm-ostree override remove bash-color-prompt
+
+# Install nvidia drivers
+RUN rpm-ostree install akmod-nvidia xorg-x11-drv-nvidia-cuda
+
+# Remove rpm metadata cache
+RUN rpm-ostree cleanup --repomd
+
+# https://github.com/ostreedev/ostree-rs-ext/issues/159
+RUN ostree container commit