diff --git a/Pilot/pilotCommands.py b/Pilot/pilotCommands.py
index 14c2e9ff..41070941 100644
--- a/Pilot/pilotCommands.py
+++ b/Pilot/pilotCommands.py
@@ -154,8 +154,6 @@ def __init__(self, pilotParams):
     self.pp.rootPath = self.pp.pilotRootPath
     self.installScriptName = 'dirac-install.py'
     self.installScript = ''
-    # This command is a "must-do", so it's assumed that the variable below is set
-    self.pp.installEnv['DIRACSYSCONFIG'] = 'pilot.cfg'
 
   def _setInstallOptions(self):
     """ Setup installation parameters
@@ -931,6 +929,7 @@ def __setInnerCEOpts(self):
 
     # The file pilot.cfg has to be created previously by ConfigureDIRAC
     if self.pp.localConfigFile:
+      self.innerCEOpts.append(' -o /AgentJobRequirements/ExtraOptions=%s' % self.pp.localConfigFile)
       if LooseVersion(self.pp.releaseVersion) >= self.cfgOptionDIRACVersion:
         self.innerCEOpts.append('--cfg')
       self.innerCEOpts.append(self.pp.localConfigFile)
@@ -1033,6 +1032,7 @@ def __setInProcessOpts(self):
 
     # The file pilot.cfg has to be created previously by ConfigureDIRAC
     if self.pp.localConfigFile:
+      self.inProcessOpts.append(' -o /AgentJobRequirements/ExtraOptions=%s' % self.pp.localConfigFile)
       if LooseVersion(self.pp.releaseVersion) >= self.cfgOptionDIRACVersion:
         self.inProcessOpts.append('--cfg')
       self.inProcessOpts.append(self.pp.localConfigFile)