diff --git a/.github/workflows/build-tshock.yml b/.github/workflows/build-tshock.yml
index 136a2ca..d2bb2a9 100644
--- a/.github/workflows/build-tshock.yml
+++ b/.github/workflows/build-tshock.yml
@@ -13,12 +13,21 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Publish TShock
-        uses: elgohr/Publish-Docker-Github-Action@master
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
-          name: ryshe/terraria
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          dockerfile: tshock/Dockerfile
-          tags: "tshock-latest"
-          tag_names: true
\ No newline at end of file
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: ./tshock
+          file: tshock/Dockerfile
+          platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le
+          push: true
+          tags: |
+            ryshe/terraria:tshock-latest
diff --git a/.github/workflows/build-vanilla.yml b/.github/workflows/build-vanilla.yml
index 2e02e5f..2c82f60 100644
--- a/.github/workflows/build-vanilla.yml
+++ b/.github/workflows/build-vanilla.yml
@@ -13,12 +13,21 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Publish TShock
-        uses: elgohr/Publish-Docker-Github-Action@master
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
-          name: ryshe/terraria
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          dockerfile: vanilla/Dockerfile
-          tags: "vanilla-latest"
-          tag_names: true
\ No newline at end of file
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: ./vanilla
+          file: vanilla/Dockerfile
+          platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le
+          push: true
+          tags: |
+            ryshe/terraria:vanilla-latest