diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 5b550c4..bc03a95 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build for linux
-        run: go build -trimpath -ldflags=-buildid=
+        run: sudo make docker-build-linux
 
       - name: Upload binary artifact
         uses: actions/upload-artifact@v2
@@ -44,7 +44,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build for windows
-        run: GOOS=windows go build -trimpath -ldflags="-H windowsgui -buildid="
+        run: sudo make docker-build-windows
 
       - name: Upload binary artifact
         uses: actions/upload-artifact@v2
@@ -68,11 +68,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Build for OSX (amd64)
-        run: GOARCH="amd64" go build -trimpath -ldflags=-buildid= && mv catchat catchat-macos-amd64
-
-      - name: Build for OSX (arm64)
-        run: CGO_ENABLED=1 GOOS="darwin" GOARCH="arm64" go build -trimpath -ldflags=-buildid= -tags dynamic && mv catchat catchat-macos-arm64
+      - name: Build for MacOS
+        run: sudo make docker-build-macos
 
       - name: Upload binary artifact
         uses: actions/upload-artifact@v2
diff --git a/Makefile b/Makefile
index 331d041..ae07c2b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,12 @@
 docker-build-linux: docker-go-mod
-	docker run --rm -v "$(shell readlink -f .)":/go/catchat/ -it catchat/go_mod bash -c 'cd /go/catchat/; go build -trimpath -ldflags=-buildid='
+	docker run --rm -v "$(shell readlink -f .)":/go/catchat/ catchat/go_mod bash -c 'cd /go/catchat/; go build -trimpath -ldflags=-buildid='
+
+docker-build-windows: docker-go-mod
+	docker run --rm -v "$(shell readlink -f .)":/go/catchat/ catchat/go_mod bash -c 'cd /go/catchat/; GOOS=windows go build -trimpath -ldflags="-H windowsgui -buildid=" -o catchat.exe'
+
+docker-build-macos: docker-go-mod
+	docker run --rm -v "$(shell readlink -f .)":/go/catchat/ catchat/go_mod bash -c 'cd /go/catchat/; GOARCH="amd64" go build -trimpath -ldflags=-buildid= -o catchat-macos-amd64'
+	docker run --rm -v "$(shell readlink -f .)":/go/catchat/ catchat/go_mod bash -c 'cd /go/catchat/; CGO_ENABLED=1 GOOS="darwin" GOARCH="arm64" go build -trimpath -ldflags=-buildid= -tags dynamic -o catchat-macos-arm64'
 
 docker-debian-base:
 	if ! docker images|grep catchat/debian_base; then \