diff --git a/release/Makefile.azure b/release/Makefile.azure
--- a/release/Makefile.azure
+++ b/release/Makefile.azure
@@ -4,7 +4,6 @@
 # Makefile for uploading Microsoft Azure disk images.
 #
 
-AZURE_IMG?=		${.OBJDIR}/azure.vhdf
 AZURE_UPLOAD_TGTS=	azure-check-depends \
 			azure-do-upload
 CLEANFILES+=		${AZURE_UPLOAD_TGTS}
@@ -19,8 +18,6 @@
 SNAPSHOT_DATE!=		date +-${BUILDDATE}
 .endif
 
-AZURE_TARGET:=		${OSRELEASE}${SNAPSHOT_DATE}
-
 START_DATE!=	date -v-1d -I -u
 EXPIRY_DATE!=	date -v+1m -I -u
 
@@ -44,14 +41,18 @@
 . endif
 .endif
 
-azure-do-upload:
+.for _FS in ${AZURE_FSLIST}
+AZURE_IMG_${_FS}=	${.OBJDIR}/azure.${_FS}.vhdf
+AZURE_TARGET_${_FS}=	${OSRELEASE}-${_FS}${SNAPSHOT_DATE}
+
+azure-do-upload-${_FS}:
 	/usr/local/bin/az storage blob upload \
 		--account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \
 		--container-name ${AZURE_STORAGE} --type page \
-		--file ${AZURE_IMG} --name ${AZURE_TARGET}.vhd
+		--file ${AZURE_IMG_${_FS}} --name ${AZURE_TARGET_${_FS}}.vhd
 	@echo "The disk access URL with shared access signature is:"
 	@echo
-	@echo -n https://${AZURE_ACCOUNT}.blob.core.windows.net/${AZURE_STORAGE}/${AZURE_TARGET}.vhd?
+	@echo -n https://${AZURE_ACCOUNT}.blob.core.windows.net/${AZURE_STORAGE}/${AZURE_TARGET_${_FS}}.vhd?
 	@/usr/local/bin/az storage container generate-sas \
 		--account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \
 		--name ${AZURE_STORAGE} \
@@ -67,5 +68,8 @@
 	@echo
 	@echo /usr/local/bin/az storage blob delete \
 		--account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \
-		--container-name ${AZURE_STORAGE} --name ${AZURE_TARGET}.vhd
+		--container-name ${AZURE_STORAGE} --name ${AZURE_TARGET_${_FS}}.vhd
 	@echo
+.endfor
+
+azure-do-upload: azure-do-upload-${VMFS}
diff --git a/release/Makefile.vm b/release/Makefile.vm
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -24,7 +24,7 @@
 		VAGRANT-VIRTUALBOX \
 		VAGRANT-VMWARE
 AZURE_FORMAT=	vhdf
-AZURE_FSLIST=	ufs
+AZURE_FSLIST=	ufs zfs
 AZURE_DESC=	Microsoft Azure platform image
 AZURE_DISK=	${OSRELEASE}.${AZURE_FORMAT}
 BASIC-CI_FORMAT=	raw