diff --git a/EM/relion/modulefile b/EM/relion/modulefile
index 44b6f71..ed09173 100644
--- a/EM/relion/modulefile
+++ b/EM/relion/modulefile
@@ -46,4 +46,22 @@ setenv RELION_PYTHON_EXECUTABLE /opt/psi/EM/relion/5.0-sp/conda_env/5.0-beta/bin
 setenv RELION_TORCH_HOME_PATH /opt/psi/EM/relion/5.0-sp/torch
 # Version-specific variables
 setenv RELION_QSUB_TEMPLATE /opt/psi/EM/relion/$V/scripts/multi_gpu.sh
-setenv RELION_MOTIONCOR2_EXECUTABLE /opt/psi/EM/MotionCor2/1.4.0/bin/MotionCor2
+
+# See MC2 compatibility matrix: https://intranet.psi.ch/en/bio/motioncor2
+if {[string match "8.0*" $env(CUDA_VERSION)]} {
+    setenv RELION_MOTIONCOR2_EXECUTABLE "/opt/psi/EM/MotionCor2/1.3.2/bin/MotionCor2_1.3.2-Cuda80"
+} elseif {[string match "11.0*" $env(CUDA_VERSION)]} {
+    setenv RELION_MOTIONCOR2_EXECUTABLE "/opt/psi/EM/MotionCor2/1.4.0/bin/MotionCor2"
+} else {
+    setenv RELION_MOTIONCOR2_EXECUTABLE "/opt/psi/EM/MotionCor2/1.6.4/bin/MotionCor2"
+}
+
+# relion 5 features
+if {[file exists /opt/psi/EM/relion/$V/conda_env/$V]} {
+    setenv RELION_TOPAZ_EXECUTABLE /opt/psi/EM/relion/$V/conda_env/$V/bin/topaz
+    setenv RELION_PYTHON_EXECUTABLE /opt/psi/EM/relion/$V/conda_env/$V/bin/python
+}
+if {[file exists /opt/psi/EM/relion/$V/torch]} {
+    setenv RELION_TORCH_HOME_PATH /opt/psi/EM/relion/$V/torch
+}
+