diff --git a/dev/zuul/openstack_functions.py b/dev/zuul/openstack_functions.py
index 607b1f732c..89c823862c 100644
--- a/dev/zuul/openstack_functions.py
+++ b/dev/zuul/openstack_functions.py
@@ -89,7 +89,7 @@ def set_node_options(item, job, params, default):
     # Select node to run job on.
     params['OFFLINE_NODE_WHEN_COMPLETE'] = '1'
     proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-updates?)$'  # noqa
-    pypi_re = r'^.*-(jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
+    release_re = r'^.*-(jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
     python26_re = r'^.*-(py(thon)?)?26.*$'
     centos6_re = r'^.*-centos6.*$'
     f20_re = r'^.*-f20.*$'
@@ -98,7 +98,7 @@ def set_node_options(item, job, params, default):
     devstack_re = r'^.*-dsvm.*$'
     puppetunit_re = r'^gate-puppet-.*-puppet-(lint|syntax|unit).*$'
     # jobs run on the proposal worker
-    if re.match(proposal_re, job.name) or re.match(pypi_re, job.name):
+    if re.match(proposal_re, job.name) or re.match(release_re, job.name):
         reusable_node(item, job, params)
     # Jobs needing python26
     elif re.match(python26_re, job.name):
diff --git a/jenkins/jobs/jenkins-plugin-jobs.yaml b/jenkins/jobs/jenkins-plugin-jobs.yaml
index 0ad399d1d6..1c0ad0e68b 100644
--- a/jenkins/jobs/jenkins-plugin-jobs.yaml
+++ b/jenkins/jobs/jenkins-plugin-jobs.yaml
@@ -50,7 +50,7 @@
 
 - job-template:
     name: '{name}-jenkinsci-upload'
-    node: pypi
+    node: release
 
     builders:
       - revoke-sudo
diff --git a/jenkins/jobs/maven-plugin-jobs.yaml b/jenkins/jobs/maven-plugin-jobs.yaml
index ba1094cf1a..bdd19ab6f6 100644
--- a/jenkins/jobs/maven-plugin-jobs.yaml
+++ b/jenkins/jobs/maven-plugin-jobs.yaml
@@ -28,7 +28,7 @@
 
 - job-template:
     name: '{name}-mavencentral-upload'
-    node: pypi
+    node: release
 
     builders:
       - revoke-sudo
diff --git a/jenkins/jobs/puppet-module-jobs.yaml b/jenkins/jobs/puppet-module-jobs.yaml
index e4506c6a0e..80d4bd21a5 100644
--- a/jenkins/jobs/puppet-module-jobs.yaml
+++ b/jenkins/jobs/puppet-module-jobs.yaml
@@ -109,7 +109,7 @@
 
 - job-template:
     name: '{name}-forge-upload'
-    node: pypi
+    node: release
 
     builders:
       - revoke-sudo
diff --git a/jenkins/jobs/pypi-jobs.yaml b/jenkins/jobs/pypi-jobs.yaml
index 90ff3434a1..3edcf8ad28 100644
--- a/jenkins/jobs/pypi-jobs.yaml
+++ b/jenkins/jobs/pypi-jobs.yaml
@@ -1,6 +1,6 @@
 - job-template:
     name: '{name}-pypi-both-upload'
-    node: pypi
+    node: release
 
     builders:
       - revoke-sudo
@@ -19,7 +19,7 @@
 
 - job-template:
     name: '{name}-pypi-wheel-upload'
-    node: pypi
+    node: release
 
     builders:
       - revoke-sudo
diff --git a/zuul/openstack_functions.py b/zuul/openstack_functions.py
index 249e9f414b..495fb91377 100644
--- a/zuul/openstack_functions.py
+++ b/zuul/openstack_functions.py
@@ -89,7 +89,7 @@ def set_node_options(item, job, params, default):
     # Select node to run job on.
     params['OFFLINE_NODE_WHEN_COMPLETE'] = '1'
     proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-(constraints-.*|updates?))$'  # noqa
-    pypi_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
+    release_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
     python26_re = r'^.*-(py(thon)?)?26.*$'
     centos6_re = r'^.*-centos6.*$'
     f21_re = r'^.*-f21.*$'
@@ -98,7 +98,7 @@ def set_node_options(item, job, params, default):
     puppetunit_re = (
         r'^gate-(puppet-.*|system-config)-puppet-(lint|syntax|unit).*$')
     # jobs run on the proposal worker
-    if re.match(proposal_re, job.name) or re.match(pypi_re, job.name):
+    if re.match(proposal_re, job.name) or re.match(release_re, job.name):
         reusable_node(item, job, params)
     # Jobs needing python26
     elif re.match(python26_re, job.name):