diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9b406830..7da903a2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,15 +21,15 @@ jobs:
 
       - uses: actions/checkout@v1
 
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
-        with:
-          buildx-version: latest
-          qemu-version: latest
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v1
 
       - name: Available platforms
-        run: echo ${{ steps.buildx.outputs.platforms }}
+        run: echo ${{steps.qemu.outputs.platforms}}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
 
       - name: Prepare Host
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 04704734..3c8a67f2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,15 +27,15 @@ jobs:
         run: |
           make version
 
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
-        with:
-          buildx-version: latest
-          qemu-version: latest
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v1
 
       - name: Available platforms
-        run: echo ${{ steps.buildx.outputs.platforms }}
+        run: echo ${{steps.qemu.outputs.platforms}}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
 
       - name: Publish to GitHub Container Registry
         env: