diff --git a/build.sh b/build.sh
index ca7c8a671649d127f5c6f8109c6fd37ed89a691f..72a2253a40b0bc4667167aadffae738c09a781fa 100755
--- a/build.sh
+++ b/build.sh
@@ -110,7 +110,6 @@ configure_user(){
     # Allow the builder user to run rootless podman
     # Referenced at: https://github.com/containers/podman/issues/4056#issuecomment-1245715492
     # Lifted from: https://github.com/containers/podman/blob/6e382d9ec2e6eb79a72537544341e496368b6c63/contrib/podmanimage/stable/Containerfile#L25-L26
-    echo -e "builder:1:999\nbuilder:1001:64535" > /etc/subuid
     echo -e "builder:1:999\nbuilder:1001:64535" > /etc/subgid
 }
 
diff --git a/mantle/Makefile b/mantle/Makefile
index b7edb6a3f2b30323c8ed45c97ad0eedd2c3b0c9d..bd9fe7766b2645a669cc4358918756059c9def1f 100644
--- a/mantle/Makefile
+++ b/mantle/Makefile
@@ -2,14 +2,14 @@ PREFIX ?= /usr
 DESTDIR ?=
 
 MANTLE_BINARIES := ore kola plume
-KOLET_ARCHES := aarch64 ppc64le s390x x86_64
+#KOLET_ARCHES := aarch64 ppc64le s390x x86_64
+KOLET_ARCHES := aarch64 x86_64
 
 .PHONY: build
-build: $(MANTLE_BINARIES) #kolet
+build: $(MANTLE_BINARIES) kolet
 
-.PHONY: $(MANTLE_BINARIES) #kolet
-#$(MANTLE_BINARIES) kolet:
-$(MANTLE_BINARIES):
+.PHONY: $(MANTLE_BINARIES) kolet
+$(MANTLE_BINARIES) kolet:
 	./build cmd/$(basename $@)
 
 .PHONY: schema-update
@@ -19,7 +19,7 @@ schema-update:
 .PHONY: install
 install:
 	cd bin && install -D -t $(DESTDIR)$(PREFIX)/bin $(MANTLE_BINARIES)
-#	for arch in $(KOLET_ARCHES); do \
+	for arch in $(KOLET_ARCHES); do \
 		install -D -m 0755 -t $(DESTDIR)$(PREFIX)/lib/kola/$${arch} bin/$${arch}/kolet; \
 	done
 
@@ -38,4 +38,4 @@ vendor:
 
 .PHONY: clean
 clean:
-	@rm -rfv bin
+	@rm -rfv bin
\ No newline at end of file
diff --git a/mantle/build b/mantle/build
index 4bd43f8c530ac0ef70946703e7413abcd3245556..8250999436bf1bea8b670490c1165a1bc9cb0b7a 100755
--- a/mantle/build
+++ b/mantle/build
@@ -11,7 +11,8 @@ if [[ $# -eq 0 ]]; then
 fi
 
 declare -A BASEARCH_TO_GOARCH=([s390x]=s390x [x86_64]=amd64 [aarch64]=arm64 [ppc64le]=ppc64le)
-KOLET_ARCHES="${KOLET_ARCHES:-s390x x86_64 aarch64 ppc64le}"
+#KOLET_ARCHES="${KOLET_ARCHES:-s390x x86_64 aarch64 ppc64le}"
+KOLET_ARCHES="${KOLET_ARCHES:-x86_64 aarch64}"
 
 race=
 if [ -n "${ENABLE_GO_RACE_DETECTOR:-}" ] && [[ ! "$(uname -m)" =~ "s390" ]]; then