diff --git a/bin/00_deploy_prod.sh b/bin/00_deploy_prod.sh
index 17c66fcd5..ba581c488 100755
--- a/bin/00_deploy_prod.sh
+++ b/bin/00_deploy_prod.sh
@@ -219,15 +219,15 @@ echo 'config.BossAir.pluginNames = ["SimpleCondorPlugin"]' >> ./config/tier0/con
 ./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Express --pending-slots=3000 --running-slots=3000
 ./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Repack --pending-slots=5000 --running-slots=5000
 
-#Settings for using T2_CH_CERN_HLT (PromptReco)
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --cms-name=T2_CH_CERN_HLT --pnn=T2_CH_CERN_HLT --ce-name=T2_CH_CERN_HLT --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Processing --pending-slots=10000 --running-slots=10000
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Merge --pending-slots=1000 --running-slots=1000
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Cleanup --pending-slots=1000 --running-slots=1000
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=LogCollect --pending-slots=1000 --running-slots=1000
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Skim --pending-slots=1 --running-slots=1
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Production --pending-slots=1 --running-slots=1
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Harvesting --pending-slots=1000 --running-slots=1000
+#Settings for using T2_CH_CERN_P5 (PromptReco)
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --cms-name=T2_CH_CERN_P5 --pnn=T2_CH_CERN_P5 --ce-name=T2_CH_CERN_P5 --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Processing --pending-slots=10000 --running-slots=10000
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Merge --pending-slots=1000 --running-slots=1000
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Cleanup --pending-slots=1000 --running-slots=1000
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=LogCollect --pending-slots=1000 --running-slots=1000
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Skim --pending-slots=1 --running-slots=1
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Production --pending-slots=1 --running-slots=1
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Harvesting --pending-slots=1000 --running-slots=1000
 
 # Thresholds configurations
 echo "config.AgentStatusWatcher.t1SitesCores = 12.5"  >> ./config/tier0/config.py
diff --git a/bin/00_deploy_replay.sh b/bin/00_deploy_replay.sh
index f0c6bb4e6..c071a1551 100755
--- a/bin/00_deploy_replay.sh
+++ b/bin/00_deploy_replay.sh
@@ -211,15 +211,15 @@ echo 'config.BossAir.pluginNames = ["SimpleCondorPlugin"]' >> ./config/tier0/con
 ./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Express --pending-slots=3000 --running-slots=3000
 ./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Repack --pending-slots=5000 --running-slots=5000
 
-#Settings for using T2_CH_CERN_HLT (PromptReco)
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --cms-name=T2_CH_CERN_HLT --pnn=T2_CH_CERN_HLT --ce-name=T2_CH_CERN_HLT --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Processing --pending-slots=10000 --running-slots=10000
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Merge --pending-slots=1000 --running-slots=1000
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Cleanup --pending-slots=1000 --running-slots=1000
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=LogCollect --pending-slots=1000 --running-slots=1000
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Skim --pending-slots=1 --running-slots=1
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Production --pending-slots=1 --running-slots=1
-./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_HLT --task-type=Harvesting --pending-slots=1000 --running-slots=1000
+#Settings for using T2_CH_CERN_P5 (PromptReco)
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --cms-name=T2_CH_CERN_P5 --pnn=T2_CH_CERN_P5 --ce-name=T2_CH_CERN_P5 --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Processing --pending-slots=10000 --running-slots=10000
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Merge --pending-slots=1000 --running-slots=1000
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Cleanup --pending-slots=1000 --running-slots=1000
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=LogCollect --pending-slots=1000 --running-slots=1000
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Skim --pending-slots=1 --running-slots=1
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Production --pending-slots=1 --running-slots=1
+./config/tier0/manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Harvesting --pending-slots=1000 --running-slots=1000
 
 # Thresholds configurations
 echo "config.AgentStatusWatcher.t1SitesCores = 12.5"  >> ./config/tier0/config.py
diff --git a/etc/ProdOfflineConfiguration.py b/etc/ProdOfflineConfiguration.py
index 11106cad8..8752bf30f 100644
--- a/etc/ProdOfflineConfiguration.py
+++ b/etc/ProdOfflineConfiguration.py
@@ -199,7 +199,7 @@
            archival_node="T0_CH_CERN_MSS",
            tape_node="T1_US_FNAL_MSS",
            disk_node="T1_US_FNAL_Disk",
-           siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
+           siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
            raw_to_disk=False,
            aod_to_disk=True,
            blockCloseDelay=24 * 3600,
@@ -544,7 +544,7 @@
 for dataset in DATASETS:
     addDataset(tier0Config, dataset,
                do_reco=True,
-               siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
+               siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
                archival_node=None,
                tape_node="T0_CH_CERN_MSS",
                disk_node="T2_CH_CERN",
@@ -556,7 +556,7 @@
     addDataset(tier0Config, dataset,
                do_reco=True,
                aod_to_disk=False,
-               siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
+               siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
                archival_node=None,
                tape_node="T0_CH_CERN_MSS",
                disk_node="T2_CH_CERN",
@@ -570,7 +570,7 @@
                write_dqm=True,
                dqm_sequences=["@common", "@muon", "@heavyFlavor"],
                alca_producers=["TkAlJpsiMuMu", "TkAlUpsilonMuMu"],
-               siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
+               siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
                archival_node=None,
                tape_node="T0_CH_CERN_MSS",
                disk_node="T2_CH_CERN",
@@ -587,7 +587,7 @@
                aod_to_disk=False,
                dqm_sequences=["@common", "@muon", "@heavyFlavor"],
                alca_producers=["TkAlJpsiMuMu", "TkAlUpsilonMuMu"],
-               siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
+               siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
                archival_node=None,
                tape_node="T0_CH_CERN_MSS",
                disk_node="T2_CH_CERN",
@@ -1059,7 +1059,7 @@
                write_dqm=False,
                write_aod=False,
                archival_node=None,
-               siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
+               siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
                tape_node="T0_CH_CERN_MSS",
                disk_node="T2_CH_CERN",
                scenario=ppScenario)
@@ -1169,7 +1169,7 @@
                dqm_sequences=["@commonSiStripZeroBias", "@ecal", "@L1TMon", "@hcal", "@muon", "@jetmet", "@ctpps"],
                alca_producers=["SiStripCalZeroBias", "TkAlMinBias", "SiStripCalMinBias", "HcalCalIsolatedBunchSelector"],
                physics_skims=["LogError", "LogErrorMonitor"],
-               siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
+               siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
                timePerEvent=3.5,
                sizePerEvent=1500,
                tape_node="T1_ES_PIC_MSS",
@@ -1187,7 +1187,7 @@
                dqm_sequences=["@commonSiStripZeroBias", "@ecal", "@L1TMon", "@hcal", "@muon", "@jetmet", "@ctpps"],
                alca_producers=["SiStripCalZeroBias", "TkAlMinBias", "SiStripCalMinBias"],
                physics_skims=["LogError", "LogErrorMonitor"],
-               siteWhitelist = ["T2_CH_CERN_HLT"],
+               siteWhitelist = ["T2_CH_CERN_P5"],
                timePerEvent=3.5,
                sizePerEvent=1500,
                tape_node="T1_ES_PIC_MSS",
@@ -1208,7 +1208,7 @@
                write_dqm=False,
                write_aod=False,
                archival_node=None,
-               siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
+               siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
                tape_node="T0_CH_CERN_MSS",
                disk_node="T2_CH_CERN",
                scenario=ppScenario)
@@ -1230,7 +1230,7 @@
     addDataset(tier0Config, dataset,
                do_reco=True,
                archival_node=None,
-               siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
+               siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
                tape_node="T0_CH_CERN_MSS",
                disk_node="T2_CH_CERN",
                scenario=ppScenario)
@@ -1243,7 +1243,7 @@
                do_reco=True,
                archival_node=None,
                aod_to_disk=False,
-               siteWhitelist = ["T2_CH_CERN_HLT", "T2_CH_CERN"],
+               siteWhitelist = ["T2_CH_CERN_P5", "T2_CH_CERN"],
                tape_node="T0_CH_CERN_MSS",
                disk_node="T2_CH_CERN",
                scenario=ppScenario)