diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml
index d80600bc..a0ad11f5 100644
--- a/examples/basic/Genesis.yaml
+++ b/examples/basic/Genesis.yaml
@@ -46,7 +46,7 @@ data:
   haproxy:
     run_as_user: 65534
   images:
-    armada: quay.io/airshipit/armada:master-ubuntu_xenial
+    armada: quay.io/airshipit/armada:master-ubuntu_bionic
     helm:
       tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
     kubernetes:
diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml
index e3c9d992..9f1964a5 100644
--- a/examples/complete/Genesis.yaml
+++ b/examples/complete/Genesis.yaml
@@ -35,7 +35,7 @@ data:
   haproxy:
     run_as_user: 65534
   images:
-    armada: quay.io/airshipit/armada:master-ubuntu_xenial
+    armada: quay.io/airshipit/armada:master-ubuntu_bionic
     helm:
       tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
     kubernetes:
diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml
index 59fefa12..50f2433d 100644
--- a/examples/complete/armada-resources.yaml
+++ b/examples/complete/armada-resources.yaml
@@ -1725,7 +1725,7 @@ data:
             password: sergtsop
     images:
       tags:
-        deckhand: quay.io/airshipit/deckhand:master-ubuntu_xenial
+        deckhand: quay.io/airshipit/deckhand:master-ubuntu_bionic
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         db_init: docker.io/postgres:9.5
         db_sync: docker.io/postgres:9.5
@@ -1864,7 +1864,7 @@ data:
           tiller_namespace: kube-system
     images:
       tags:
-        api: quay.io/airshipit/armada:master-ubuntu_xenial
+        api: quay.io/airshipit/armada:master-ubuntu_bionic
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         ks_endpoints: docker.io/openstackhelm/heat:newton
         ks_service: docker.io/openstackhelm/heat:newton
diff --git a/examples/containerd/Genesis.yaml b/examples/containerd/Genesis.yaml
index af8e3f82..43b5f039 100644
--- a/examples/containerd/Genesis.yaml
+++ b/examples/containerd/Genesis.yaml
@@ -46,7 +46,7 @@ data:
   haproxy:
     run_as_user: 65534
   images:
-    armada: quay.io/airshipit/armada:master-ubuntu_xenial
+    armada: quay.io/airshipit/armada:master-ubuntu_bionic
     helm:
       tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
     kubernetes:
diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml
index af8e3f82..43b5f039 100644
--- a/examples/gate/Genesis.yaml
+++ b/examples/gate/Genesis.yaml
@@ -46,7 +46,7 @@ data:
   haproxy:
     run_as_user: 65534
   images:
-    armada: quay.io/airshipit/armada:master-ubuntu_xenial
+    armada: quay.io/airshipit/armada:master-ubuntu_bionic
     helm:
       tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
     kubernetes:
diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py
index b37203e1..45137777 100644
--- a/tests/unit/api/test_validatedesign.py
+++ b/tests/unit/api/test_validatedesign.py
@@ -101,7 +101,7 @@ VALID_DOCS = [
             'hostname':
             'n0',
             'images': {
-                'armada': 'quay.io/airshipit/armada:master-ubuntu_xenial',
+                'armada': 'quay.io/airshipit/armada:master-ubuntu_bionic',
                 'helm': {
                     'tiller': 'gcr.io/kubernetes-helm/tiller:v2.16.1'
                 },
diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml
index 9e6d19d2..5acf8d47 100644
--- a/tests/unit/builder_data/simple/Genesis.yaml
+++ b/tests/unit/builder_data/simple/Genesis.yaml
@@ -32,7 +32,7 @@ data:
       - promenade-genesis=enabled
       - ucp-control-plane=enabled
   images:
-    armada: quay.io/airshipit/armada:master-ubuntu_xenial
+    armada: quay.io/airshipit/armada:master-ubuntu_bionic
     helm:
       tiller: gcr.io/kubernetes-helm/tiller:v2.16.1
     kubernetes:
diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env
index ee927d8b..690a0ed3 100644
--- a/tools/gate/default-config-env
+++ b/tools/gate/default-config-env
@@ -1,4 +1,4 @@
-IMAGE_ARMADA=quay.io/airshipit/armada:master-ubuntu_xenial
+IMAGE_ARMADA=quay.io/airshipit/armada:master-ubuntu_bionic
 IMAGE_CALICO_CNI=quay.io/calico/cni:v1.11.2
 IMAGE_CALICO_CTL=quay.io/calico/ctl:v1.6.3
 IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v1.0.2