diff --git a/roles/deploy-docker/tasks/main.yaml b/roles/deploy-docker/tasks/main.yaml
index ea27cab7d..4d4e7700b 100644
--- a/roles/deploy-docker/tasks/main.yaml
+++ b/roles/deploy-docker/tasks/main.yaml
@@ -60,7 +60,7 @@
   vars:
     packages:
       deb:
-        - docker.io=18.06.1-0ubuntu1.2~16.04.1
+        - docker.io=18.06.1-0ubuntu1.2~18.04.1
       rpm:
         - docker
 
diff --git a/tools/deployment/common/005-deploy-k8s.sh b/tools/deployment/common/005-deploy-k8s.sh
index 95a76fe19..783be7146 100755
--- a/tools/deployment/common/005-deploy-k8s.sh
+++ b/tools/deployment/common/005-deploy-k8s.sh
@@ -57,14 +57,14 @@ sudo sed -i '/^127.0.0.1/c\127.0.0.1 localhost localhost.localdomain localhost4l
 sudo sed -i '/^::1/c\::1 localhost6 localhost6.localdomain6' /etc/hosts
 
 # Install required packages for K8s on host
-sudo apt-key adv --keyserver keyserver.ubuntu.com  --recv 460F3994
+wget -q -O- 'https://download.ceph.com/keys/release.asc' | sudo apt-key add -
 RELEASE_NAME=$(grep 'CODENAME' /etc/lsb-release | awk -F= '{print $2}')
 sudo add-apt-repository "deb https://download.ceph.com/debian-mimic/
 ${RELEASE_NAME} main"
 sudo -E apt-get update
 # NOTE(srwilkers): Pin docker version to validated docker version for k8s 1.12.2
 sudo -E apt-get install -y \
-    docker.io=18.06.1-0ubuntu1.2~16.04.1 \
+    docker.io=18.06.1-0ubuntu1.2~18.04.1 \
     socat \
     jq \
     util-linux \
@@ -72,7 +72,7 @@ sudo -E apt-get install -y \
     rbd-nbd \
     nfs-common \
     bridge-utils \
-    libxtables11
+    libxtables12
 
 sudo -E tee /etc/modprobe.d/rbd.conf << EOF
 install rbd /bin/true
diff --git a/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubelet/tasks/support-packages.yaml b/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubelet/tasks/support-packages.yaml
index f7b4f3c8c..f5b8f867a 100644
--- a/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubelet/tasks/support-packages.yaml
+++ b/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubelet/tasks/support-packages.yaml
@@ -14,11 +14,8 @@
   when: kubelet.pv_support_ceph
   block:
   - name: ubuntu | ensure community ceph repository key is installed
-    when: ansible_distribution == 'Ubuntu'
-    apt_key:
-      id: "460F3994"
-      keyserver: "keyserver.ubuntu.com"
-      state: present
+    when: ansible_distribution == "Ubuntu"
+    shell: wget -q -O- 'https://download.ceph.com/keys/release.asc' | sudo apt-key add -
 
   - name: ubuntu | ensure community ceph repository exists
     when: ansible_distribution == 'Ubuntu'
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 8d1cfe40e..92a062d86 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -16,7 +16,7 @@
 - job:
     name: openstack-helm-lint
     run: zuul.d/playbooks/lint.yml
-    nodeset: ubuntu-xenial
+    nodeset: ubuntu-bionic
 
 - job:
     name: openstack-helm-infra-functional
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index ba44edf54..8a11e6f94 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -17,7 +17,7 @@
     name: openstack-helm-single-node
     nodes:
       - name: primary
-        label: ubuntu-xenial
+        label: ubuntu-bionic
     groups:
       - name: primary
         nodes:
@@ -27,11 +27,11 @@
     name: openstack-helm-ubuntu
     nodes:
       - name: primary
-        label: ubuntu-xenial
+        label: ubuntu-bionic
       - name: node-1
-        label: ubuntu-xenial
+        label: ubuntu-bionic
       - name: node-2
-        label: ubuntu-xenial
+        label: ubuntu-bionic
     groups:
       - name: primary
         nodes:
@@ -82,15 +82,15 @@
     name: openstack-helm-five-node-ubuntu
     nodes:
       - name: primary
-        label: ubuntu-xenial
+        label: ubuntu-bionic
       - name: node-1
-        label: ubuntu-xenial
+        label: ubuntu-bionic
       - name: node-2
-        label: ubuntu-xenial
+        label: ubuntu-bionic
       - name: node-3
-        label: ubuntu-xenial
+        label: ubuntu-bionic
       - name: node-4
-        label: ubuntu-xenial
+        label: ubuntu-bionic
     groups:
       - name: primary
         nodes:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index c7b865e23..8624f1402 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -49,9 +49,9 @@
         - openstack-helm-infra-armada-update-passwords
     experimental:
       jobs:
-        #NOTE(srwilkers): Disable fedora experimental jobs until issues resolved
+        # NOTE(srwilkers): Disable fedora experimental jobs until issues resolved
         #- openstack-helm-infra-five-fedora
-        #NOTE(srwilkers): Disable centos experimental jobs until issues resolved
+        # NOTE(srwilkers): Disable centos experimental jobs until issues resolved
         #- openstack-helm-infra-five-centos
         - openstack-helm-infra-tenant-ceph
         - openstack-helm-infra-elastic-beats