diff --git a/almalinux-nvidia.repo b/almalinux-nvidia.repo
index 84eb042..75e4ff2 100644
--- a/almalinux-nvidia.repo
+++ b/almalinux-nvidia.repo
@@ -1,20 +1,20 @@
-# NVIDIA driver repo for AlmaLinux
+# NVIDIA driver & CUDA repo for AlmaLinux
 
 [almalinux-nvidia]
-name=AlmaLinux $releasever - NVIDIA Driver
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nvidia
-# baseurl=https://repo.almalinux.org/$releasever/nvidia/$basearch/os/
+name=AlmaLinux $releasever - NVIDIA Driver & CUDA
+# mirrorlist=
+baseurl=https://nvidia.repo.almalinux.org/$releasever/$basearch/
 gpgcheck=1
 enabled=1
 countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-$releasever
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-$releasever,https://developer.download.nvidia.com/compute/cuda/repos/rhel$releasever/$basearch/$gpgkey
 metadata_expire=6h
 
 ## Sources
 [almalinux-nvidia-source]
 name=AlmaLinux $releasever - NVIDIA Driver Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nvidia-source
-# baseurl=https://vault.almalinux.org/$releasever/nvidia/Source/
+# mirrorlist=
+baseurl=https://vault.almalinux.org/almalinux-nvidia/$releasever/Source/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-$releasever
@@ -23,8 +23,8 @@ metadata_expire=6h
 ## Debug
 [almalinux-nvidia-debuginfo]
 name=AlmaLinux $releasever - NVIDIA Driver debuginfo
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nvidia-debug
-# baseurl=https://vault.almalinux.org/$releasever/nvidia/debug/$basearch/
+# mirrorlist=
+baseurl=https://vault.almalinux.org/almalinux-nvidia/$releasever/debug/$basearch/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-$releasever
diff --git a/almalinux-release-nvidia-driver.spec b/almalinux-release-nvidia-driver.spec
index 6d5435b..b38ac98 100644
--- a/almalinux-release-nvidia-driver.spec
+++ b/almalinux-release-nvidia-driver.spec
@@ -1,12 +1,11 @@
 Name:		almalinux-release-nvidia-driver
-Summary:	AlmaLinux NVIDIA driver repository configuration
+Summary:	AlmaLinux NVIDIA driver & CUDA repository configuration
 Version:	%{?rhel}
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPL-2.0-only
 URL:		https://almalinux.org/
-ExclusiveArch:  x86_64 %{x86_64} %{arm64}
+ExclusiveArch:  x86_64 %{arm64}
 Source0:	almalinux-nvidia.repo
-Source1:	nvidia-cuda.repo
 
 Requires:       epel-release
 Requires(post): epel-release
@@ -19,24 +18,15 @@ DNF configuration for AlmaLinux NVIDIA driver repository
 
 
 %prep
-%ifarch x86_64_v2
-sed -i "s/\$basearch/x86_64_v2/g" %{SOURCE0}
-sed -i '/^mirrorlist=/ s|$|?arch=x86_64_v2|g' %{SOURCE0}
-%endif
-%ifarch aarch64
-sed -i "s/\$basearch/sbsa/g" %{SOURCE1}
-%endif
-
 %if %{?rhel} == 9
-sed -i "s/\$gpgkey/D42D0685.pub/g" %{SOURCE1}
+sed -i "s/\$gpgkey/D42D0685.pub/g" %{SOURCE0}
 %endif
 %if %{?rhel} == 10
-sed -i "s/\$gpgkey/CDF6BA43.pub/g" %{SOURCE1}
+sed -i "s/\$gpgkey/CDF6BA43.pub/g" %{SOURCE0}
 %endif
 
 %install
 install -D -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/almalinux-nvidia.repo
-install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/nvidia-cuda.repo
 
 
 %post
@@ -47,10 +37,13 @@ fi
 
 %files
 %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-nvidia.repo
-%{_sysconfdir}/yum.repos.d/nvidia-cuda.repo
 
 
 %changelog
+* Thu Feb 26 2026 Jonathan Wright <jonathan@almalinux.org> - %{?rhel}-4
+- Update mirror URLs/names to AlmaLinux-hosted CUDA repo
+- Remove x86_64_v2 code/macros
+
 * Wed Aug 06 2025 Jonathan Wright <jonathan@almalinux.org> - %{?rhel}-3
 - Update mirror URLs/names
 
diff --git a/nvidia-cuda.repo b/nvidia-cuda.repo
deleted file mode 100644
index 11832f1..0000000
--- a/nvidia-cuda.repo
+++ /dev/null
@@ -1,14 +0,0 @@
-# This repository is for NVIDIA user space and CUDA components which cannot be redistributed due to licensing restrictions.
-# This content is served directly by NVIDIA.
-
-# Do not modify this file, it will be overwritten/replaced on updates.
-
-[cuda-rhel$releasever-$basearch]
-name=cuda-rhel$releasever-$basearch
-baseurl=https://developer.download.nvidia.com/compute/cuda/repos/rhel$releasever/$basearch
-enabled=1
-gpgcheck=1
-countme=1
-gpgkey=https://developer.download.nvidia.com/compute/cuda/repos/rhel$releasever/$basearch/$gpgkey
-
-exclude=akmod-nvidia dkms-nvidia kmod-nvidia-*-dkms nvidia-fs* nvidia-gds* cuda-drivers