diff --git a/.zuul.yaml b/.zuul.yaml
index b79247e7..cee52e48 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -65,7 +65,7 @@
       minimalistic deployment consisting of uwsgi for Deckhand API and pifpaf
       for ephemeral PostgreSQL DB, under cPython version 3.5.
     run: tools/gate/playbooks/run-functional-tests-uwsgi.yaml
-    nodeset: openstack-helm-single-node
+    nodeset: airship-deckhand-single-node
     vars:
       tox_envlist: functional-dev
     irrelevant-files:
@@ -97,7 +97,7 @@
       Run tox-based functional tests for the Airship Deckhand project under
       cPython version 3.5. Uses tox with the ``functional-py35`` environment.
     parent: airship-deckhand-functional-docker-base
-    nodeset: openstack-helm-single-node
+    nodeset: airship-deckhand-single-node
     vars:
       tox_envlist: functional
       disable_keystone: true
@@ -117,7 +117,7 @@
       for ephemeral PostgreSQL DB, under cPython version 3.5.
     timeout: 3600
     run: tools/gate/playbooks/run-integration-tests-uwsgi.yaml
-    nodeset: openstack-helm-single-node
+    nodeset: airship-deckhand-single-node
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$