diff --git a/.travis.yml b/.travis.yml
index 28deddb..019bc42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,3 @@
-sudo: required
-dist: xenial
 language: go
 go:
   - "1.11.5"
@@ -10,15 +8,6 @@ notifications:
 services:
   - docker
 
-addons:
-  apt:
-    packages:
-     - mingw-w64
-     - gcc-aarch64-linux-gnu
-     - g++-aarch64-linux-gnu
-     - gcc-arm-linux-gnueabihf
-     - g++-arm-linux-gnueabihf
-
 env:
   - GO111MODULE=on
 
@@ -46,10 +35,7 @@ before_deploy:
       if [[ $TRAVIS_TAG != "v"* ]]; then exit 1; fi;
       export VERSION=$(echo $TRAVIS_TAG | cut -c 2-);
       export LD_FLAGS="-w -s -X main.Version=${VERSION} -X main.BuildDate=$(date "+%F-%T") -X main.Commit=$(git rev-parse --verify HEAD) -X main.Mode=prod";
-      go build -ldflags="$LD_FLAGS" -o build/gotify-linux-amd64;
-      CC=x86_64-w64-mingw32-gcc  CXX=x86_64-w64-mingw32-g++  CGO_ENABLED=1 GOOS=windows GOARCH=amd64       go build -ldflags="$LD_FLAGS" -o build/gotify-windows-amd64.exe;
-      CC=aarch64-linux-gnu-gcc   CXX=aarch64-linux-gnu-g++   CGO_ENABLED=1 GOOS=linux   GOARCH=arm64       go build -ldflags="$LD_FLAGS" -o build/gotify-linux-arm64;
-      CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ CGO_ENABLED=1 GOOS=linux   GOARCH=arm GOARM=7 go build -ldflags="$LD_FLAGS" -o build/gotify-linux-arm-7;
+      make build
       make package-zip;
       ls -lath build;
       make build-docker;
@@ -67,4 +53,4 @@ deploy:
     script: bash docker-push.sh
     skip_cleanup: true
     on:
-        tags: true
+      tags: true
diff --git a/Makefile b/Makefile
index e254ed8..c2d031f 100644
--- a/Makefile
+++ b/Makefile
@@ -77,4 +77,18 @@ build-docker: require-version
 build-js:
 	(cd ui && npm run build)
 
-.PHONY: test-race test-coverage test check-go check-js verify-swagger check download-tools update-swagger package-zip build-docker build-js
\ No newline at end of file
+build-linux-amd64:
+	docker run --rm -v "$$PWD/.:/proj" -w /proj gotify/build:v1-linux-amd64 go build -a -installsuffix cgo -ldflags "$$LD_FLAGS" -o build/gotify-linux-amd64 /proj
+
+build-linux-arm-7:
+	docker run --rm -v "$$PWD/.:/proj" -w /proj gotify/build:v1-linux-arm-7 go build -a -installsuffix cgo -ldflags "$$LD_FLAGS" -o build/gotify-linux-arm-7 /proj
+
+build-linux-arm64:
+	docker run --rm -v "$$PWD/.:/proj" -w /proj gotify/build:v1-linux-arm64 go build -a -installsuffix cgo -ldflags "$$LD_FLAGS" -o build/gotify-linux-arm64 /proj
+
+build-windows-amd64:
+	docker run --rm -v "$$PWD/.:/proj" -w /proj gotify/build:v1-windows-amd64 go build -a -installsuffix cgo -ldflags "$$LD_FLAGS" -o build/gotify-windows-amd64.exe /proj
+
+build: build-linux-arm-7 build-linux-amd64 build-linux-arm64 build-windows-amd64
+
+.PHONY: test-race test-coverage test check-go check-js verify-swagger check download-tools update-swagger package-zip build-docker build-js build
\ No newline at end of file