diff --git a/.github/scripts/verify-query-packages.sh b/.github/scripts/verify-query-packages.sh
index 2d17729..c91afc4 100755
--- a/.github/scripts/verify-query-packages.sh
+++ b/.github/scripts/verify-query-packages.sh
@@ -72,7 +72,7 @@ test "$(TARGET_KERNEL_FLAVORS=generic ./query-packages.sh list linux-kernel)" ==
 # Check that when a package has multiple dependencies they are printed in the
 # expected format.
 test "$(TARGET_KERNEL_FLAVORS="generic aws" ./query-packages.sh single -o dependencies zfs)" == \
-	"linux-kernel-generic,linux-kernel-aws,delphix-rust"
+	"linux-kernel-generic,linux-kernel-aws,delphix-rust,dwarves"
 
 # Check that the output from the appliance list contains zfs and
 # delphix-platform packages. Note, we explicitly do not use grep -q here as it
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 978100f..e527d7c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,19 +2,19 @@ on: [push, pull_request]
 
 jobs:
   check-shellcheck:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - run: sudo ./.github/scripts/install-shellcheck.sh
       - run: make shellcheck
   check-shfmt:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - run: sudo ./.github/scripts/install-shfmt.sh
       - run: make shfmtcheck
   verify-query-packages:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - run: ./.github/scripts/verify-query-packages.sh