diff --git a/mpsd-software-environment.py b/mpsd-software-environment.py
index ed5ea43dca8349ef52e27abac1a260fca999af4b..6a1531e7f05ffc525defcc96d0797448212824b1 100755
--- a/mpsd-software-environment.py
+++ b/mpsd-software-environment.py
@@ -572,8 +572,8 @@ def install_environment(
     # Set required variables
     release_base_dir = script_dir / mpsd_release
     os.environ.get("MPSD_OS", "UNKNOWN_OS")
-    microarch = get_native_microarchitecture()
-    toolchain_dir = release_base_dir / microarch
+    mpsd_microarch = os.environ.get("MPSD_MICROARCH", "UNKNOWN_MICROARCH")
+    toolchain_dir = release_base_dir / mpsd_microarch
     toolchain_dir.mkdir(parents=True, exist_ok=True)
     spack_setup_script = release_base_dir / "spack-environments" / "spack_setup.sh"
     install_flags = []