diff --git a/init/modules/EESSI/2023.06.lua b/init/modules/EESSI/2023.06.lua
index 348699c0f1..eb1cd1753b 100644
--- a/init/modules/EESSI/2023.06.lua
+++ b/init/modules/EESSI/2023.06.lua
@@ -12,6 +12,13 @@ whatis("URL: https://www.eessi.io/docs/")
 conflict("EESSI")
 local eessi_version = myModuleVersion()
 local eessi_repo = "/cvmfs/software.eessi.io"
+if (subprocess("uname -m"):gsub("\n$","") == "riscv64") then
+    eessi_version = os.getenv("EESSI_VERSION_OVERRIDE") or "20240402"
+    eessi_repo = "/cvmfs/riscv.eessi.io"
+    LmodMessage("RISC-V architecture detected, but there is no RISC-V support yet in the production repository.\n" ..
+                "Automatically switching to version " .. eessi_version .. " of the RISC-V development repository " .. eessi_repo .. ".\n" ..
+                "For more details about this repository, see https://www.eessi.io/docs/repositories/riscv.eessi.io/.")
+end
 local eessi_prefix = pathJoin(eessi_repo, "versions", eessi_version)
 local eessi_os_type = "linux"
 setenv("EESSI_VERSION", eessi_version)
diff --git a/init/modules/EESSI/20240402.lua b/init/modules/EESSI/20240402.lua
new file mode 120000
index 0000000000..cbf80d1fcd
--- /dev/null
+++ b/init/modules/EESSI/20240402.lua
@@ -0,0 +1 @@
+2023.06.lua
\ No newline at end of file