diff --git a/.gitmodules b/.gitmodules
index 3e2cb23..3a8200a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "FFmpeg"]
 	path = FFmpeg
 	url = https://github.com/cgutman/FFmpeg.git
-[submodule "nv-codec-headers"]
-	path = nv-codec-headers
-	url = https://git.videolan.org/git/ffmpeg/nv-codec-headers.git
 [submodule "SDL2"]
 	path = SDL2
 	url = https://github.com/libsdl-org/SDL.git
diff --git a/Dockerfile.amd64.trixie b/Dockerfile.amd64.trixie
index 4cb01d8..44fe56d 100644
--- a/Dockerfile.amd64.trixie
+++ b/Dockerfile.amd64.trixie
@@ -11,7 +11,6 @@ RUN /bin/bash -c /opt/scripts/install-base-deps.sh && \
 
 COPY dav1d /opt/dav1d
 COPY FFmpeg /opt/FFmpeg
-COPY nv-codec-headers /opt/nv-codec-headers
 COPY SDL2 /opt/SDL2
 COPY SDL_ttf /opt/SDL_ttf
 
diff --git a/nv-codec-headers b/nv-codec-headers
deleted file mode 160000
index 625b319..0000000
--- a/nv-codec-headers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 625b3199e94db49e3bb0dc797fc4cffbf7115d81
diff --git a/scripts/build-deps.sh b/scripts/build-deps.sh
index 1cdf755..d3f3bd4 100755
--- a/scripts/build-deps.sh
+++ b/scripts/build-deps.sh
@@ -11,12 +11,8 @@ elif [ "$TARGET" == "l4t" ]; then
     # Enable NVV4L2 decoders (and VP9 decoder to work around compilation error in NVV4L2 fallback code)
     EXTRA_FFMPEG_ARGS="--enable-nvv4l2 --enable-decoder=h264_nvv4l2 --enable-decoder=hevc_nvv4l2 --enable-decoder=vp9"
 elif [ "$TARGET" == "desktop" ]; then
-    # We need to install the NVDEC headers
-    cd /opt/nv-codec-headers
-    make install
-
-    # Enable VAAPI, VDPAU, and NVDEC decoders
-    EXTRA_FFMPEG_ARGS="--enable-nvdec --enable-hwaccel=h264_nvdec --enable-hwaccel=hevc_nvdec --enable-hwaccel=av1_nvdec --enable-hwaccel=h264_vaapi --enable-hwaccel=hevc_vaapi --enable-hwaccel=av1_vaapi --enable-hwaccel=h264_vdpau --enable-hwaccel=hevc_vdpau --enable-hwaccel=av1_vdpau"
+    # Enable VAAPI and VDPAU decoders (TODO: Add Vulkan Video if we ever actually ship this for desktop platforms)
+    EXTRA_FFMPEG_ARGS="--enable-hwaccel=h264_vaapi --enable-hwaccel=hevc_vaapi --enable-hwaccel=av1_vaapi --enable-hwaccel=h264_vdpau --enable-hwaccel=hevc_vdpau --enable-hwaccel=av1_vdpau"
 elif [ "$TARGET" == "embedded" ]; then
     # Enable stateless V4L2 support
     EXTRA_FFMPEG_ARGS="--enable-v4l2-request --enable-hwaccel=h264_v4l2request --enable-hwaccel=hevc_v4l2request"