diff --git a/util/manibuilder/Makefile.anita b/util/manibuilder/Makefile.anita
index 2a8146f..d45c50e 100644
--- a/util/manibuilder/Makefile.anita
+++ b/util/manibuilder/Makefile.anita
@@ -1,6 +1,12 @@
 PKGSRC_MIRROR = http://cdn.netbsd.org/
 NETBSD_MIRROR = http://ftp.de.netbsd.org/
 
+anita\:10.1-sparc64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/sparc64/10.0/All
+anita\:10.1-sparc64-build: NETBSD_IMAGE=pub/NetBSD/iso/10.1/NetBSD-10.1-sparc64.iso
+anita\:10.1-sparc64-build: QEMU_DISK_SIZE=2G
+anita\:10.1-sparc64-build: QEMU_INSTALL_MEM=192M
+anita\:10.1-sparc64-build: QEMU_RUNTIME_MEM=512M
+
 anita\:10.0-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/10.0/All
 anita\:10.0-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-10.0/amd64/
 anita\:10.0-amd64-build: QEMU_DISK_SIZE=2G
@@ -13,12 +19,6 @@
 anita\:10.0-i386-build: QEMU_INSTALL_MEM=128M
 anita\:10.0-i386-build: QEMU_RUNTIME_MEM=256M
 
-anita\:9.3-sparc64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/sparc64/9.3/All
-anita\:9.3-sparc64-build: NETBSD_IMAGE=pub/NetBSD/iso/9.3/NetBSD-9.3-sparc64.iso
-anita\:9.3-sparc64-build: QEMU_DISK_SIZE=2G
-anita\:9.3-sparc64-build: QEMU_INSTALL_MEM=192M
-anita\:9.3-sparc64-build: QEMU_RUNTIME_MEM=512M
-
 anita\:9.3-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/9.3/All
 anita\:9.3-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-9.3/amd64/
 anita\:9.3-amd64-build: QEMU_DISK_SIZE=2G
@@ -31,17 +31,7 @@
 anita\:9.3-i386-build: QEMU_INSTALL_MEM=128M
 anita\:9.3-i386-build: QEMU_RUNTIME_MEM=256M
 
-anita\:8.2-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/8.2/All
-anita\:8.2-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-8.2/amd64/
-anita\:8.2-amd64-build: QEMU_DISK_SIZE=2G
-anita\:8.2-amd64-build: QEMU_INSTALL_MEM=192M
-anita\:8.2-amd64-build: QEMU_RUNTIME_MEM=512M
 
-anita\:8.2-i386-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/i386/8.2/All
-anita\:8.2-i386-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-8.2/i386/
-anita\:8.2-i386-build: QEMU_DISK_SIZE=2G
-anita\:8.2-i386-build: QEMU_INSTALL_MEM=128M
-anita\:8.2-i386-build: QEMU_RUNTIME_MEM=256M
 
 $(addsuffix -build,$(ANITA_TAGS)): %-build: Dockerfile.anita anita-wrapper.sh
 	$(QUIET_SETUP)docker build . -f $< -t mani/$* \
diff --git a/util/manibuilder/Makefile.targets b/util/manibuilder/Makefile.targets
index 02a3c3b..2f949cb 100644
--- a/util/manibuilder/Makefile.targets
+++ b/util/manibuilder/Makefile.targets
@@ -1,7 +1,6 @@
 ANITA_TAGS := \
-	anita\:10.0-amd64 anita\:10.0-i386 \
-	anita\:9.3-amd64 anita\:9.3-i386 anita\:9.3-sparc64 \
-	anita\:8.2-amd64 anita\:8.2-i386 \
+	anita\:10.1-sparc64 anita\:10.0-amd64 anita\:10.0-i386 \
+	anita\:9.3-amd64 anita\:9.3-i386 \
 
 MULTIARCH_TAGS := \
 	$(foreach a,x86_64 aarch64 ppc64le s390x, \