diff --git a/releases/specs-qemu/mips/stage1-mips3-n32-systemd.spec b/releases/specs-qemu/mips/stage1-mips3-n32-systemd.spec
new file mode 100644
index 00000000..3b07b4a5
--- /dev/null
+++ b/releases/specs-qemu/mips/stage1-mips3-n32-systemd.spec
@@ -0,0 +1,14 @@
+subarch: mips3_n32
+target: stage1
+version_stamp: systemd-@TIMESTAMP@
+interpreter: /usr/bin/qemu-mipsn32
+rel_type: default
+profile: default/linux/mips/17.0/n32/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-mips3_n32-systemd-latest
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+update_seed: yes
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage1-mipsel3-n32-systemd.spec b/releases/specs-qemu/mips/stage1-mipsel3-n32-systemd.spec
new file mode 100644
index 00000000..283660b4
--- /dev/null
+++ b/releases/specs-qemu/mips/stage1-mipsel3-n32-systemd.spec
@@ -0,0 +1,14 @@
+subarch: mipsel3_n32
+target: stage1
+version_stamp: systemd-@TIMESTAMP@
+interpreter: /usr/bin/qemu-mipsn32el
+rel_type: default
+profile: default/linux/mips/17.0/mipsel/n32/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-mipsel3_n32-systemd-latest
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+update_seed: yes
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage3-mips3-n32-systemd.spec b/releases/specs-qemu/mips/stage3-mips3-n32-systemd.spec
new file mode 100644
index 00000000..f20b69aa
--- /dev/null
+++ b/releases/specs-qemu/mips/stage3-mips3-n32-systemd.spec
@@ -0,0 +1,12 @@
+subarch: mips3_n32
+target: stage3
+version_stamp: systemd-@TIMESTAMP@
+interpreter: /usr/bin/qemu-mipsn32
+rel_type: default
+profile: default/linux/mips/17.0/n32/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-mips3_n32-systemd-@TIMESTAMP@
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
diff --git a/releases/specs-qemu/mips/stage3-mipsel3-n32-systemd.spec b/releases/specs-qemu/mips/stage3-mipsel3-n32-systemd.spec
new file mode 100644
index 00000000..196fb06b
--- /dev/null
+++ b/releases/specs-qemu/mips/stage3-mipsel3-n32-systemd.spec
@@ -0,0 +1,12 @@
+subarch: mipsel3_n32
+target: stage3
+version_stamp: systemd-@TIMESTAMP@
+interpreter: /usr/bin/qemu-mipsn32el
+rel_type: default
+profile: default/linux/mips/17.0/mipsel/n32/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-mipsel3_n32-systemd-@TIMESTAMP@
+compression_mode: pixz
+decompressor_search_order: xz bzip2
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 141adf01..7312d6d1 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -6,9 +6,23 @@ UPLOAD_KEY=/root/.ssh/id_rsa
 SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
 EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
 
-SETS_BE="mips2_o32_openrc mips2_o32_systemd mips3n32openrc mips3multilibopenrc mips3n64openrc"
+SETS_BE="
+	mips2_o32_openrc
+	mips2_o32_systemd
+	mips3_n32_openrc
+	mips3_n32_systemd
+	mips3multilibopenrc mips3n64openrc
+"
 
-SETS_LE="mipsel2_o32_openrc mipsel2_o32_systemd mipsel3_o32_openrc mipsel3_o32_systemd mipsel3n32openrc mipsel3multilibopenrc mipsel3n64openrc mipsel3n64systemd mipsel3n64systemd_mu"
+SETS_LE="
+	mipsel2_o32_openrc
+	mipsel2_o32_systemd
+	mipsel3_o32_openrc
+	mipsel3_o32_systemd
+	mipsel3_n32_openrc
+	mipsel3_n32_systemd
+	mipsel3multilibopenrc mipsel3n64openrc mipsel3n64systemd mipsel3n64systemd_mu
+"
 
 # SETS="${SETS_BE} ${SETS_LE}"
 
@@ -21,8 +35,11 @@ SET_mipsel2_o32_systemd_SPECS="stage1-mipsel2-o32-systemd.spec stage3-mipsel2-o3
 SET_mipsel3_o32_openrc_SPECS="stage1-mipsel3-o32-openrc.spec stage3-mipsel3-o32-openrc.spec"
 SET_mipsel3_o32_systemd_SPECS="stage1-mipsel3-o32-systemd.spec stage3-mipsel3-o32-systemd.spec"
 
-SET_mips3n32openrc_SPECS="stage1-mips3-n32-openrc.spec stage3-mips3-n32-openrc.spec"
-SET_mipsel3n32openrc_SPECS="stage1-mipsel3-n32-openrc.spec stage3-mipsel3-n32-openrc.spec"
+SET_mips3_n32_openrc_SPECS="stage1-mips3-n32-openrc.spec stage3-mips3-n32-openrc.spec"
+SET_mips3_n32_systemd_SPECS="stage1-mips3-n32-systemd.spec stage3-mips3-n32-systemd.spec"
+
+SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec stage3-mipsel3-n32-openrc.spec"
+SET_mipsel3_n32_systemd_SPECS="stage1-mipsel3-n32-systemd.spec stage3-mipsel3-n32-systemd.spec"
 
 SET_mips3multilibopenrc_SPECS="stage1-mips3-multilib-openrc.spec stage3-mips3-multilib-openrc.spec"
 SET_mipsel3multilibopenrc_SPECS="stage1-mipsel3-multilib-openrc.spec stage3-mipsel3-multilib-openrc.spec"
@@ -68,12 +85,6 @@ post_build() {
 	stage3-mipsel2-o32-systemd.spec)
 		upload stage3-mipsel2-systemd-${TIMESTAMP}.tar.xz*
 		;;
-	stage3-mips32-o32-openrc.spec)
-		upload stage3-mips32-openrc-${TIMESTAMP}.tar.xz*
-		;;
-	stage3-mips32el-o32-openrc.spec)
-		upload stage3-mips32el-openrc-${TIMESTAMP}.tar.xz*
-		;;
 	stage3-mipsel3-o32-openrc.spec)
 		upload stage3-mipsel3-openrc-${TIMESTAMP}.tar.xz*
 		;;
@@ -83,12 +94,18 @@ post_build() {
 	stage3-mips3-n32-openrc.spec)
 		upload stage3-mips3_n32-openrc-${TIMESTAMP}.tar.xz*
 		;;
+	stage3-mips3-n32-systemd.spec)
+		upload stage3-mips3_n32-systemd-${TIMESTAMP}.tar.xz*
+		;;
 	stage3-mips3-multilib-openrc.spec)
 		upload stage3-mips3_multilib-openrc-${TIMESTAMP}.tar.xz*
 		;;
 	stage3-mipsel3-n32-openrc.spec)
 		upload stage3-mipsel3_n32-openrc-${TIMESTAMP}.tar.xz*
 		;;
+	stage3-mipsel3-n32-systemd.spec)
+		upload stage3-mipsel3_n32-systemd-${TIMESTAMP}.tar.xz*
+		;;
 	stage3-mipsel3-multilib-openrc.spec)
 		upload stage3-mipsel3_multilib-openrc-${TIMESTAMP}.tar.xz*
 		;;
@@ -101,27 +118,6 @@ post_build() {
 	stage3-mipsel3-n64-systemd.spec)
 		upload stage3-mipsel3_n64-systemd-${TIMESTAMP}.tar.xz*
 		;;
-	stage3-mips64-n32-openrc.spec)
-		upload stage3-mips64_n32-openrc-${TIMESTAMP}.tar.xz*
-		;;
-	stage3-mips64-multilib-openrc.spec)
-		upload stage3-mips64_multilib-openrc-${TIMESTAMP}.tar.xz*
-		;;
-	stage3-mips64el-n32-openrc.spec)
-		upload stage3-mips64el_n32-openrc-${TIMESTAMP}.tar.xz*
-		;;
-	stage3-mips64el-multilib-openrc.spec)
-		upload stage3-mips64el_multilib-openrc-${TIMESTAMP}.tar.xz*
-		;;
-	stage3-mips64-n64-openrc.spec)
-		upload stage3-mips64_n64-openrc-${TIMESTAMP}.tar.xz*
-		;;
-	stage3-mips64el-n64-openrc.spec)
-		upload stage3-mips64el_n64-openrc-${TIMESTAMP}.tar.xz*
-		;;
-	stage3-mips64el-n64-systemd.spec)
-		upload stage3-mips64el_n64-systemd-${TIMESTAMP}.tar.xz*
-		;;
 	esac
 	popd >/dev/null