diff --git a/.zuul.yaml b/.zuul.yaml
index 777dd701..4209c8ac 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -46,7 +46,7 @@
     name: armada-single-node
     nodes:
       - name: primary
-        label: ubuntu-xenial
+        label: ubuntu-bionic
 
 - job:
     name: armada-chart-build-gate
diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml
index 164a9491..3c786c1c 100644
--- a/tools/gate/playbooks/airskiff-deploy.yaml
+++ b/tools/gate/playbooks/airskiff-deploy.yaml
@@ -14,6 +14,16 @@
 
 - hosts: primary
   tasks:
+    # Stop systemd-resolved service before starting docker.
+    - name: stop systemd-resolved service
+      systemd:
+        state: stopped
+        enabled: no
+        masked: yes
+        daemon_reload: yes
+        name: systemd-resolved
+      become: yes
+
     - name: Clone Required Repositories
       shell: |
         export CLONE_ARMADA={{ CLONE_ARMADA }}