diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d0f3762..1f6d4db 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -9,19 +9,30 @@ on:
     - cron: "0 0 * * 1"
 
 jobs:
-  build:
+  deploy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Deploy Image
-        run: bash scripts/build-push.sh
-        env:
-          NAME: latest
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Get date for tags
+        run: echo "DATE_TAG=$(date -I)" >> "$GITHUB_ENV"
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            tiangolo/nginx-rtmp:${{ matrix.image.name }}
+            tiangolo/nginx-rtmp:${{ matrix.image.name }}-${{ env.DATE_TAG }} 
       - name: Docker Hub Description
         uses: peter-evans/dockerhub-description@v4
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
           repository: tiangolo/nginx-rtmp
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 327aed0..17b7c02 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,18 +13,22 @@ on:
     - cron: "0 0 * * 1"
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       - name: Build Image
-        run: bash scripts/build.sh
-        env:
-          NAME: latest
+        uses: docker/build-push-action@v2
+        with:
+          push: false
+          tags: tiangolo/nginx-rtmp:latest
+          platforms: linux/amd64,linux/arm64
   check:
     if: always()
     needs:
-    - build
+    - test
     runs-on: ubuntu-latest
     steps:
     - name: Decide whether the needed jobs succeeded or failed
diff --git a/scripts/build-push.sh b/scripts/build-push.sh
deleted file mode 100644
index 6653cdb..0000000
--- a/scripts/build-push.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-use_tag="tiangolo/nginx-rtmp:$NAME"
-use_dated_tag="${use_tag}-$(date -I)"
-
-bash scripts/build.sh
-
-docker tag "$use_tag" "$use_dated_tag"
-
-bash scripts/docker-login.sh
-
-docker push "$use_tag"
-docker push "$use_dated_tag"
diff --git a/scripts/build.sh b/scripts/build.sh
deleted file mode 100644
index 1ee0a9b..0000000
--- a/scripts/build.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-use_tag="tiangolo/nginx-rtmp:$NAME"
-
-docker build -t "$use_tag" .
diff --git a/scripts/docker-login.sh b/scripts/docker-login.sh
deleted file mode 100644
index d872c89..0000000
--- a/scripts/docker-login.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin