diff --git a/eessi_container.sh b/eessi_container.sh
index 2d0238cb5d..49c46e096c 100755
--- a/eessi_container.sh
+++ b/eessi_container.sh
@@ -463,16 +463,16 @@ if [[ ${SETUP_NVIDIA} -eq 1 ]]; then
         mkdir -p ${EESSI_USR_LOCAL_CUDA}
         BIND_PATHS="${BIND_PATHS},${EESSI_VAR_LOG}:/var/log,${EESSI_USR_LOCAL_CUDA}:/usr/local/cuda"
         [[ ${VERBOSE} -eq 1 ]] && echo "BIND_PATHS=${BIND_PATHS}"
-        if [[ "${NVIDIA_MODE}" == "install" ]] ; then
-            # No GPU so we need to "trick" Lmod to allow us to load CUDA modules even without a CUDA driver
-            # (this variable means EESSI_OVERRIDE_GPU_CHECK=1 will be set inside the container)
-            export SINGULARITYENV_EESSI_OVERRIDE_GPU_CHECK=1
-            # We need to "trick" our LMOD_RC file to allow us to load CUDA modules even without a CUDA driver
-            # (this works because we build within a container and the LMOD_RC recognises that)
-            touch ${EESSI_TMPDIR}/libcuda.so
-            export SINGULARITY_CONTAINLIBS="${EESSI_TMPDIR}/libcuda.so"
-            echo "Applied hacks to trick Lmod to allow us to load CUDA modules"
-        fi
+        #if [[ "${NVIDIA_MODE}" == "install" ]] ; then
+        #    # No GPU so we need to "trick" Lmod to allow us to load CUDA modules even without a CUDA driver
+        #    # (this variable means EESSI_OVERRIDE_GPU_CHECK=1 will be set inside the container)
+        #    export SINGULARITYENV_EESSI_OVERRIDE_GPU_CHECK=1
+        #    # We need to "trick" our LMOD_RC file to allow us to load CUDA modules even without a CUDA driver
+        #    # (this works because we build within a container and the LMOD_RC recognises that)
+        #    touch ${EESSI_TMPDIR}/libcuda.so
+        #    export SINGULARITY_CONTAINLIBS="${EESSI_TMPDIR}/libcuda.so"
+        #    echo "Applied hacks to trick Lmod to allow us to load CUDA modules"
+        #fi
     fi
 fi