diff --git a/EESSI-extend-easybuild.eb b/EESSI-extend-easybuild.eb
index 762d5f9356..f74f36aca7 100644
--- a/EESSI-extend-easybuild.eb
+++ b/EESSI-extend-easybuild.eb
@@ -41,7 +41,7 @@ toolchain = SYSTEM
 
 # All the dependencies we filter in EESSI
 local_deps_to_filter = "Autoconf,Automake,Autotools,binutils,bzip2,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,M4,makeinfo,ncurses,util-linux,XZ,zlib"
-local_arch_specific_deps_to_filter = {'aarch64': ',yasm', 'x86_64': '', 'riscv64': ''}
+local_arch_specific_deps_to_filter = {'aarch64': ',Yasm', 'riscv64': ',Yasm', 'x86_64': ''}
 local_deps_to_filter += local_arch_specific_deps_to_filter[ARCH]
 
 # Set the universal EasyBuild variables
diff --git a/bot/build.sh b/bot/build.sh
index 2930ad947b..29444a32c2 100755
--- a/bot/build.sh
+++ b/bot/build.sh
@@ -195,10 +195,9 @@ fi
 
 # Skip CUDA installation for riscv.eessi.io
 if [[ "${REPOSITORY_NAME}" == "riscv.eessi.io" ]]; then
-    echo "bot/build.sh: disabling CUDA installation for RISC-V repository ${REPOSITORY_NAME}"
+    echo "bot/build.sh: disabling CUDA installation for RISC-V repository (${REPOSITORY_NAME})"
     INSTALL_SCRIPT_ARGS+=("--skip-cuda-install")
 fi
-echo "DEBUG: repo: ${REPOSITORY_NAME}, ${INSTALL_SCRIPT_ARGS[@]}"
 
 # determine if the removal step has to be run
 # assume there's only one diff file that corresponds to the PR patch file
diff --git a/bot/test.sh b/bot/test.sh
index 43e94bf158..f0d111571e 100755
--- a/bot/test.sh
+++ b/bot/test.sh
@@ -109,18 +109,18 @@ if [[ -z ${RESUME_DIR} ]]; then
   fi
 fi
 
-  echo -n "setting \$STORAGE by replacing any var in '${LOCAL_TMP}' -> "
-  # replace any env variable in ${LOCAL_TMP} with its
-  #   current value (e.g., a value that is local to the job)
-  STORAGE=$(envsubst <<< ${LOCAL_TMP})
-  echo "'${STORAGE}'"
+echo -n "setting \$STORAGE by replacing any var in '${LOCAL_TMP}' -> "
+# replace any env variable in ${LOCAL_TMP} with its
+#   current value (e.g., a value that is local to the job)
+STORAGE=$(envsubst <<< ${LOCAL_TMP})
+echo "'${STORAGE}'"
 
-  # make sure ${STORAGE} exists
-  mkdir -p ${STORAGE}
+# make sure ${STORAGE} exists
+mkdir -p ${STORAGE}
 
-  # make sure the base tmp storage is unique
-  JOB_STORAGE=$(mktemp --directory --tmpdir=${STORAGE} bot_job_tmp_XXX)
-  echo "bot/test.sh: created unique base tmp storage directory at ${JOB_STORAGE}"
+# make sure the base tmp storage is unique
+JOB_STORAGE=$(mktemp --directory --tmpdir=${STORAGE} bot_job_tmp_XXX)
+echo "bot/test.sh: created unique base tmp storage directory at ${JOB_STORAGE}"
 
 # obtain list of modules to be loaded
 LOAD_MODULES=$(cfg_get_value "site_config" "load_modules")
@@ -130,7 +130,6 @@ echo "bot/test.sh: LOAD_MODULES='${LOAD_MODULES}'"
 CONTAINER=$(cfg_get_value "repository" "container")
 export SINGULARITY_HOME="${PWD}:/eessi_bot_job"
 export SINGULARITY_TMPDIR="${JOB_STORAGE:-${PWD}}/singularity_tmpdir"
-echo "DEBUG: storage: ${STORAGE}, job storage: ${JOB_STORAGE}, tmpdir: ${TMPDIR}, sing tmpdir: ${SINGULARITY_TMPDIR}, resumedir: ${RESUME_DIR}"
 mkdir -p ${SINGULARITY_TMPDIR}
 
 # load modules if LOAD_MODULES is not empty
diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-001-system.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-001-system.yml
index 866766a36b..748ecc8a02 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-001-system.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-001-system.yml
@@ -2,7 +2,7 @@ easyconfigs:
   - EasyBuild-4.9.1.eb:
       options:
         from-pr: 20299
-  - EESSI-extend-2023.06-easybuild.eb
+  - EESSI-extend-easybuild.eb
   - EasyBuild-4.9.2.eb:
       options:
         from-pr: 20818
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml
index 93c4950fc8..2e0030b05a 100644
--- a/easystacks/software.eessi.io/2023.06/rebuilds/20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml
@@ -2,4 +2,4 @@
 # The module is an EasyBuild created module and therefore needs to be an allowed
 # module when running EasyBuild
 easyconfigs:
-  - EESSI-extend-2023.06-easybuild.eb 
+  - EESSI-extend-easybuild.eb
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240925-eb-4.9.4-EESSI-extend.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240925-eb-4.9.4-EESSI-extend.yml
index 9cd1b451cd..5c1eb292e4 100644
--- a/easystacks/software.eessi.io/2023.06/rebuilds/20240925-eb-4.9.4-EESSI-extend.yml
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240925-eb-4.9.4-EESSI-extend.yml
@@ -2,5 +2,5 @@
 # EESSI-extend did not support LMOD_EXACT_MATCH 
 # (see https://github.com/EESSI/software-layer/pull/747)
 easyconfigs:
-  - EESSI-extend-2023.06-easybuild.eb
+  - EESSI-extend-easybuild.eb
 
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20241008-eb-4.9.4-EESSI-extend.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20241008-eb-4.9.4-EESSI-extend.yml
index 5491ef8427..b1f69e3297 100644
--- a/easystacks/software.eessi.io/2023.06/rebuilds/20241008-eb-4.9.4-EESSI-extend.yml
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20241008-eb-4.9.4-EESSI-extend.yml
@@ -1,5 +1,5 @@
 # 2024.10.08
 # EESSI-extend should use EESSI_SITE_INSTALLPATH, instead of recalculating this
 easyconfigs:
-  - EESSI-extend-2023.06-easybuild.eb
+  - EESSI-extend-easybuild.eb
 
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20241112-eb-4.9.4-EESSI-extend.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20241112-eb-4.9.4-EESSI-extend.yml
index e4c658784f..9b2910a83a 100644
--- a/easystacks/software.eessi.io/2023.06/rebuilds/20241112-eb-4.9.4-EESSI-extend.yml
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20241112-eb-4.9.4-EESSI-extend.yml
@@ -3,4 +3,4 @@
 # EESSI-extend should adjust EASYBUILD_INSTALLPATH and set
 # EASYBUILD_CUDA_COMPUTE_CAPABILITIES
 easyconfigs:
-  - EESSI-extend-2023.06-easybuild.eb
+  - EESSI-extend-easybuild.eb
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20241206-eb-4.9.4-EESSI-extend.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20241206-eb-4.9.4-EESSI-extend.yml
new file mode 100644
index 0000000000..04a60f595c
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20241206-eb-4.9.4-EESSI-extend.yml
@@ -0,0 +1,6 @@
+# 2024.12.06
+# - Use $EESSI_VERSION to determine version of EESSI-extend module
+# - Fix the filtered dependencies for aarch64: Yasm instead of yasm
+# - Also add filtered dependencies for RISC-V
+easyconfigs:
+  - EESSI-extend-easybuild.eb
diff --git a/init/lmod/bash b/init/lmod/bash
index 24b81e049f..afc55fe4d5 100644
--- a/init/lmod/bash
+++ b/init/lmod/bash
@@ -1,9 +1,11 @@
+# Choose an EESSI CVMFS repository
+EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO:-/cvmfs/software.eessi.io}"
 # Choose an EESSI version
 EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO:-/cvmfs/software.eessi.io}"
 EESSI_VERSION="${EESSI_VERSION:-2023.06}"
 # Path to top-level module tree
-export MODULEPATH="${EESSI_CVMFS_REPO}/versions/$EESSI_VERSION/init/modules"
-. "${EESSI_CVMFS_REPO}/versions/$EESSI_VERSION/compat/linux/$(uname -m)/usr/share/Lmod/init/bash"
+export MODULEPATH="${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION}/init/modules"
+. "${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION}/compat/linux/$(uname -m)/usr/share/Lmod/init/bash"
 
 if [ -z "$__Init_Default_Modules" ]; then
    export __Init_Default_Modules=1;
diff --git a/init/lmod/csh b/init/lmod/csh
index 8e50d5e5c8..f2e9100255 100644
--- a/init/lmod/csh
+++ b/init/lmod/csh
@@ -1,8 +1,10 @@
+# Choose an EESSI CVMFS repository
+if (! $?EESSI_CVMFS_REPO) then; set EESSI_CVMFS_REPO = "/cvmfs/software.eessi.io"; endif
 # Choose an EESSI version
 if (! $?EESSI_VERSION) then; set EESSI_VERSION = "2023.06"; endif
 # Path to top-level module tree
-setenv MODULEPATH /cvmfs/software.eessi.io/versions/"$EESSI_VERSION"/init/modules
-source /cvmfs/software.eessi.io/versions/"$EESSI_VERSION"/compat/linux/`uname -m`/usr/share/Lmod/init/csh
+setenv MODULEPATH "${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION}/init/modules"
+source "${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION}/compat/linux/$(uname -m)/usr/share/Lmod/init/csh"
 
 if (! $?__Init_Default_Modules ) then
 	setenv __Init_Default_Modules 1;
diff --git a/init/lmod/fish b/init/lmod/fish
index d4252ef32a..46cd7cacf4 100644
--- a/init/lmod/fish
+++ b/init/lmod/fish
@@ -1,8 +1,10 @@
+# Choose an EESSI CVMFS repository
+set EESSI_CVMFS_REPO (set -q EESSI_CVMFS_REPO; and echo "$EESSI_CVMFS_REPO"; or echo "/cvmfs/software.eessi.io")
 # Choose an EESSI version
 set EESSI_VERSION (set -q EESSI_VERSION; and echo "$EESSI_VERSION"; or echo "2023.06")
 # Path to top-level module tree
-set -x MODULEPATH /cvmfs/software.eessi.io/versions/"$EESSI_VERSION"/init/modules
-. /cvmfs/software.eessi.io/versions/"$EESSI_VERSION"/compat/linux/(uname -m)/usr/share/Lmod/init/fish
+set -x MODULEPATH "$EESSI_CVMFS_REPO"/versions/"$EESSI_VERSION"/init/modules
+. "$EESSI_CVMFS_REPO"/versions/"$EESSI_VERSION"/compat/linux/(uname -m)/usr/share/Lmod/init/fish
 
 if test -z "$__Init_Default_Modules"
 	export __Init_Default_Modules=1;
diff --git a/init/lmod/ksh b/init/lmod/ksh
index 71dc29542f..7d9a05d688 100644
--- a/init/lmod/ksh
+++ b/init/lmod/ksh
@@ -1,8 +1,10 @@
+# Choose an EESSI CVMFS repository
+EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO:-/cvmfs/software.eessi.io}"
 # Choose an EESSI version
 EESSI_VERSION="${EESSI_VERSION:-2023.06}"
 # Path to top-level module tree
-export MODULEPATH=/cvmfs/software.eessi.io/versions/"$EESSI_VERSION"/init/modules
-. /cvmfs/software.eessi.io/versions/"$EESSI_VERSION"/compat/linux/$(uname -m)/usr/share/Lmod/init/ksh
+export MODULEPATH="${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION}/init/modules"
+. "${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION}/compat/linux/$(uname -m)/usr/share/Lmod/init/ksh"
 
 if [ -z "$__Init_Default_Modules" ]; then
    export __Init_Default_Modules=1;
diff --git a/init/lmod/zsh b/init/lmod/zsh
index 5f605579c8..bc6e8e4deb 100644
--- a/init/lmod/zsh
+++ b/init/lmod/zsh
@@ -1,8 +1,10 @@
+# Choose an EESSI CVMFS repository
+EESSI_CVMFS_REPO="${EESSI_CVMFS_REPO:-/cvmfs/software.eessi.io}"
 # Choose an EESSI version
 EESSI_VERSION="${EESSI_VERSION:-2023.06}"
 # Path to top-level module tree
-export MODULEPATH=/cvmfs/software.eessi.io/versions/"$EESSI_VERSION"/init/modules
-. /cvmfs/software.eessi.io/versions/"$EESSI_VERSION"/compat/linux/$(uname -m)/usr/share/Lmod/init/zsh
+export MODULEPATH="${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION}/init/modules"
+. "${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION}/compat/linux/$(uname -m)/usr/share/Lmod/init/zsh"
 
 if [ -z "$__Init_Default_Modules" ]; then
    export __Init_Default_Modules=1;