diff --git a/.travis.yml b/.travis.yml
index 60bbc2b..f562aec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,10 @@ before_script:
   - go get -u -v github.com/estesp/manifest-tool
   
 script:
-  - (cd gitea && ./build.sh)
   - (cd archlinux && ./build.sh)
+  - (cd gitea && chmod +x ./buildx.sh && ./buildx.sh)
 
 after_success:
-  - $GOPATH/bin/manifest-tool --docker-cfg $HOME/.docker/ push from-spec gitea/gitea-multi.yml
   - $GOPATH/bin/manifest-tool --docker-cfg $HOME/.docker/ push from-spec archlinux/archlinux-multi.yml
   - $GOPATH/bin/manifest-tool --docker-cfg $HOME/.docker/ push from-spec alpine-multi/alpine-multi.yml
   - $GOPATH/bin/manifest-tool --docker-cfg $HOME/.docker/ push from-spec alpine-multi/alpine-multi-edge.yml
diff --git a/gitea/build.sh b/gitea/build.sh
deleted file mode 100755
index cb01fe7..0000000
--- a/gitea/build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-git clone https://github.com/go-gitea/gitea --depth 10
-cd gitea
-git fetch origin pull/3958/head:docker-multiarch 
-git checkout docker-multiarch
-
-DOCKER_IMAGE=sapk/gitea TARGET=amd64 GOARCH=amd64 QEMU_ARCH=amd64 make docker-cross
-DOCKER_IMAGE=sapk/gitea TARGET=arm64v8 GOARCH=arm64 QEMU_ARCH=aarch64 make docker-cross
-DOCKER_IMAGE=sapk/gitea TARGET=arm32v6 GOARCH=arm QEMU_ARCH=arm make docker-cross
-
-docker push sapk/gitea:latest-linux-amd64 
-docker push sapk/gitea:latest-linux-arm 
-docker push sapk/gitea:latest-linux-arm64 
diff --git a/gitea/buildx.sh b/gitea/buildx.sh
new file mode 100644
index 0000000..a5194f4
--- /dev/null
+++ b/gitea/buildx.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+#Setup buildx
+export DOCKER_CLI_EXPERIMENTAL=enabled
+export DOCKER_BUILDKIT=1
+docker build --platform=local -o . git://github.com/docker/buildx
+mv buildx ~/.docker/cli-plugins/docker-buildx
+
+#Setup gitea
+git clone https://github.com/go-gitea/gitea --depth 10
+cd gitea
+
+#Building
+docker buildx build -t sapk/gitea --push --platform=linux/amd64,linux/arm64,linux/arm/v6 .
diff --git a/gitea/gitea-multi.yml b/gitea/gitea-multi.yml
deleted file mode 100644
index eda6421..0000000
--- a/gitea/gitea-multi.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-image: sapk/gitea:latest
-manifests:
-  - image: sapk/gitea:latest-linux-amd64
-    platform:
-      architecture: amd64
-      os: linux
-  - image: sapk/gitea:latest-linux-arm
-    platform:
-      architecture: arm
-      os: linux
-  - image: sapk/gitea:latest-linux-arm64
-    platform:
-      architecture: arm64
-      os: linux