diff --git a/bot/build.sh b/bot/build.sh
index 458abaeebd..7eb15f319d 100755
--- a/bot/build.sh
+++ b/bot/build.sh
@@ -176,6 +176,11 @@ mkdir -p ${TARBALL_TMP_BUILD_STEP_DIR}
 declare -a BUILD_STEP_ARGS=()
 BUILD_STEP_ARGS+=("--save" "${TARBALL_TMP_BUILD_STEP_DIR}")
 BUILD_STEP_ARGS+=("--storage" "${STORAGE}")
+# add options required to handle NVIDIA support
+BUILD_STEP_ARGS+=("--nvidia" "all")
+if [[ ! -z ${SHARED_FS_PATH} ]]; then
+    BUILD_STEP_ARGS+=("--host-injections" "${SHARED_FS_PATH}/host-injections")
+fi
 
 # prepare arguments to install_software_layer.sh (specific to build step)
 declare -a INSTALL_SCRIPT_ARGS=()
diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml
new file mode 100644
index 0000000000..f8bde420de
--- /dev/null
+++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.8.2-2023a.yml
@@ -0,0 +1,9 @@
+easyconfigs:
+  - CUDA-Samples-12.1-GCC-12.3.0-CUDA-12.1.1.eb:
+      # use easyconfig that only install subset of CUDA samples,
+      # to circumvent problem with nvcc linking to glibc of host OS,
+      # see https://github.com/easybuilders/easybuild-easyconfigs/pull/19189;
+      # and where additional samples are excluded because they fail to build on aarch64,
+      # see https://github.com/easybuilders/easybuild-easyconfigs/pull/19451;
+      options:
+        from-pr: 19451