diff --git a/playbooks/kata-runsh/pre.yaml b/playbooks/kata-runsh/pre.yaml
index 67781893..5c64427f 100644
--- a/playbooks/kata-runsh/pre.yaml
+++ b/playbooks/kata-runsh/pre.yaml
@@ -1,6 +1,30 @@
 - hosts: all
   tasks:
+    - name: Install build-essential
+      package:
+        name: build-essential
+        state: present
+      become: yes
+    - name: Install golang
+      package:
+        name: golang-1.10
+        state: present
+      become: yes
+    - name: Make sure sources.list.d exists
+      file:
+        path: /etc/apt/sources.list.d
+        owner: root
+        group: root
+        mode: 0755
+        state: directory
+      become: yes
     - name: Run kata setup.sh
       args:
+        executable: /bin/bash
         chdir: "{{ zuul.project.src_dir }}"
-      command: ".ci/setup.sh"
+      shell: |
+        set -x
+        export PATH=$PATH:/usr/lib/go-1.10/bin
+        export CI=true
+        export GOPATH=$HOME
+        .ci/setup.sh
diff --git a/playbooks/kata-runsh/run.yaml b/playbooks/kata-runsh/run.yaml
index 9eaa4b7b..369afc02 100644
--- a/playbooks/kata-runsh/run.yaml
+++ b/playbooks/kata-runsh/run.yaml
@@ -2,5 +2,11 @@
   tasks:
     - name: Run kata run.sh
       args:
+        executable: /bin/bash
         chdir: "{{ zuul.project.src_dir }}"
-      command: ".ci/run.sh"
+      shell: |
+        set -x
+        export PATH=$PATH:/usr/lib/go-1.10/bin
+        export CI=true
+        export GOPATH=$HOME
+        .ci/run.sh
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index d26116bf..c00b9f31 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1452,5 +1452,5 @@
     timeout: 3600
     nodeset:
       nodes:
-        - name: ubuntu-bionic
-          label: ubuntu-bionic-vexxhost
+        - name: ubuntu-xenial
+          label: ubuntu-xenial-vexxhost