diff --git a/diskimage_builder/elements/ubuntu-minimal/package-installs.yaml b/diskimage_builder/elements/ubuntu-minimal/package-installs.yaml
index ea62779f..d91f2495 100644
--- a/diskimage_builder/elements/ubuntu-minimal/package-installs.yaml
+++ b/diskimage_builder/elements/ubuntu-minimal/package-installs.yaml
@@ -9,7 +9,15 @@ linux-image-virtual:
   when: DIB_UBUNTU_KERNEL = linux-image-virtual
 linux-generic-hwe-18.04:
   not-arch: arm64
-  when: DIB_UBUNTU_KERNEL = linux-image-hwe
+  when:
+    - DIB_UBUNTU_KERNEL = linux-image-hwe
+    - DIB_RELEASE = bionic
+linux-generic-hwe-20.04:
+  not-arch: arm64
+  when:
+    - DIB_UBUNTU_KERNEL = linux-image-hwe
+    - DIB_RELEASE = focal
+
 # TODO(ianw): this is Xenial specific, for now.  This kernel works
 # much better, however, including better support for cdrom's for
 # config-drive.  We'll need to filter this further for future