diff --git a/mpsd-software-environment.py b/mpsd-software-environment.py
index 007d85d8858e49d1e2b8e62b1d71e4de809fa8eb..7e177592b0584afba81563036e474ec695939ec5 100755
--- a/mpsd-software-environment.py
+++ b/mpsd-software-environment.py
@@ -871,7 +871,7 @@ def environment_status(mpsd_release, script_dir):
     )
     for microarch, toolchains in toolchain_map.items():
         plog.info(f"- {microarch}: \n \t {toolchains}")
-
+    return toolchain_map
 
 def main():
     """Execute main entry point."""
@@ -973,7 +973,7 @@ def main():
             args.release, args.toolchains, script_dir, False, args.enable_build_cache
         )
     elif args.action == "status":
-        environment_status(args.release, script_dir)
+        _ = environment_status(args.release, script_dir)
     elif args.action == "prepare":
         prepare_environment(args.release, script_dir)