diff --git a/mpsd-software.py b/mpsd-software.py
index 70e487d244825e7deda893332b1398ba502d4541..9da9960bc1d8d89578db65b1c9fad10349f976ec 100755
--- a/mpsd-software.py
+++ b/mpsd-software.py
@@ -1004,7 +1004,15 @@ def remove_environment(mpsd_release, root_dir, package_sets="NONE", force_remove
             folders_to_remove.remove("logs")
             for folder in folders_to_remove:
                 shutil.rmtree(root_dir / mpsd_release / folder)
-
+                sys.exit(0)
+    for package_set in package_sets:
+        # we load the spack environment and remove the package_set
+        spack_env = ''
+        commands_to_execute = [
+            f"source {spack_env}",
+            f"spack env remove -y {package_set}",
+        ]
+        run(" && ".join(commands_to_execute), shell=True, check=True)
 
 def start_new_environment(release, from_release, target_dir):
     """Start new MPSD software environment version."""