diff --git a/util/manibuilder/Makefile b/util/manibuilder/Makefile
index b81d93b..5611de8 100644
--- a/util/manibuilder/Makefile
+++ b/util/manibuilder/Makefile
@@ -45,13 +45,11 @@
 	[ $$(docker image ls -q mani/$*) ] \
 		|| $(MAKE) $*-build $(if $(QUIET_SETUP),>/dev/null 2>/dev/null)
 
-$(ALMALINUX_TAGS) $(filter centos%,$(MULTIARCH_TAGS)) anita\:7.1-sparc: CC=cc
+$(ALMALINUX_TAGS) $(filter centos%,$(MULTIARCH_TAGS)): CC=cc
 djgpp\:6.1.0: CC=ccache i586-pc-msdosdjgpp-gcc
 djgpp\:6.1.0: STRIP=i586-pc-msdosdjgpp-strip
 djgpp\:6.1.0: LIBS_BASE=../
 djgpp\:6.1.0: MAKEARGS+=strip CONFIG_JLINK_SPI=no
-$(ANITA_TAGS): MAKECMD=gmake
-$(ANITA_TAGS): MAKEARGS+=CONFIG_JLINK_SPI=no WARNERROR=no
 $(filter alpine% centos%,$(MULTIARCH_TAGS)): MAKEARGS+=CONFIG_JLINK_SPI=no
 $(filter %-xenial %-stretch,$(MULTIARCH_TAGS)): MAKEARGS+=CONFIG_JLINK_SPI=no
 $(filter centos%,$(MULTIARCH_TAGS)): MAKEARGS+=WARNERROR=no
diff --git a/util/manibuilder/Makefile.anita b/util/manibuilder/Makefile.anita
index 9865c3e..25695ec 100644
--- a/util/manibuilder/Makefile.anita
+++ b/util/manibuilder/Makefile.anita
@@ -59,3 +59,12 @@
 
 $(ANITA_KVM_TAGS): MANI_DOCKER_ARGS=--privileged
 $(ANITA_KVM_TAGS): MANI_DOCKER_ARGS+=--env ANITA_VMM_ARGS="-enable-kvm"
+
+# Always use GNU make
+$(ANITA_TAGS): MAKECMD=gmake
+
+# No libjaylink
+$(ANITA_TAGS): MAKEARGS+=CONFIG_JLINK_SPI=no
+
+# Compiler doesn't like simplified initializers, e.g. `= { 0 };`
+anita\:7.1-i386 anita\:7.1-amd64: MAKEARGS+=WARNERROR=no