diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cf250b7..adde68c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,5 @@
 name: ci
-on: [push, pull_request]
+on: [push]
 jobs:
   build:
     name: Build
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index acff39f..1cab9d2 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,30 +1,39 @@
 name: deploy
+
 on:
-  push:
-    branches: [ master ]
   push:
     tags:
       - '*'
 
 jobs:
   build:
-    name: Build
     runs-on: ubuntu-latest
     steps:
-
-    - name: Check out code into the Go module directory
+    - name: Checkout
       uses: actions/checkout@v1
       with:
         submodules: true
+
     - name: Set env
       run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
-    - name: docker
-      env:
-        DOCKER_USER: ${{secrets.DOCKER_USER}}
-        DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
-      run: |
-        docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-        docker build -t pldubouilh/gossa:latest -t pldubouilh/gossa:$GIT_TAG -f support/build.Dockerfile .
-        docker push pldubouilh/gossa:latest
-        docker push pldubouilh/gossa:$GIT_TAG
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1.2.0
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1.6.0
+
+    - name: Login to DockerHub
+      uses: docker/login-action@v1.10.0
+      with:
+        username: ${{ secrets.DOCKER_USER }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Build and push
+      uses: docker/build-push-action@v2.7.0
+      with:
+        file: support/build.Dockerfile
+        push: true
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+        tags: pldubouilh/gossa:latest,pldubouilh/gossa:$GIT_TAG
 
diff --git a/readme.md b/readme.md
index ff8ad4b..cc08ba3 100644
--- a/readme.md
+++ b/readme.md
@@ -4,7 +4,6 @@ gossa
 ![e](https://user-images.githubusercontent.com/760637/71449335-790a4200-274a-11ea-80be-4c536fbad8a1.gif)
 
 [![build status](https://github.com/pldubouilh/gossa/workflows/ci/badge.svg)](https://github.com/pldubouilh/gossa/actions)
-[![docker build status](https://img.shields.io/docker/cloud/build/pldubouilh/gossa.svg?logo=docker)](https://hub.docker.com/r/pldubouilh/gossa)
 [![docker pulls](https://img.shields.io/docker/pulls/pldubouilh/gossa.svg?logo=docker)](https://hub.docker.com/r/pldubouilh/gossa)
 [![github downloads](https://img.shields.io/github/downloads/pldubouilh/gossa/total.svg?logo=github)](https://github.com/pldubouilh/gossa/releases)