diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index f694510af..756cc1646 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -26,6 +26,7 @@
         - pip-and-virtualenv/source-install-ubuntu
         - ubuntu-minimal/xenial-build-succeeds
         - ubuntu-minimal/bionic-build-succeeds
+        - ubuntu-minimal/focal-build-succeeds
 
 - job:
     name: dib-functests-image
@@ -80,6 +81,7 @@
     vars:
       dib_functests:
         - ubuntu-minimal/bionic-arm64-build-succeeds
+        - ubuntu-minimal/focal-arm64-build-succeeds
         - centos-minimal/8-aarch64-build-succeeds
 
 # Bionic / Python3 tests
diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-arm64-build-succeeds/README.rst b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-arm64-build-succeeds/README.rst
new file mode 100644
index 000000000..624e34e46
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-arm64-build-succeeds/README.rst
@@ -0,0 +1,4 @@
+Verify we can build a ubuntu-minimal image.
+
+Note this test includes the vm element to test the bootloader install,
+and specifies to output a .qcow2
diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-arm64-build-succeeds/element-deps b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-arm64-build-succeeds/element-deps
new file mode 100644
index 000000000..99857b0c1
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-arm64-build-succeeds/element-deps
@@ -0,0 +1,3 @@
+block-device-efi
+openstack-ci-mirrors
+vm
diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-arm64-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-arm64-build-succeeds/environment.d/10-set-distro.bash
new file mode 100644
index 000000000..b65a21915
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-arm64-build-succeeds/environment.d/10-set-distro.bash
@@ -0,0 +1 @@
+export DIB_RELEASE=focal
diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-arm64-build-succeeds/test-output-formats b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-arm64-build-succeeds/test-output-formats
new file mode 100644
index 000000000..c780936b8
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-arm64-build-succeeds/test-output-formats
@@ -0,0 +1 @@
+tar,qcow2
\ No newline at end of file
diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-build-succeeds/README.rst b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-build-succeeds/README.rst
new file mode 100644
index 000000000..624e34e46
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-build-succeeds/README.rst
@@ -0,0 +1,4 @@
+Verify we can build a ubuntu-minimal image.
+
+Note this test includes the vm element to test the bootloader install,
+and specifies to output a .qcow2
diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-build-succeeds/element-deps b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-build-succeeds/element-deps
new file mode 100644
index 000000000..9c94dfd65
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-build-succeeds/element-deps
@@ -0,0 +1,3 @@
+block-device-mbr
+openstack-ci-mirrors
+vm
diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-build-succeeds/environment.d/10-set-distro.bash
new file mode 100644
index 000000000..b65a21915
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-build-succeeds/environment.d/10-set-distro.bash
@@ -0,0 +1 @@
+export DIB_RELEASE=focal
diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-build-succeeds/test-output-formats b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-build-succeeds/test-output-formats
new file mode 100644
index 000000000..c780936b8
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu-minimal/test-elements/focal-build-succeeds/test-output-formats
@@ -0,0 +1 @@
+tar,qcow2
\ No newline at end of file
diff --git a/releasenotes/notes/ubuntu-focal-0f54ed4543247b7e.yaml b/releasenotes/notes/ubuntu-focal-0f54ed4543247b7e.yaml
new file mode 100644
index 000000000..f15948491
--- /dev/null
+++ b/releasenotes/notes/ubuntu-focal-0f54ed4543247b7e.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The ``ubuntu-minimal`` element now supports the Focal release.