diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4cd3fd5..8136bf6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,8 +2,8 @@ name: Test and Build
 on: [push]
 
 jobs:
-  go-test:
-    name: Test and Build
+  test:
+    name: Test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
@@ -18,17 +18,26 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
           REDIS_URL: redis://localhost:${{ job.services.redis.ports['6379'] }}
-      - name: Build Docker Images
-        run: |
-          docker build -t docker.pkg.github.com/${{ secrets.REGISTORY_USER }}/activity-relay/activity-relay:edge .
-          docker tag docker.pkg.github.com/${{ secrets.REGISTORY_USER }}/activity-relay/activity-relay:edge docker.pkg.github.com/${{ secrets.REGISTORY_USER }}/activity-relay/activity-relay:$(echo ${GITHUB_SHA}|head -c7)
-      - name: Push Docker Images to GitHub Packages
-        run: |
-          docker login docker.pkg.github.com -u ${{ secrets.REGISTORY_USER }} -p ${{ secrets.GITHUB_TOKEN }}
-          docker push docker.pkg.github.com/${{ secrets.REGISTORY_USER }}/activity-relay/activity-relay:edge
-          docker push docker.pkg.github.com/${{ secrets.REGISTORY_USER }}/activity-relay/activity-relay:$(echo ${GITHUB_SHA}|head -c7)
     services:
       redis:
         image: redis
         ports:
           - 6379/tcp
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Build Docker Images
+        run: |
+          docker build -t activity-relay:$(echo ${GITHUB_SHA}|head -c7) .
+      - name: Push Docker Images to DockerHub
+        run: |
+          docker login -u ${{ secrets.REGISTORY_USER }} -p ${{ secrets.REGISTORY_PASS }}
+          docker tag activity-relay:$(echo ${GITHUB_SHA}|head -c7) ${{ secrets.REGISTORY_USER }}/activity-relay:$(echo ${GITHUB_SHA}|head -c7)
+          docker push ${{ secrets.REGISTORY_USER }}/activity-relay:$(echo ${GITHUB_SHA}|head -c7)
+      - name: Push Docker Images to GitHub Packages
+        run: |
+          docker login docker.pkg.github.com -u ${{ secrets.REGISTORY_USER }} -p ${{ secrets.GITHUB_TOKEN }}
+          docker tag activity-relay:$(echo ${GITHUB_SHA}|head -c7) docker.pkg.github.com/${{ secrets.REGISTORY_USER }}/activity-relay/activity-relay:$(echo ${GITHUB_SHA}|head -c7)
+          docker push docker.pkg.github.com/${{ secrets.REGISTORY_USER }}/activity-relay/activity-relay:$(echo ${GITHUB_SHA}|head -c7)
diff --git a/readme.md b/readme.md
index f5f6b2f..e31275e 100644
--- a/readme.md
+++ b/readme.md
@@ -2,7 +2,7 @@
 
 ## Yet another powerful customizable ActivityPub relay server written in Go.
 
-[![GitHub Actions](https://github.com/yukimochi/activity-relay/workflows/Test%20and%20Build/badge.svg)](https://github.com/yukimochi/Activity-Relay)
+[![GitHub Actions](https://github.com/yukimochi/activity-relay/workflows/Test/badge.svg)](https://github.com/yukimochi/Activity-Relay)
 [![codecov](https://codecov.io/gh/yukimochi/Activity-Relay/branch/master/graph/badge.svg)](https://codecov.io/gh/yukimochi/Activity-Relay)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fyukimochi%2FActivity-Relay.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fyukimochi%2FActivity-Relay?ref=badge_shield)