diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index 95eb18a6fced..3c82eea5b514 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -46,7 +46,7 @@ jobs:
           cache-from: type=registry,ref=ghcr.io/type4ny-project/type4ny:buildcache
           cache-to: type=registry,ref=ghcr.io/type4ny-project/type4ny:buildcache,mode=max
           tags: |
-            ghcr.io/type4ny-project/type4ny:latest
+            ghcr.io/type4ny-project/type4ny:develop
             ghcr.io/type4ny-project/type4ny:${{ env.FORMATTED_BRANCH_NAME }}
 
 # https://github.com/MisskeyIO/misskey/blob/io/.github/workflows/docker-io.yml
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 28049cd1a4ac..faeb090c4065 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,105 +1,52 @@
-name: Publish Docker image
+name: Build And Push Container Image
 
 on:
-  release:
-    types: [published]
-  workflow_dispatch:
-
-env:
-  REGISTRY_IMAGE: mattyacocacora/prsmsk-msk
-  TAGS: |
-    type=edge
-    type=ref,event=pr
-    type=ref,event=branch
-    type=semver,pattern={{version}}
-    type=semver,pattern={{major}}.{{minor}}
-    type=semver,pattern={{major}}
+  push:
+    branches:
+      - main
 
 jobs:
-  # see https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
-  build:
-    name: Build
+  build-and-push:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
+    if: github.repository == 'type4ny-project/type4ny'
+    permissions:
+      contents: read
+      packages: write
     steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
       - name: Check out the repo
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4
       - name: Set up Docker Buildx
+        id: buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          platforms: linux/amd64
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY_IMAGE }}
-          tags: ${{ env.TAGS }}
-      - name: Log in to Docker Hub
+          images: ghcr.io/type4ny-project/type4ny
+      - name: Log in to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and Push to Docker Hub
-        id: build
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Prepare image tags
+        run: |
+          echo "FORMATTED_BRANCH_NAME=$(echo ${{ github.ref_name }} | sed -e 's/\//-/g' )" >> $GITHUB_ENV
+      - name: Build and Push to GitHub Container Registry
         uses: docker/build-push-action@v6
         with:
+          builder: ${{ steps.buildx.outputs.name }}
           context: .
           push: true
-          platforms: ${{ matrix.platform }}
+          platforms: ${{ steps.buildx.outputs.platforms }}
           provenance: false
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-${{ env.PLATFORM_PAIR }}
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
+          labels: ${{ env.FORMATTED_BRANCH_NAME }}
+          cache-from: type=registry,ref=ghcr.io/type4ny-project/type4ny:buildcache
+          cache-to: type=registry,ref=ghcr.io/type4ny-project/type4ny:buildcache,mode=max
+          tags: |
+            ghcr.io/type4ny-project/type4ny:latest
+            ghcr.io/type4ny-project/type4ny:${{ env.FORMATTED_BRANCH_NAME }}
 
-  merge:
-    runs-on: ubuntu-latest
-    needs:
-      - build
-    steps:
-      - name: Download digests
-        uses: actions/download-artifact@v4
-        with:
-          path: /tmp/digests
-          pattern: digests-*
-          merge-multiple: true
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY_IMAGE }}
-          tags: ${{ env.TAGS }}
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - 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.REGISTRY_IMAGE }}@sha256:%s ' *)
-      - name: Inspect image
-        run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+# https://github.com/MisskeyIO/misskey/blob/io/.github/workflows/docker-io.yml