diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
deleted file mode 100644
index 11330e4..0000000
--- a/.github/workflows/docker-push.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Build and deploy Docker image(s)
-
-on:
-  push:
-    branches: 
-      - main
-
-jobs:
-  docker-deploy:
-    runs-on: self-hosted
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: 'recursive'
-          fetch-depth: 0
-          persist-credentials: false
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: yuuki-discord
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build and push the application
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
-          push: true
-          builder: builder
-          tags: |
-            yuukibot/yuukichan:latest
-            ghcr.io/yuuki-discord/yuuki-bot:latest
diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
deleted file mode 100644
index eceefa2..0000000
--- a/.github/workflows/docker-test.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Docker test build
-
-on:
-  push:
-    branches:    
-      - '**'        # matches every branch
-      - '!main'   # excludes main
-
-  pull_request:
-    branches:    
-      - '**'        # matches every branch
-
-
-jobs:
-  test-build-prod:
-    runs-on: self-hosted
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: 'recursive'
-          fetch-depth: 0
-      -
-        name: Build image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          builder: builder
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
-          push: false
-          tags: |
-            yuukibot/yuukichan:latest
-          
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000..6675817
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,128 @@
+name: Build
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:    
+      - '**'        # matches every branch
+
+env:
+  IMAGE_NAME: ghcr.io/yuuki-discord/yuuki-bot
+jobs:
+  docker:
+    name: Docker ${{ matrix.platform }}
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runner: ubicloud-standard-2
+            platform: linux/amd64
+          - runner: ubicloud-standard-2-arm
+            platform: linux/arm64,linux/arm/v6,linux/arm/v7
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+      
+      - name: Set default branch variable
+        run : |
+          if [[ $GITHUB_REF_NAME == 'main' ]]; then
+              echo "IS_MAIN_BRANCH=true" >> "$GITHUB_ENV"
+          else
+              echo "IS_MAIN_BRANCH=false" >> "$GITHUB_ENV"
+          fi
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      -
+        name: Login to GitHub Container Registry
+        if: github.ref == 'refs/heads/master'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: yuuki-discord
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.IMAGE_NAME }}
+          tags: |
+            type=sha,prefix=
+            type=ref,event=branch
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+
+      - name: Build and push by digest
+        id: build
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: ${{ matrix.platform }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha,scope=ubicloud-${{ matrix.runner }}
+          cache-to: type=gha,mode=max,scope=ubicloud-${{ matrix.runner }}
+          outputs: type=image,name=${{ env.IMAGE_NAME }},push-by-digest=${{env.IS_MAIN_BRANCH}},name-canonical=${{env.IS_MAIN_BRANCH}},push=${{env.IS_MAIN_BRANCH}}
+          provenance: false
+
+      - name: Export digest
+        if: github.ref == 'refs/heads/master'
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        if: github.ref == 'refs/heads/master'
+        uses: actions/upload-artifact@v4
+        with:
+          name: digests-${{ matrix.runner }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    if: github.ref == 'refs/heads/master'
+    runs-on: ubicloud
+    needs:
+      - docker
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          pattern: digests-*
+          merge-multiple: true
+          path: /tmp/digests
+      - 
+        name: Login to GitHub Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.PAT }}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.IMAGE_NAME }}
+          tags: |
+            type=sha,prefix=
+            type=ref,event=branch
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.IMAGE_NAME }}@sha256:%s ' *)
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}
\ No newline at end of file