diff --git a/install-mpsd-software-environment.py b/install-mpsd-software-environment.py
index 597110e77d3b6fe79d93b3f4f575a13119860b65..e7a3d15a09faaf05f12f03cc7be2391118735ffb 100755
--- a/install-mpsd-software-environment.py
+++ b/install-mpsd-software-environment.py
@@ -146,6 +146,8 @@ def install_environment(mpsd_release, toolchains, script_dir, force_reinstall=Fa
     # run the prepare_environment function
     available_toolchains = prepare_environment(mpsd_release, script_dir)
     # Ensure that the requested toolchains are available in the release
+    if toolchains == "ALL":
+        toolchains = available_toolchains
     for toolchain in toolchains:
         if toolchain not in available_toolchains:
             raise Exception(f"Toolchain {toolchain} is not available in release {mpsd_release}.")
@@ -232,7 +234,7 @@ def main():
     elif args.action == "start-new":
         start_new_environment(args.from_release, args.to_release, script_dir)
     elif args.action == "install":
-        install_environment(args.release, args.toolchains, script_dir, False, args.skip_build_cache)
+        install_environment(args.release, args.toolchains, script_dir, False, args.enable_build_cache)
     elif args.action == "prepare":
         prepare_environment(args.release, script_dir)