diff --git a/Makefile b/Makefile
index d443b9e6bc..5c52afa2c8 100644
--- a/Makefile
+++ b/Makefile
@@ -316,7 +316,7 @@ test-pkg/%: $(SOURCE_GENERATED) ## Trigger packaging test
 	go test -v -test.timeout=60m ./$* --tags="$(MINIKUBE_BUILD_TAGS)"
 
 .PHONY: all
-all: cross drivers e2e-cross cross-tars exotic out/gvisor-addon ## Build all different minikube components
+all: cross drivers e2e-cross cross-tars exotic retro out/gvisor-addon ## Build all different minikube components
 
 .PHONY: drivers
 drivers: docker-machine-driver-hyperkit docker-machine-driver-kvm2 ## Build Hyperkit and KVM2 drivers
@@ -409,6 +409,9 @@ cross: minikube-linux-amd64 minikube-darwin-amd64 minikube-windows-amd64.exe ##
 .PHONY: exotic
 exotic: out/minikube-linux-arm out/minikube-linux-arm64 out/minikube-linux-ppc64le out/minikube-linux-s390x ## Build minikube for non-amd64 linux
 
+.PHONY: retro
+retro: out/minikube-linux-386 out/minikube-linux-armv6 ## Build minikube for legacy 32-bit linux
+
 .PHONY: windows
 windows: minikube-windows-amd64.exe ## Build minikube for Windows 64bit
 
diff --git a/hack/jenkins/release_build_and_upload.sh b/hack/jenkins/release_build_and_upload.sh
index 19f55e0a6c..a8e74df90d 100755
--- a/hack/jenkins/release_build_and_upload.sh
+++ b/hack/jenkins/release_build_and_upload.sh
@@ -75,6 +75,7 @@ fi
 
 # Don't upload temporary copies, avoid unused duplicate files in the release storage
 rm -f out/minikube-linux-x86_64
+rm -f out/minikube-linux-i686
 rm -f out/minikube-linux-aarch64
 rm -f out/minikube-linux-armhf
 rm -f out/minikube-linux-armv7hl