diff --git a/.zuul.yaml b/.zuul.yaml
index 44f0b0267..baf815551 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -27,7 +27,7 @@
 - nodeset:
     name: airship-treasuremap-single-node
     nodes:
-      - name: primary
+      - name: ubuntu-xenial
         label: ubuntu-xenial
 
 - job:
diff --git a/tools/gate/playbooks/airship-seaworthy-site-lint.yaml b/tools/gate/playbooks/airship-seaworthy-site-lint.yaml
index e62105b24..d26bcf3bc 100644
--- a/tools/gate/playbooks/airship-seaworthy-site-lint.yaml
+++ b/tools/gate/playbooks/airship-seaworthy-site-lint.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- hosts: primary
+- hosts: ubuntu-xenial
   tasks:
     - name: Lint airship-seaworthy site
       shell: |
diff --git a/tools/gate/playbooks/airskiff-site-lint.yaml b/tools/gate/playbooks/airskiff-site-lint.yaml
index 6ec43e404..062e8fa51 100644
--- a/tools/gate/playbooks/airskiff-site-lint.yaml
+++ b/tools/gate/playbooks/airskiff-site-lint.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- hosts: primary
+- hosts: ubuntu-xenial
   tasks:
     - name: Lint airskiff site
       shell: |
diff --git a/tools/gate/playbooks/git-config.yaml b/tools/gate/playbooks/git-config.yaml
index b0c600593..2fea1b3c7 100644
--- a/tools/gate/playbooks/git-config.yaml
+++ b/tools/gate/playbooks/git-config.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- hosts: primary
+- hosts: ubuntu-xenial
   tasks:
     - name: Git config
       shell: |
diff --git a/tools/gate/playbooks/install-docker.yaml b/tools/gate/playbooks/install-docker.yaml
index 230229190..ba8201a1f 100644
--- a/tools/gate/playbooks/install-docker.yaml
+++ b/tools/gate/playbooks/install-docker.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- hosts: primary
+- hosts: ubuntu-xenial
   tasks:
     - name: Install Docker CE
       shell: |