diff --git a/srcpkgs/cross-x86_64-w64-mingw32/template b/srcpkgs/cross-x86_64-w64-mingw32/template
index e89e798a86b..6044f544d67 100644
--- a/srcpkgs/cross-x86_64-w64-mingw32/template
+++ b/srcpkgs/cross-x86_64-w64-mingw32/template
@@ -51,6 +51,19 @@ nostrip_files="libgcc.a libgcc_eh.a libgcc_s.a libgcov.a
 # https://gcc.gnu.org/install/configure.html
 # http://mingw-w64.org/doku.php/configure
 
+build_options="ucrt"
+desc_option_ucrt="Build mingw32ucrt compiler"
+if [ "${XBPS_TARGET_MACHINE}" != "x86_64-musl" ]; then
+	# Temporary workaround for out of storage on builder:
+	# https://build.voidlinux.org/api/v2/logs/11214/raw_inline
+	build_options_default="ucrt"
+fi
+
+subpackages="cross-x86_64-w64-mingw32-crt cross-i686-w64-mingw32 cross-i686-w64-mingw32-crt"
+if [ "$build_option_ucrt" ]; then
+	subpackages+=" cross-x86_64-w64-mingw32ucrt cross-x86_64-w64-mingw32ucrt-crt"
+fi
+
 _binutils_build() {
 	_target=$1
 	_sysroot="/usr/${_target}"
@@ -229,7 +242,9 @@ _build_cross() {
 }
 
 do_build() {
-	(_build_cross "x86_64-w64-mingw32ucrt")
+	if [ "$build_option_ucrt" ]; then
+		(_build_cross "x86_64-w64-mingw32ucrt")
+	fi
 	(_build_cross "x86_64-w64-mingw32")
 	(_build_cross "i686-w64-mingw32")
 }
@@ -269,7 +284,9 @@ _clean_cross() {
 }
 
 do_clean() {
-	(_clean_cross "x86_64-w64-mingw32ucrt")
+	if [ "$build_option_ucrt" ]; then
+		(_clean_cross "x86_64-w64-mingw32ucrt")
+	fi
 	(_clean_cross "x86_64-w64-mingw32")
 	(_clean_cross "i686-w64-mingw32")
 }