diff --git a/util/manibuilder/Makefile.env b/util/manibuilder/Makefile.env
index 7264bb5..001ec2d 100644
--- a/util/manibuilder/Makefile.env
+++ b/util/manibuilder/Makefile.env
@@ -1,5 +1,5 @@
 # No ccache
-$(ALMALINUX_TAGS) $(filter centos\:%, $(MULTIARCH_TAGS)): CC=cc
+$(ALMALINUX_TAGS): CC=cc
 
 # DJGPP is very special
 djgpp\:6.1.0: ENV_VARS=CROSS_COMPILE=i586-pc-msdosdjgpp-
@@ -7,40 +7,33 @@
 djgpp\:6.1.0: STRIP=i586-pc-msdosdjgpp-strip
 djgpp\:6.1.0: LIBS_BASE=../
 djgpp\:6.1.0: MAKEARGS+=HAS_LIBPCI=yes CONFIG_LIBPCI_LDFLAGS=-lpci
-djgpp\:6.1.0: MAKEARGS+=strip
+djgpp\:6.1.0: MAKEARGS+=strip WARNERROR=no
 djgpp\:6.1.0: MESONCMD=
 
-# Compiler doesn't like simplified initializers, e.g. `= { 0 };`
-$(filter centos\:%, $(MULTIARCH_TAGS)): MAKEARGS+=WARNERROR=no
-
 # No libftdi1
 NO_LIBFTDI1_TAGS := \
 	$(ALMALINUX_TAGS) \
-	$(filter centos\:%, $(MULTIARCH_TAGS)) \
 
 $(NO_LIBFTDI1_TAGS): MAKEARGS+=CONFIG_FT2232_SPI=no CONFIG_USBBLASTER_SPI=no
 
 # No libgpiod
 NO_LIBGPIOD_TAGS := \
 	$(filter %\:8, $(ALMALINUX_TAGS)) \
-	$(filter centos\:% %-bionic %-xenial %-stretch, $(MULTIARCH_TAGS)) \
-	$(foreach v, fedora\:24 fedora\:25, $(filter $(v)-%, $(MULTIARCH_TAGS))) \
-	$(foreach v, v3.6 v3.7 v3.8 v3.9 v3.10, $(filter alpine\:%-$(v), $(MULTIARCH_TAGS))) \
+	$(foreach v, v3.8 v3.9 v3.10, $(filter alpine\:%-$(v), $(MULTIARCH_TAGS))) \
 
 $(NO_LIBGPIOD_TAGS): MAKEARGS+=CONFIG_LINUX_GPIO_SPI=no
 
 # No libjaylink
 NO_LIBJAYLINK_TAGS := \
 	$(ALMALINUX_TAGS) \
-	$(filter alpine\:% centos\:% %-xenial %-stretch, $(MULTIARCH_TAGS)) \
+	$(filter alpine\:%, $(MULTIARCH_TAGS)) \
 
 $(NO_LIBJAYLINK_TAGS): MAKEARGS+=CONFIG_JLINK_SPI=no
 
 # No compatible Meson
 NO_MESON_TAGS := \
-	$(filter anita\:7.%, $(ANITA_TAGS)) \
-	$(filter centos\:% %-bionic %-xenial %-buster %-stretch, $(MULTIARCH_TAGS)) \
-	$(foreach v, 24 25 29 30 31, $(filter fedora\:$(v)-%, $(MULTIARCH_TAGS))) \
-	$(foreach v, 3.6 3.7 3.8 3.9 3.10 3.11, $(filter alpine\:%-v$(v), $(MULTIARCH_TAGS))) \
+	$(filter %-buster, $(MULTIARCH_TAGS)) \
+	$(foreach v, 29 30 31, $(filter fedora\:$(v)-%, $(MULTIARCH_TAGS))) \
+	$(foreach v, 3.8 3.9 3.10 3.11, $(filter alpine\:%-v$(v), $(MULTIARCH_TAGS))) \
 
 $(NO_MESON_TAGS): MESONCMD=