diff --git a/.github/buildomat/jobs/phd-run-migrate-from-base.sh b/.github/buildomat/jobs/phd-run-migrate-from-base.sh
index 61a400f13..1fcfcf99c 100644
--- a/.github/buildomat/jobs/phd-run-migrate-from-base.sh
+++ b/.github/buildomat/jobs/phd-run-migrate-from-base.sh
@@ -2,7 +2,7 @@
 #:
 #: name = "phd-run-migrate-from-base"
 #: variety = "basic"
-#: target = "lab-2.0-opte"
+#: target = "lab-2.0-gimlet"
 #: output_rules = [
 #:	"/tmp/phd-runner.log",
 #:	"/tmp/phd-tmp-files.tar.gz",
diff --git a/.github/buildomat/jobs/phd-run.sh b/.github/buildomat/jobs/phd-run.sh
index 6125b8e6a..82d11a466 100644
--- a/.github/buildomat/jobs/phd-run.sh
+++ b/.github/buildomat/jobs/phd-run.sh
@@ -2,7 +2,7 @@
 #:
 #: name = "phd-run"
 #: variety = "basic"
-#: target = "lab-2.0-opte"
+#: target = "lab-2.0-gimlet"
 #: output_rules = [
 #:	"/tmp/phd-runner.log",
 #:	"/tmp/phd-tmp-files.tar.gz",
diff --git a/.github/buildomat/phd-run-with-args.sh b/.github/buildomat/phd-run-with-args.sh
index 4ca389227..6c505749c 100755
--- a/.github/buildomat/phd-run-with-args.sh
+++ b/.github/buildomat/phd-run-with-args.sh
@@ -13,7 +13,11 @@ phddir="$PWD/phd-test"
 
 # Put artifacts on the runner's SSDs (the /work ramdisk is small by design, too
 # small for images of any appreciable size).
-pfexec zpool create -f phd-artifacts c1t1d0 c2t1d0
+
+# Find usable disks to make a zpool on. Note that this only works on Oxide
+# compute sled runners such as `lab-2.0-gimlet`.
+disks=( $(pilot local disk list -H -o type,disk | grep -v 'M.2' | cut -f 2) )
+pfexec zpool create -f phd-artifacts ${disks[@]}
 artifactdir="/phd-artifacts"
 
 banner 'Inputs'