diff --git a/.github/workflows/tests_eessi_extend_module.yml b/.github/workflows/tests_eessi_extend_module.yml
index de51b650..f7773852 100644
--- a/.github/workflows/tests_eessi_extend_module.yml
+++ b/.github/workflows/tests_eessi_extend_module.yml
@@ -66,7 +66,7 @@ jobs:
           eb --rebuild --hooks=./eb_hooks.py ${{matrix.rebuild_software}}
           
           # First, check if it differs against what is currently shipped by CVMFS
-          diff   <(grep -v '^local root = ' /cvmfs/software.eessi.io/versions/${{matrix.eessi_version}}/software/linux/$(uname -m)/generic/modules/all/EESSI-extend/${{matrix.eessi_version}}-easybuild.lua)   <(grep -v '^local root = ' $MY_INSTALLATION_PATH/modules/all/EESSI-extend/${{matrix.eessi_version}}-easybuild.lua)
+          diff   <(grep -v '^local root = \|^-- Built with EasyBuild version' /cvmfs/software.eessi.io/versions/${{matrix.eessi_version}}/software/linux/$(uname -m)/generic/modules/all/EESSI-extend/${{matrix.eessi_version}}-easybuild.lua)   <(grep -v '^local root = \|^-- Built with EasyBuild version' $MY_INSTALLATION_PATH/modules/all/EESSI-extend/${{matrix.eessi_version}}-easybuild.lua)
           # Then do a consistency check in CVMFS for all architectures
           .github/workflows/scripts/diff_eessi_extend.sh
 
diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh
index 74f7c9d1..4a4a33ff 100755
--- a/EESSI-install-software.sh
+++ b/EESSI-install-software.sh
@@ -325,6 +325,8 @@ echo "DEBUG: after loading EESSI-extend //  EASYBUILD_INSTALLPATH='${EASYBUILD_I
 # Allow skipping CUDA SDK install in e.g. CI environments
 echo "Going to install full CUDA SDK and cu* libraries under host_injections if necessary"
 temp_install_storage=${TMPDIR}/temp_install_storage
+# Make sure that we use the easystack files from the git repository, which has an additional subdirectory ${EESSI_VERSION} at the end
+export NVIDIA_EASYSTACKS_DIRECTORY=${TOPDIR}/scripts/gpu_support/nvidia/easystacks/${EESSI_VERSION}
 mkdir -p ${temp_install_storage}
 if [ -z "${skip_cuda_install}" ] || [ ! "${skip_cuda_install}" ]; then
     ${TOPDIR}/scripts/gpu_support/nvidia/install_cuda_and_libraries.sh \
diff --git a/eb_hooks.py b/eb_hooks.py
index db01ed66..67b031bc 100644
--- a/eb_hooks.py
+++ b/eb_hooks.py
@@ -88,11 +88,11 @@
     )
 
 # Supported compute capabilities by CUDA toolkit version
-# Obtained by installing all CUDAs from 12.0.0 to 13.1.0, then using:
+# Obtained by installing all CUDAs from 12.0.0 to 13.3.0, then using:
 
 # #!/bin/bash
 #
-# CUDA_VERS=(12.0.0 12.1.0 12.1.1 12.2.0 12.2.2 12.3.0 12.3.2 12.4.0 12.5.0 12.6.0 12.8.0 12.9.0 12.9.1 13.0.0 13.0.1 13.0.2 13.1.0)
+# CUDA_VERS=(12.0.0 12.1.0 12.1.1 12.2.0 12.2.2 12.3.0 12.3.2 12.4.0 12.5.0 12.6.0 12.8.0 12.9.0 12.9.1 13.0.0 13.0.1 13.0.2 13.1.0 13.1.1 13.2.0 13.3.0)
 #
 # for ver in ${CUDA_VERS[@]}; do
 #     module load CUDA/${ver}
@@ -120,6 +120,9 @@
     '13.0.1': ['75', '80', '86', '87', '88', '89', '90', '100', '110', '103', '120', '121'],
     '13.0.2': ['75', '80', '86', '87', '88', '89', '90', '100', '110', '103', '120', '121'],
     '13.1.0': ['75', '80', '86', '87', '88', '89', '90', '100', '110', '103', '120', '121'],
+    '13.1.1': ['75', '80', '86', '87', '88', '89', '90', '100', '110', '103', '120', '121'],
+    '13.2.0': ['75', '80', '86', '87', '88', '89', '90', '100', '110', '103', '120', '121'],
+    '13.3.0': ['75', '80', '86', '87', '88', '89', '90', '100', '110', '103', '120', '121'],
 }
 
 # Ensure that we don't print any messages in --terse mode
diff --git a/scripts/gpu_support/nvidia/easystacks/2026.06/eessi-2026.06-eb-5.3.1-CUDA-host-injections.yml b/scripts/gpu_support/nvidia/easystacks/2026.06/eessi-2026.06-eb-5.3.1-CUDA-host-injections.yml
new file mode 100644
index 00000000..0c1f89cc
--- /dev/null
+++ b/scripts/gpu_support/nvidia/easystacks/2026.06/eessi-2026.06-eb-5.3.1-CUDA-host-injections.yml
@@ -0,0 +1,10 @@
+# This EasyStack provides a list of all the EasyConfigs that should be installed in host_injections 
+# for nvidia GPU support, because they cannot (fully) be shipped as part of EESSI due to license constraints
+easyconfigs:
+  - CUDA-13.3.0.eb:
+      options:
+        accept-eula-for: CUDA
+  - cuDNN-9.23.0.39-CUDA-13.3.0.eb:
+      options:
+        accept-eula-for: cuDNN
+        cuda-sanity-check-accept-missing-ptx: True