--- get-proposed-cloudimg.dist	2017-10-20 20:48:44.000000000 +0000
+++ get-proposed-cloudimg	2017-10-20 20:47:36.511501583 +0000
@@ -69,16 +69,22 @@
 burl="http://cloud-images.ubuntu.com/daily/server"
 fname=$rel-server-cloudimg-amd64.img
 ofname="$fname"
+ftype="disk1.img"
 case "$rel" in
-    precise|trusty|xenial) ofname="$rel-server-cloudimg-amd64-disk1.img";;
+    xenial) ftype="uefi1.img";;
 esac
+case "$rel" in
+    precise|trusty|xenial) suff="-$ftype";;
+    *) suff=".img";;
+esac
+ofname="$rel-server-cloudimg-amd64${suff}"
 
 pfname="${fname%.img}-proposed.img"
 raw="${fname%.img}.raw"
 if [ ! -f "$fname" ]; then
    if sstream_check; then
       error "getting image via simplestreams."
-      sstream_get_image "$rel" "$fname" || exit
+      sstream_get_image "$rel" "$fname" "$ftype" || exit
    else
       wget "$burl/$rel/current/$ofname" -O "$fname.tmp" &&
           mv "$fname.tmp" "$fname" || exit