diff --git a/bin/00_pypi_resource_control.sh b/bin/00_pypi_resource_control.sh
index cf061568d..31a5b941f 100644
--- a/bin/00_pypi_resource_control.sh
+++ b/bin/00_pypi_resource_control.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 #Settings for using T0_CH_CERN_Disk
-manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --cms-name=T2_CH_CERN --pnn=T0_CH_CERN_Disk --ce-name=T2_CH_CERN --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
-manage execute-agent wmagent-resource-control --site-name=T0_CH_CERN_Disk --cms-name=T0_CH_CERN_Disk --pnn=T2_CH_CERN --ce-name=T0_CH_CERN_Disk --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
+manage execute-agent wmagent-resource-control --site-name=T0_CH_CERN_Disk --pnn=T2_CH_CERN --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
+manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --pnn=T0_CH_CERN_Disk --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
 manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Processing --pending-slots=10000 --running-slots=10000
 manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Merge --pending-slots=1000 --running-slots=1000
 manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type=Cleanup --pending-slots=1000 --running-slots=1000
@@ -14,7 +14,7 @@ manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN --task-type
 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_P5 (PromptReco)
-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
+manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --pnn=T2_CH_CERN_P5 --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin
 manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Processing --pending-slots=10000 --running-slots=10000
 manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Merge --pending-slots=1000 --running-slots=1000
 manage execute-agent wmagent-resource-control --site-name=T2_CH_CERN_P5 --task-type=Cleanup --pending-slots=1000 --running-slots=1000
diff --git a/bin/t0 b/bin/t0
index b8966ae7c..234511a9c 100644
--- a/bin/t0
+++ b/bin/t0
@@ -131,10 +131,8 @@ def addProcessingSite(site=None):
     _resourceControl_
     Adds site to the resource control
     """
-    command_1 = "manage execute-agent wmagent-resource-control --site-name={} --cms-name={} --pnn={} --ce-name={} --pending-slots=20000 --running-slots=20000 --plugin=SimpleCondorPlugin".format(site, site, site, site)
-    command_2 = "manage execute-agent wmagent-resource-control --site-name={} --task-type=Processing --pending-slots=10000 --running-slots=10000".format(site)
-    os.system(command_1)
-    os.system(command_2)
+    addSiteCmd = f"manage execute-agent wmagent-resource-control --pending-slots=10000 --running-slots=10000 --plugin=SimpleCondorPlugin --add-one-site {site}"
+    os.system(addSiteCmd)
 
 def modifyCodeFile(file=None):
     """
diff --git a/etc/Tier0Config.py b/etc/Tier0Config.py
index 1427aa477..0dc0fdd87 100644
--- a/etc/Tier0Config.py
+++ b/etc/Tier0Config.py
@@ -54,7 +54,7 @@
 config.AgentStatusWatcher.pendingSlotsSitePercent = 40
 config.AgentStatusWatcher.runningExpressPercent = 25
 config.AgentStatusWatcher.runningRepackPercent = 10
-config.AgentStatusWatcher.enabled = False
+config.AgentStatusWatcher.enabled = True
 config.AgentStatusWatcher.onlySSB = False
 
 config.RucioInjector.blockRuleParams = {}