diff --git a/Makefile b/Makefile
index 87f5cabd0..92b8707fe 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,10 @@ LINUXKIT?=bin/linuxkit
 GOOS?=$(shell uname -s | tr '[:upper:]' '[:lower:]')
 GOARCH?=amd64
 ifneq ($(GOOS),linux)
-CROSS=-e GOOS=$(GOOS) -e GOARCH=$(GOARCH)
+CROSS+=-e GOOS=$(GOOS)
+endif
+ifneq ($(GOARCH),amd64)
+CROSS+=-e GOARCH=$(GOARCH)
 endif
 
 PREFIX?=/usr/local/
@@ -55,6 +58,12 @@ collect-artifacts: artifacts/test.img.tar.gz artifacts/test-ltp.img.tar.gz
 
 .PHONY: ci ci-tag ci-pr
 ci:
+	$(MAKE) clean
+	$(MAKE) GOOS=darwin
+	$(MAKE) clean
+	$(MAKE) GOOS=linux
+	$(MAKE) clean
+	$(MAKE) GOOS=windows
 	$(MAKE) clean
 	$(MAKE)
 	$(MAKE) install
@@ -62,6 +71,12 @@ ci:
 	$(MAKE) -C pkg tag
 
 ci-tag:
+	$(MAKE) clean
+	$(MAKE) GOOS=darwin
+	$(MAKE) clean
+	$(MAKE) GOOS=linux
+	$(MAKE) clean
+	$(MAKE) GOOS=windows
 	$(MAKE) clean
 	$(MAKE)
 	$(MAKE) install
@@ -69,6 +84,12 @@ ci-tag:
 	$(MAKE) -C pkg tag
 
 ci-pr:
+	$(MAKE) clean
+	$(MAKE) GOOS=darwin
+	$(MAKE) clean
+	$(MAKE) GOOS=linux
+	$(MAKE) clean
+	$(MAKE) GOOS=windows
 	$(MAKE) clean
 	$(MAKE)
 	$(MAKE) install