diff --git a/ros_buildfarm/templates/ci/ci_reconfigure-jobs_job.xml.em b/ros_buildfarm/templates/ci/ci_reconfigure-jobs_job.xml.em
index 3db683890..768215163 100644
--- a/ros_buildfarm/templates/ci/ci_reconfigure-jobs_job.xml.em
+++ b/ros_buildfarm/templates/ci/ci_reconfigure-jobs_job.xml.em
@@ -40,7 +40,7 @@
     refspec=None,
 ))@
   <scmCheckoutRetryCount>2</scmCheckoutRetryCount>
-  <assignedNode>agent_on_master</assignedNode>
+  <assignedNode>agent_on_jenkins || agent_on_master</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
diff --git a/ros_buildfarm/templates/devel/devel_reconfigure-jobs_job.xml.em b/ros_buildfarm/templates/devel/devel_reconfigure-jobs_job.xml.em
index 1504d5b46..89a760a32 100644
--- a/ros_buildfarm/templates/devel/devel_reconfigure-jobs_job.xml.em
+++ b/ros_buildfarm/templates/devel/devel_reconfigure-jobs_job.xml.em
@@ -45,7 +45,7 @@
     refspec=None,
 ))@
   <scmCheckoutRetryCount>2</scmCheckoutRetryCount>
-  <assignedNode>agent_on_master</assignedNode>
+  <assignedNode>agent_on_jenkins || agent_on_master</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
diff --git a/ros_buildfarm/templates/doc/doc_reconfigure-jobs_job.xml.em b/ros_buildfarm/templates/doc/doc_reconfigure-jobs_job.xml.em
index 436177188..39d2f0b1a 100644
--- a/ros_buildfarm/templates/doc/doc_reconfigure-jobs_job.xml.em
+++ b/ros_buildfarm/templates/doc/doc_reconfigure-jobs_job.xml.em
@@ -45,7 +45,7 @@
     refspec=None,
 ))@
   <scmCheckoutRetryCount>2</scmCheckoutRetryCount>
-  <assignedNode>agent_on_master</assignedNode>
+  <assignedNode>agent_on_jenkins || agent_on_master</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
diff --git a/ros_buildfarm/templates/release/release_reconfigure-jobs_job.xml.em b/ros_buildfarm/templates/release/release_reconfigure-jobs_job.xml.em
index c1866ef6c..10a87d404 100644
--- a/ros_buildfarm/templates/release/release_reconfigure-jobs_job.xml.em
+++ b/ros_buildfarm/templates/release/release_reconfigure-jobs_job.xml.em
@@ -45,7 +45,7 @@
     refspec=None,
 ))@
   <scmCheckoutRetryCount>2</scmCheckoutRetryCount>
-  <assignedNode>agent_on_master</assignedNode>
+  <assignedNode>agent_on_jenkins || agent_on_master</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
diff --git a/ros_buildfarm/templates/release/release_trigger-jobs_job.xml.em b/ros_buildfarm/templates/release/release_trigger-jobs_job.xml.em
index 6d52a38c6..4925c33e9 100644
--- a/ros_buildfarm/templates/release/release_trigger-jobs_job.xml.em
+++ b/ros_buildfarm/templates/release/release_trigger-jobs_job.xml.em
@@ -58,7 +58,7 @@ if missed_jobs:
     refspec=None,
 ))@
   <scmCheckoutRetryCount>2</scmCheckoutRetryCount>
-  <assignedNode>agent_on_master</assignedNode>
+  <assignedNode>agent_on_jenkins || agent_on_master</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
diff --git a/ros_buildfarm/templates/status/blocked_releases_page_job.xml.em b/ros_buildfarm/templates/status/blocked_releases_page_job.xml.em
index 624889b8b..a18d87c68 100644
--- a/ros_buildfarm/templates/status/blocked_releases_page_job.xml.em
+++ b/ros_buildfarm/templates/status/blocked_releases_page_job.xml.em
@@ -30,7 +30,7 @@
     refspec=None,
 ))@
   <scmCheckoutRetryCount>2</scmCheckoutRetryCount>
-  <assignedNode>agent_on_master||buildagent</assignedNode>
+  <assignedNode>agent_on_jenkins || agent_on_master || buildagent</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
diff --git a/ros_buildfarm/templates/status/blocked_source_entries_page_job.xml.em b/ros_buildfarm/templates/status/blocked_source_entries_page_job.xml.em
index 1bd909ed0..c0707f38b 100644
--- a/ros_buildfarm/templates/status/blocked_source_entries_page_job.xml.em
+++ b/ros_buildfarm/templates/status/blocked_source_entries_page_job.xml.em
@@ -30,7 +30,7 @@
     refspec=None,
 ))@
   <scmCheckoutRetryCount>2</scmCheckoutRetryCount>
-  <assignedNode>agent_on_master||buildagent</assignedNode>
+  <assignedNode>agent_on_jenkins || agent_on_master || buildagent</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
diff --git a/ros_buildfarm/templates/status/release_compare_page_job.xml.em b/ros_buildfarm/templates/status/release_compare_page_job.xml.em
index 801476884..0a82562f5 100644
--- a/ros_buildfarm/templates/status/release_compare_page_job.xml.em
+++ b/ros_buildfarm/templates/status/release_compare_page_job.xml.em
@@ -30,7 +30,7 @@
     refspec=None,
 ))@
   <scmCheckoutRetryCount>2</scmCheckoutRetryCount>
-  <assignedNode>agent_on_master||buildagent</assignedNode>
+  <assignedNode>agent_on_jenkins || agent_on_master || buildagent</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
diff --git a/ros_buildfarm/templates/status/release_status_page_job.xml.em b/ros_buildfarm/templates/status/release_status_page_job.xml.em
index d3400db4f..74501778e 100644
--- a/ros_buildfarm/templates/status/release_status_page_job.xml.em
+++ b/ros_buildfarm/templates/status/release_status_page_job.xml.em
@@ -30,7 +30,7 @@
     refspec=None,
 ))@
   <scmCheckoutRetryCount>2</scmCheckoutRetryCount>
-  <assignedNode>agent_on_master||buildagent</assignedNode>
+  <assignedNode>agent_on_jenkins || agent_on_master || buildagent</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
diff --git a/ros_buildfarm/templates/status/repos_status_page_job.xml.em b/ros_buildfarm/templates/status/repos_status_page_job.xml.em
index 740626627..a70775d52 100644
--- a/ros_buildfarm/templates/status/repos_status_page_job.xml.em
+++ b/ros_buildfarm/templates/status/repos_status_page_job.xml.em
@@ -30,7 +30,7 @@
     refspec=None,
 ))@
   <scmCheckoutRetryCount>2</scmCheckoutRetryCount>
-  <assignedNode>agent_on_master||buildagent</assignedNode>
+  <assignedNode>agent_on_jenkins || agent_on_master || buildagent</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>