diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index c6140499..db282058 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -107,7 +107,7 @@ jobs:
           g_job="testintegrationworkflow${GITHUB_JOB//-/}"
           pilotUUID="${g_job//_/}""$(shuf -i 2000-65000 -n 1)"
           pilotUUID=$(echo $pilotUUID | rev | cut -c 1-32 | rev)
-          python dirac-pilot.py -M 1 -S DIRAC-Certification -N jenkins.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --preinstalledEnvPrefix=/cvmfs/dirac.egi.eu/dirac --wnVO=dteam --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --pilotUUID="${pilotUUID}" --debug
+          python dirac-pilot.py -M 1 -S DIRAC-Certification -N jenkins.cern.ch -Q jenkins-queue_not_important -n DIRAC.Jenkins.ch --architectureScript=dirac-platform --preinstalledEnvPrefix=/cvmfs/dirac.egi.eu/dirac --wnVO=dteam --cert --certLocation=${GITHUB_WORKSPACE}/Pilot/etc/grid-security --pilotUUID="${pilotUUID}" --debug
 
 
   integration-cvmfs_no_env_CEs:
diff --git a/Pilot/pilotTools.py b/Pilot/pilotTools.py
index 9aa23d06..b8be477c 100644
--- a/Pilot/pilotTools.py
+++ b/Pilot/pilotTools.py
@@ -986,6 +986,7 @@ def __init__(self):
             ("", "pilotUUID=", "pilot UUID"),
             ("", "preinstalledEnv=", "preinstalled pilot environment script location"),
             ("", "preinstalledEnvPrefix=", "preinstalled pilot environment area prefix"),
+            ("", "architectureScript=", "architecture scipt to use"),
             ("", "CVMFS_locations=", "comma-separated list of CVMS locations"),
         )
 
@@ -1160,6 +1161,8 @@ def __initCommandLine2(self):
                 self.preinstalledEnv = v
             elif o == "--preinstalledEnvPrefix":
                 self.preinstalledEnvPrefix = v
+            elif o == "--architectureScript":
+                self.architectureScript = v
             elif o == "--CVMFS_locations":
                 self.CVMFS_locations = v.split(",")
 
diff --git a/tests/CI/pilot_newSchema.json b/tests/CI/pilot_newSchema.json
index 50acbf25..7282615c 100644
--- a/tests/CI/pilot_newSchema.json
+++ b/tests/CI/pilot_newSchema.json
@@ -90,8 +90,8 @@
 				"TEST": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements",
 				"TEST-MP": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements",
 				"TEST-FULL": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements, LaunchAgent",
-				"LHCb": "CheckWorkerNode, LHCbInstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, LHCbConfigureSite, LHCbConfigureArchitecture, LHCbConfigureCPURequirements",
-				"LHCbD": "CheckWorkerNode, InstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, LHCbConfigureSite, LHCbConfigureArchitecture, LHCbConfigureCPURequirements",
+				"LHCb": "CheckWorkerNode, LHCbInstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, ConfigureSite, LHCbConfigureArchitecture, ConfigureCPURequirements",
+				"LHCbD": "CheckWorkerNode, InstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, ConfigureSite, LHCbConfigureArchitecture, ConfigureCPURequirements",
 				"LHCbDD": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, ConfigureSite, LHCbConfigureArchitecture, ConfigureCPURequirements"
 		    }
 		}
diff --git a/tests/CI/pilot_oldSchema.json b/tests/CI/pilot_oldSchema.json
index 57b6a683..bd05b450 100644
--- a/tests/CI/pilot_oldSchema.json
+++ b/tests/CI/pilot_oldSchema.json
@@ -45,9 +45,9 @@
           "CheckCECapabilities",
           "LHCbAddCVMFSTags",
           "CheckWNCapabilities",
-          "LHCbConfigureSite",
+          "ConfigureSite",
           "LHCbConfigureArchitecture",
-          "LHCbConfigureCPURequirements"
+          "ConfigureCPURequirements"
         ],
         "LHCbD": [
           "CheckWorkerNode",
@@ -57,9 +57,9 @@
           "CheckCECapabilities",
           "LHCbAddCVMFSTags",
           "CheckWNCapabilities",
-          "LHCbConfigureSite",
+          "ConfigureSite",
           "LHCbConfigureArchitecture",
-          "LHCbConfigureCPURequirements"
+          "ConfigureCPURequirements"
         ],
         "LHCbDD": [
           "CheckWorkerNode",