diff --git a/Pilot/pilotCommands.py b/Pilot/pilotCommands.py
index ffec4c34..a84fd9fb 100644
--- a/Pilot/pilotCommands.py
+++ b/Pilot/pilotCommands.py
@@ -324,7 +324,7 @@ def _getPreinstalledEnvScript(self):
             for CVMFS_location in self.pp.CVMFS_locations:
                 version = self.pp.releaseVersion or "pro"
                 arch = platform.system() + "-" + platform.machine()
-                preinstalledEnvScript = os.path.join(CVMFS_location, self.releaseProject.lower() + "dirac", version, arch, "diracosrc")
+                preinstalledEnvScript = os.path.join(CVMFS_location, self.pp.releaseProject.lower() + "dirac", version, arch, "diracosrc")
                 if os.path.isfile(preinstalledEnvScript):
                     break
 
diff --git a/Pilot/pilotTools.py b/Pilot/pilotTools.py
index 6f9a0f30..08916781 100644
--- a/Pilot/pilotTools.py
+++ b/Pilot/pilotTools.py
@@ -930,6 +930,7 @@ def __init__(self):
             ("", "pilotUUID=", "pilot UUID"),
             ("", "preinstalledEnv=", "preinstalled pilot environment script location"),
             ("", "preinstalledEnvPrefix=", "preinstalled pilot environment area prefix"),
+            ("", "CVMFS_locations=", "comma-separated list of CVMS locations"),
         )
 
         # Possibly get Setup and JSON URL/filename from command line
@@ -1112,6 +1113,8 @@ def __initCommandLine2(self):
                 self.preinstalledEnv = v
             elif o == "--preinstalledEnvPrefix":
                 self.preinstalledEnvPrefix = v
+            elif o == "--CVMFS_locations":
+                self.CVMFS_locations = v.split(",")
 
     def __loadJSON(self):
         """