diff --git a/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec b/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec
index 1df4be25c6..0a515f0dea 100644
--- a/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec
+++ b/anda/lib/nvidia/cuda-cccl/cuda-cccl.spec
@@ -6,7 +6,7 @@
 Name:           %(echo %real_name | tr '_' '-')
 Epoch:          1
 Version:        13.0.85
-Release:        1%?dist
+Release:        3%{?dist}
 Summary:        CXX Core Compute Libraries
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec b/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec
index bf4f03ec45..906e48d04f 100644
--- a/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec
+++ b/anda/lib/nvidia/cuda-cudart/cuda-cudart.spec
@@ -8,8 +8,8 @@
 
 Name:           %(echo %real_name | tr '_' '-')
 Epoch:          1
-Version:        13.0.96
-Release:        1%?dist
+Version:        13.0.88
+Release:        1%{?dist}
 Summary:        CUDA Runtime API library
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec b/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec
index 811ae53e2a..693e2b16e2 100644
--- a/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec
+++ b/anda/lib/nvidia/cuda-cudnn/cuda-cudnn.spec
@@ -5,8 +5,8 @@
 %global         cuda_version 12
 
 Name:           cuda-cudnn
-Version:        9.15.0.57
-Release:        1%?dist
+Version:        9.7.1.26
+Release:        1%{?dist}
 Epoch:          1
 Summary:        NVIDIA CUDA Deep Neural Network library (cuDNN)
 License:        NVIDIA Software Development Kit
diff --git a/anda/lib/nvidia/cuda-culibos/cuda-culibos.spec b/anda/lib/nvidia/cuda-culibos/cuda-culibos.spec
index e42f87d8ac..fdf75c6cdd 100644
--- a/anda/lib/nvidia/cuda-culibos/cuda-culibos.spec
+++ b/anda/lib/nvidia/cuda-culibos/cuda-culibos.spec
@@ -9,7 +9,7 @@
 Name:           %(echo %real_name | tr '_' '-')-devel
 Epoch:          1
 Version:        13.0.85
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        CUDA Culibos Math development library
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec b/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec
index 81fe136756..eb8e797f54 100644
--- a/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec
+++ b/anda/lib/nvidia/cuda-cuobjdump/cuda-cuobjdump.spec
@@ -9,7 +9,7 @@
 Name:           %(echo %real_name | tr '_' '-')
 Epoch:          1
 Version:        13.0.85
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        Utility to extract information from CUDA binary files
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec b/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec
index dfdd70a498..a62ac6afaa 100644
--- a/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec
+++ b/anda/lib/nvidia/cuda-cupti/cuda-cupti.spec
@@ -9,7 +9,7 @@
 Name:           %(echo %real_name | tr '_' '-')
 Epoch:          1
 Version:        13.0.85
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        NVIDIA CUDA Profiling Tools Interface (CUPTI) library
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
@@ -78,4 +78,3 @@ cp -fr lib/* %{buildroot}%{_libdir}/
 
 %changelog
 %autochangelog
-
diff --git a/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec b/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec
index 3614b12b75..a66ca87992 100644
--- a/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec
+++ b/anda/lib/nvidia/cuda-cuxxfilt/cuda-cuxxfilt.spec
@@ -9,7 +9,7 @@
 Name:           %(echo %real_name | tr '_' '-')
 Epoch:          1
 Version:        13.0.85
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        CUDA cuxxfilt (demangler)
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec b/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec
index 0ff77482de..905c95bafe 100644
--- a/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec
+++ b/anda/lib/nvidia/cuda-gdb/cuda-gdb.spec
@@ -8,7 +8,7 @@
 Name:           %(echo %real_name | tr '_' '-')
 Epoch:          1
 Version:        13.0.85
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        CUDA GDB
 License:        GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL
 URL:            https://developer.nvidia.com/cuda-toolkit
@@ -17,6 +17,7 @@ ExclusiveArch:  x86_64 aarch64
 Source0:        https://developer.download.nvidia.com/compute/cuda/redist/%{real_name}/linux-x86_64/%{real_name}-linux-x86_64-%{version}-archive.tar.xz
 Source1:        https://developer.download.nvidia.com/compute/cuda/redist/%{real_name}/linux-sbsa/%{real_name}-linux-sbsa-%{version}-archive.tar.xz
 
+BuildRequires:  chrpath
 Requires:       gdb
 Conflicts:      %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -36,12 +37,14 @@ simulation and emulation environments.
 %setup -q -T -b 1 -n %{real_name}-linux-sbsa-%{version}-archive
 %endif
 
+chrpath -d bin/cuda-gdb-minimal
+
 %install
 mkdir -p %{buildroot}%{_datadir}/%{name}
 mkdir -p %{buildroot}%{_includedir}
 mkdir -p %{buildroot}%{_libdir}
 
-install -p -m 0755 -D bin/cuda-gdb %{buildroot}%{_bindir}/cuda-gdb
+install -p -m 0755 -D bin/cuda-gdb-minimal %{buildroot}%{_bindir}/cuda-gdb
 install -p -m 0755 -D bin/cuda-gdbserver %{buildroot}%{_bindir}/cuda-gdbserver
 cp -f extras/Debugger/include/* %{buildroot}%{_includedir}/
 
diff --git a/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec b/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec
index 0d5af2350d..3d435bffc1 100644
--- a/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec
+++ b/anda/lib/nvidia/cuda-nvdisasm/cuda-nvdisasm.spec
@@ -9,7 +9,7 @@
 Name:           %(echo %real_name | tr '_' '-')
 Epoch:          1
 Version:        13.0.85
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        Utility to extract information from CUDA binary files
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
@@ -46,4 +46,3 @@ install -m 0755 -p -D bin/nvdisasm %{buildroot}%{_bindir}/nvdisasm
 
 %changelog
 %autochangelog
-
diff --git a/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec b/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec
index 2580ba138d..ade5cc518e 100644
--- a/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec
+++ b/anda/lib/nvidia/cuda-nvml/cuda-nvml.spec
@@ -9,7 +9,7 @@
 Name:           cuda-nvml
 Epoch:          1
 Version:        13.0.87
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        NVIDIA Management library (NVML)
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec b/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec
index b6b7ebed9f..b84d2430bb 100644
--- a/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec
+++ b/anda/lib/nvidia/cuda-nvprune/cuda-nvprune.spec
@@ -9,7 +9,7 @@
 Name:           %(echo %real_name | tr '_' '-')
 Epoch:          1
 Version:        13.0.85
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        CUDA nvprune
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec b/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec
index 37e0fc90cb..13eac12786 100644
--- a/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec
+++ b/anda/lib/nvidia/cuda-nvrtc/cuda-nvrtc.spec
@@ -9,7 +9,7 @@
 Name:           %(echo %real_name | tr '_' '-')
 Epoch:          1
 Version:        13.0.88
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        CUDA runtime compilation library (NVRTC)
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec b/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec
index 4c3cc748ab..8d281a423a 100644
--- a/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec
+++ b/anda/lib/nvidia/cuda-nvtx/cuda-nvtx.spec
@@ -9,7 +9,7 @@
 Name:           %(echo %real_name | tr '_' '-')
 Epoch:          1
 Version:        13.0.85
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        NVIDIA Tools Extension (NVTX) library
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
@@ -65,8 +65,7 @@ sed -i \
 %{_libdir}/libnvtx3interop.so.*
 
 %files devel
-%dir %{_includedir}/nvtx3/
-%{_includedir}/nvtx3/*
+%{_includedir}/nvtx3/
 %{_libdir}/libnvtx3interop.so
 %{_libdir}/pkgconfig/nvToolsExt.pc
 
diff --git a/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec b/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec
index cec0727dad..d5742579f6 100644
--- a/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec
+++ b/anda/lib/nvidia/cuda-sandbox/cuda-sandbox.spec
@@ -9,7 +9,7 @@
 Name:           cuda-sandbox
 Epoch:          1
 Version:        13.0.85
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        CUDA nvsandboxutils
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
@@ -48,7 +48,7 @@ This package provides development files for the CUDA nvsandboxutils library.
 mkdir -p %{buildroot}%{_includedir}
 
 cp -fr include/* %{buildroot}%{_includedir}/
-install -p -m 0644 -D lib*/stubs/libnvidia-sandboxutils_loader.a %{buildroot}%{_libdir}/libnvidia-sandboxutils_loader.a
+install -p -m 0644 -D lib/stubs/libnvidia-sandboxutils_loader.a %{buildroot}%{_libdir}/libnvidia-sandboxutils_loader.a
 
 %files devel
 %license LICENSE
diff --git a/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec b/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec
index 7a590a0c35..d5af0164d4 100644
--- a/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec
+++ b/anda/lib/nvidia/cuda-sanitizer/cuda-sanitizer.spec
@@ -9,7 +9,7 @@
 Name:           cuda-sanitizer
 Epoch:          1
 Version:        13.0.85
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        CUDA Compute Sanitizer API
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/cuda/cuda.csh b/anda/lib/nvidia/cuda/cuda.csh
deleted file mode 100644
index 551814a37a..0000000000
--- a/anda/lib/nvidia/cuda/cuda.csh
+++ /dev/null
@@ -1,10 +0,0 @@
-if ( -x /usr/bin/cuda-g++ ) then
-  setenv HOST_COMPILER /usr/bin/cuda-g++
-endif
-
-if ( -d /usr/include/cuda ) then
-  setenv CUDA_INCLUDE_DIRS /usr/include
-  setenv CUDA_INC_PATH /usr/include
-endif
-
-setenv CUDA_ROOT /usr
diff --git a/anda/lib/nvidia/cuda/cuda.sh b/anda/lib/nvidia/cuda/cuda.sh
deleted file mode 100644
index 89c10dc361..0000000000
--- a/anda/lib/nvidia/cuda/cuda.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ -x /usr/bin/cuda-g++ ]; then
-  export HOST_COMPILER=/usr/bin/cuda-g++
-fi
-
-if [ -d /usr/include/cuda ]; then
-  export CUDA_INCLUDE_DIRS=/usr/include
-  export CUDA_INC_PATH=/usr/include
-fi
-
-export CUDA_ROOT=/usr
diff --git a/anda/lib/nvidia/cuda/cuda.spec b/anda/lib/nvidia/cuda/cuda.spec
index 2c494635a0..de256c33c7 100644
--- a/anda/lib/nvidia/cuda/cuda.spec
+++ b/anda/lib/nvidia/cuda/cuda.spec
@@ -3,7 +3,7 @@
 
 Name:           cuda
 Version:        13.0.85
-Release:        1%?dist
+Release:        5%{?dist}
 Summary:        NVIDIA Compute Unified Device Architecture Toolkit
 Epoch:          1
 License:        CUDA Toolkit
@@ -14,8 +14,6 @@ ExclusiveArch:  x86_64 aarch64
 # it's really the same package.
 Source0:        https://developer.download.nvidia.com/compute/cuda/redist/cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-%{version}-archive.tar.xz
 
-Source3:        %{name}.sh
-Source4:        %{name}.csh
 Source21:       cuda.pc
 
 Requires:       %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -35,9 +33,6 @@ Requires:       %{name}-devel%{?_isa}
 Requires:       %{name}-gdb%{?_isa}
 Requires:       %{name}-memcheck%{?_isa}
 Requires:       %{name}-nvdisasm%{?_isa}
-%ifnarch aarch64
-Requires:       %{name}-nvprof%{?_isa}
-%endif
 Requires:       %{name}-nvtx%{?_isa}
 Requires:       %{name}-sanitizer%{?_isa}
 Requires:       expat >= 1.95
@@ -58,6 +53,7 @@ Requires:       libcurand%{?_isa}
 Requires:       libcusolver%{?_isa}
 Requires:       libcusparse%{?_isa}
 Requires:       libnpp%{?_isa}
+Requires:       libnvjitlink%{?_isa}
 Requires:       libnvjpeg%{?_isa}
 Conflicts:      %{name}-driver-devel-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release}
 Conflicts:      %{name}-libraries-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -84,13 +80,13 @@ Requires:       %{name}-cccl-devel%{?_isa}
 Requires:       %{name}-cudart-devel%{?_isa}
 Requires:       %{name}-cupti-devel%{?_isa}
 Requires:       %{name}-nvcc%{?_isa}
-Requires:       %{name}-nvprof-devel%{?_isa}
 Requires:       %{name}-nvprune%{?_isa}
 Requires:       %{name}-nvml-devel%{?_isa}
 Requires:       %{name}-nvrtc-devel%{?_isa}
 Requires:       %{name}-nvtx-devel%{?_isa}
 Requires:       %{name}-cuobjdump%{?_isa}
 Requires:       %{name}-cuxxfilt-devel%{?_isa}
+Requires:       %{name}-profiler-devel%{?_isa}
 Requires:       %{name}-sandbox-devel%{?_isa}
 Requires:       libcublas-devel%{?_isa}
 Requires:       libcufft-devel%{?_isa}
@@ -99,6 +95,7 @@ Requires:       libcurand-devel%{?_isa}
 Requires:       libcusolver-devel%{?_isa}
 Requires:       libcusparse-devel%{?_isa}
 Requires:       libnpp-devel%{?_isa}
+Requires:       libnvjitlink-devel%{?_isa}
 Requires:       libnvjpeg-devel%{?_isa}
 Conflicts:      %{name}-headers-%{major_package_version} < %{?epoch:%{epoch}:}%{version}
 Conflicts:      %{name}-libraries-dev-%{major_package_version} < %{?epoch:%{epoch}:}%{version}
@@ -117,25 +114,19 @@ This package provides the development files of the %{name} package.
 
 %install
 mkdir -p %{buildroot}%{_libdir}/pkgconfig/
-mkdir -p %{buildroot}%{_sysconfdir}/profile.d/
-
-# Environment settings
-install -pm 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d
 
 # pkg-config files
 install -pm 644 %{SOURCE21} %{buildroot}/%{_libdir}/pkgconfig
-
-# Set proper variables
 sed -i \
     -e 's|CUDA_VERSION|%{version}|g' \
+    -e 's|PREFIX|%{_prefix}|g' \
     -e 's|LIBDIR|%{_libdir}|g' \
-    -e 's|INCLUDE_DIR|%{_includedir}/cuda|g' \
-    %{buildroot}/%{_libdir}/pkgconfig/*.pc
+    -e 's|INCLUDE_DIR|%{_includedir}|g' \
+    %{buildroot}%{_libdir}/pkgconfig/*.pc
 
 %files
 %license LICENSE
 %doc CUDA_Toolkit_Release_Notes.txt DOCS EULA.txt README tools
-%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
 
 %files cli-tools
 # Empty metapackage
diff --git a/anda/lib/nvidia/libcublas/libcublas.spec b/anda/lib/nvidia/libcublas/libcublas.spec
index cfb95ff6bd..df5516f57d 100644
--- a/anda/lib/nvidia/libcublas/libcublas.spec
+++ b/anda/lib/nvidia/libcublas/libcublas.spec
@@ -6,8 +6,8 @@
 
 Name:           libcublas
 Epoch:          1
-Version:        13.1.0.3
-Release:        1%?dist
+Version:        13.0.2.14
+Release:        1%{?dist}
 Summary:        NVIDIA CUDA Basic Linear Algebra Subroutines (cuBLAS) libraries
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/libcufft/libcufft.spec b/anda/lib/nvidia/libcufft/libcufft.spec
index 3c22aac096..51aaceb7d6 100644
--- a/anda/lib/nvidia/libcufft/libcufft.spec
+++ b/anda/lib/nvidia/libcufft/libcufft.spec
@@ -7,7 +7,7 @@
 Name:           libcufft
 Epoch:          2
 Version:        12.0.0.61
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        NVIDIA CUDA Fast Fourier Transform library (cuFFT) libraries
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
@@ -94,7 +94,6 @@ sed -i \
 
 %files static
 %{_libdir}/libcufft_static.a
-%dnl %{_libdir}/libcufft_static_nocallback.a
 %{_libdir}/libcufftw_static.a
 
 %changelog
diff --git a/anda/lib/nvidia/libcufile/libcufile.spec b/anda/lib/nvidia/libcufile/libcufile.spec
index eaa06781b3..92e7f737dd 100644
--- a/anda/lib/nvidia/libcufile/libcufile.spec
+++ b/anda/lib/nvidia/libcufile/libcufile.spec
@@ -7,7 +7,7 @@
 Name:           libcufile
 Epoch:          1
 Version:        1.15.1.6
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        NVIDIA GPUDirect Storage library (cuFile)
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
@@ -100,9 +100,7 @@ sed -i \
 %{_libdir}/libcufile_rdma.so
 %{_libdir}/libcufile.so
 %{_libdir}/pkgconfig/cufile.pc
-%{_mandir}/man3/CUfile*.3*
-%{_mandir}/man3/cufileRDMAInfo.3*
-%{_mandir}/man3/cufile.h.3*
+%{_mandir}/man3/*
 
 %files static
 %{_libdir}/libcufile_rdma_static.a
diff --git a/anda/lib/nvidia/libcusolver/libcusolver.spec b/anda/lib/nvidia/libcusolver/libcusolver.spec
index 04e5c4524c..fa623ff04e 100644
--- a/anda/lib/nvidia/libcusolver/libcusolver.spec
+++ b/anda/lib/nvidia/libcusolver/libcusolver.spec
@@ -7,7 +7,7 @@
 Name:           libcusolver
 Epoch:          2
 Version:        12.0.4.66
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        NVIDIA cuSOLVER library
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/libcusparse/libcusparse.spec b/anda/lib/nvidia/libcusparse/libcusparse.spec
index 2002a6c128..faeb692e5e 100644
--- a/anda/lib/nvidia/libcusparse/libcusparse.spec
+++ b/anda/lib/nvidia/libcusparse/libcusparse.spec
@@ -7,7 +7,7 @@
 Name:           libcusparse
 Epoch:          1
 Version:        12.6.3.3
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        NVIDIA CUDA Sparse Matrix library (cuSPARSE) library
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/libcusparselt/libcusparselt.spec b/anda/lib/nvidia/libcusparselt/libcusparselt.spec
index c75359afc9..9299ef5866 100644
--- a/anda/lib/nvidia/libcusparselt/libcusparselt.spec
+++ b/anda/lib/nvidia/libcusparselt/libcusparselt.spec
@@ -2,17 +2,18 @@
 %global         __strip /bin/true
 %global         _missing_build_ids_terminate_build 0
 %global         _build_id_links none
+%global         cuda_version 13
 
 Name:           libcusparselt
 Version:        0.8.1.1
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        CUDA Library for Sparse Matrix-Matrix Multiplication
 License:        NVIDIA License
 URL:            https://docs.nvidia.com/cuda/cusparselt/index.html
 ExclusiveArch:  x86_64 aarch64
 
-Source0:        https://developer.download.nvidia.com/compute/cusparselt/redist/libcusparse_lt/linux-x86_64/libcusparse_lt-linux-x86_64-%{version}-archive.tar.xz
-Source1:        https://developer.download.nvidia.com/compute/cusparselt/redist/libcusparse_lt/linux-sbsa/libcusparse_lt-linux-sbsa-%{version}-archive.tar.xz
+Source0:        https://developer.download.nvidia.com/compute/cusparselt/redist/libcusparse_lt/linux-x86_64/libcusparse_lt-linux-x86_64-%{version}_cuda%{cuda_version}-archive.tar.xz
+Source1:        https://developer.download.nvidia.com/compute/cusparselt/redist/libcusparse_lt/linux-sbsa/libcusparse_lt-linux-sbsa-%{version}_cuda%{cuda_version}-archive.tar.xz
 
 Conflicts:      %{name}0 < %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -43,11 +44,11 @@ Static libraries for cuSPARSELt.
 
 %prep
 %ifarch x86_64
-%setup -q -n libcusparse_lt-linux-x86_64-%{version}-archive
+%setup -q -n libcusparse_lt-linux-x86_64-%{version}_cuda%{cuda_version}-archive
 %endif
 
 %ifarch aarch64
-%setup -q -T -b 1 -n libcusparse_lt-linux-sbsa-%{version}-archive
+%setup -q -T -b 1 -n libcusparse_lt-linux-sbsa-%{version}_cuda%{cuda_version}-archive
 %endif
 
 %build
diff --git a/anda/lib/nvidia/libnpp/libnpp.spec b/anda/lib/nvidia/libnpp/libnpp.spec
index 1ab24c02ec..83db17ec53 100644
--- a/anda/lib/nvidia/libnpp/libnpp.spec
+++ b/anda/lib/nvidia/libnpp/libnpp.spec
@@ -7,7 +7,7 @@
 Name:           libnpp
 Epoch:          1
 Version:        13.0.1.2
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        NVIDIA Performance Primitives libraries
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec b/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec
index a671d9e213..4773213556 100644
--- a/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec
+++ b/anda/lib/nvidia/libnvfatbin/libnvfatbin.spec
@@ -7,7 +7,7 @@
 Name:           libnvfatbin
 Epoch:          1
 Version:        13.0.85
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        CUDA Fatbin Creator API
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec b/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec
index 91138561fa..6c38d04485 100644
--- a/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec
+++ b/anda/lib/nvidia/libnvjitlink/libnvjitlink.spec
@@ -7,7 +7,7 @@
 Name:           libnvjitlink
 Epoch:          1
 Version:        13.0.88
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        NVIDIA compiler library for JIT LTO functionality
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec b/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec
index f5d8956ee7..3fb6c0cac5 100644
--- a/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec
+++ b/anda/lib/nvidia/libnvjpeg/libnvjpeg.spec
@@ -7,7 +7,7 @@
 Name:           libnvjpeg
 Epoch:          1
 Version:        13.0.1.86
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        CUDA NVIDIA JPEG decoder (nvJPEG)
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/libnvjpeg2k/libnvjpeg2k.spec b/anda/lib/nvidia/libnvjpeg2k/libnvjpeg2k.spec
index c7498d2059..fd37bc7dc0 100644
--- a/anda/lib/nvidia/libnvjpeg2k/libnvjpeg2k.spec
+++ b/anda/lib/nvidia/libnvjpeg2k/libnvjpeg2k.spec
@@ -4,7 +4,7 @@
 
 Name:           libnvjpeg2k
 Version:        0.9.0.43
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        NVIDIA JPEG 2K decoder (nvJPEG2000)
 License:        NVIDIA EULA
 URL:            https://developer.nvidia.com/nvjpeg
@@ -54,6 +54,7 @@ This package contains static libraries for NVIDIA JPEG 2K decoder (nvJPEG2000).
 %endif
 
 %build
+# Nothing to build
 
 %install
 mkdir -p %{buildroot}/%{_libdir}/pkgconfig/
diff --git a/anda/lib/nvidia/libnvptxcompiler-devel/libnvptxcompiler-devel.spec b/anda/lib/nvidia/libnvptxcompiler-devel/libnvptxcompiler-devel.spec
index b0a6106f57..c4ffa36edf 100644
--- a/anda/lib/nvidia/libnvptxcompiler-devel/libnvptxcompiler-devel.spec
+++ b/anda/lib/nvidia/libnvptxcompiler-devel/libnvptxcompiler-devel.spec
@@ -9,7 +9,7 @@
 Name:           %{real_name}-devel
 Epoch:          1
 Version:        13.0.88
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        CUDA nvptxcompiler
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/lib/nvidia/libnvvm/libnvvm.spec b/anda/lib/nvidia/libnvvm/libnvvm.spec
index 975af1f2c6..fdb31504bc 100644
--- a/anda/lib/nvidia/libnvvm/libnvvm.spec
+++ b/anda/lib/nvidia/libnvvm/libnvvm.spec
@@ -7,7 +7,6 @@
 %global major_package_version 13-0
 
 Name:           %(echo %real_name | tr '_' '-')
-Epoch:          1
 Version:        13.0.88
 Release:        2%{?dist}
 Summary:        CUDA NVVM
@@ -21,7 +20,11 @@ Source1:        https://developer.download.nvidia.com/compute/cuda/redist/%{real
 Conflicts:      %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release}
  
 %description
-LLVM IR for CUDA applications.
+NVVM IR is a compiler IR (intermediate representation) based on the LLVM IR.
+The NVVM IR is designed to represent GPU compute kernels (for example, CUDA
+kernels). High-level language front-ends, like the CUDA C compiler front-end,
+can generate NVVM IR. The NVVM compiler (which is based on LLVM) generates PTX
+code from NVVM IR.
 
 %package devel
 Summary:        Development package for %{name}
@@ -44,6 +47,8 @@ Files for development with %{name} and LLVM IR bytecode.
 install -p -m 0755 -D nvvm/bin/cicc %{buildroot}%{_bindir}/cicc
 install -p -m 0644 -D nvvm/include/nvvm.h %{buildroot}%{_includedir}/nvvm.h
 install -p -m 0644 -D nvvm/libdevice/libdevice.10.bc %{buildroot}%{_datadir}/libdevice/libdevice.10.bc
+# CMake expects the nvvm/libdevice in the same prefix as bin/cicc:
+ln -sf share %{buildroot}%{_prefix}/nvvm
 
 mkdir -p %{buildroot}%{_libdir}
 cp -fr nvvm/lib64/* %{buildroot}%{_libdir}/
@@ -57,6 +62,7 @@ cp -fr nvvm/lib64/* %{buildroot}%{_libdir}/
 %{_datadir}/libdevice
 %{_includedir}/nvvm.h
 %{_libdir}/libnvvm.so
+%{_prefix}/nvvm
 
 %changelog
 %autochangelog
diff --git a/anda/tools/nvidia/cuda-crt/cuda-crt.spec b/anda/tools/nvidia/cuda-crt/cuda-crt.spec
index ed8079937b..c8705c4a57 100644
--- a/anda/tools/nvidia/cuda-crt/cuda-crt.spec
+++ b/anda/tools/nvidia/cuda-crt/cuda-crt.spec
@@ -9,7 +9,7 @@
 Name:           %(echo %real_name | tr '_' '-')
 Epoch:          1
 Version:        13.0.88
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        CUDA crt
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/tools/nvidia/cuda-ctadvisor/cuda-ctadvisor.spec b/anda/tools/nvidia/cuda-ctadvisor/cuda-ctadvisor.spec
index b31ea63c19..2377f0257c 100644
--- a/anda/tools/nvidia/cuda-ctadvisor/cuda-ctadvisor.spec
+++ b/anda/tools/nvidia/cuda-ctadvisor/cuda-ctadvisor.spec
@@ -9,7 +9,7 @@
 Name:           %(echo %real_name | tr '_' '-')
 Epoch:          1
 Version:        13.0.85
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        CUDA ctadvisor
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
diff --git a/anda/tools/nvidia/cuda-nvcc/cuda-nvcc.spec b/anda/tools/nvidia/cuda-nvcc/cuda-nvcc.spec
index 6d104313b1..d59e2112f1 100644
--- a/anda/tools/nvidia/cuda-nvcc/cuda-nvcc.spec
+++ b/anda/tools/nvidia/cuda-nvcc/cuda-nvcc.spec
@@ -9,7 +9,7 @@
 Name:           %(echo %real_name | tr '_' '-')
 Epoch:          1
 Version:        13.0.88
-Release:        1%?dist
+Release:        4%{?dist}
 Summary:        CUDA Compiler (NVCC)
 License:        CUDA Toolkit
 URL:            https://developer.nvidia.com/cuda-toolkit
@@ -21,16 +21,17 @@ Source3:        nvcc.profile
 
 Conflicts:      %{name}-%{major_package_version} < %{?epoch:%{epoch}:}%{version}-%{release}
 
-# CUDA 12.8 does not support GCC 15+:
-%if 0%{?fedora} >= 42
+# CUDA 13.0 does not support GCC 16+:
+%if 0%{?fedora} >= 44
 Requires:       cuda-gcc
 %else
-# CUDA 12.8 supports GCC 14:
+# But it supports GCC 14, so obsolete the wrapper in case of an upgrade:
 Obsoletes:      cuda-gcc
 Provides:       cuda-gcc
 %endif
 
 Requires:       cuda-crt
+Requires:       cuda-cudart-devel
 Requires:       libnvptxcompiler-devel
 Requires:       libnvvm-devel
 
@@ -44,12 +45,6 @@ the compilation process. All non-CUDA compilation steps are forwarded to a C++
 host compiler that is supported by nvcc, and nvcc translates its options to
 appropriate host compiler command line options.
 
-NVVM IR is a compiler IR (intermediate representation) based on the LLVM IR.
-The NVVM IR is designed to represent GPU compute kernels (for example, CUDA
-kernels). High-level language front-ends, like the CUDA C compiler front-end,
-can generate NVVM IR. The NVVM compiler (which is based on LLVM) generates PTX
-code from NVVM IR.
-
 %prep
 %ifarch x86_64
 %setup -q -n %{real_name}-linux-x86_64-%{version}-archive
@@ -70,8 +65,10 @@ cp -f %{SOURCE3} %{buildroot}%{_bindir}/
 
 # Set proper variables
 sed -i \
+    -e 's|PREFIX|%{_prefix}|g' \
+    -e 's|BINDIR|%{_bindir}|g' \
     -e 's|LIBDIR|%{_libdir}|g' \
-    -e 's|INCLUDE_DIR|%{_includedir}/cuda|g' \
+    -e 's|INCLUDE_DIR|%{_includedir}|g' \
     %{buildroot}/%{_bindir}/nvcc.profile
 
 %files
diff --git a/anda/tools/nvidia/cuda-nvcc/nvcc.profile b/anda/tools/nvidia/cuda-nvcc/nvcc.profile
index fe2654e168..b3ca6ade5d 100644
--- a/anda/tools/nvidia/cuda-nvcc/nvcc.profile
+++ b/anda/tools/nvidia/cuda-nvcc/nvcc.profile
@@ -1,6 +1,6 @@
-NVVMIR_LIBRARY_DIR = /usr/share/libdevice
-PATH += /usr/libexec/cuda/open64/bin:
-INCLUDES += "-IINCLUDE_DIR"
+CICC_PATH = BINDIR
+NVVMIR_LIBRARY_DIR = PREFIX/nvvm/libdevice
+INCLUDES += "-IINCLUDE_DIR/cccl"
 LIBRARIES =+ "-LLIBDIR"
 CUDAFE_FLAGS +=
 PTXAS_FLAGS +=