diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
new file mode 100644
index 00000000..c8ca55a0
--- /dev/null
+++ b/.github/workflows/docker.yaml
@@ -0,0 +1,22 @@
+name: Docker Image
+on: [push]
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Inject slug/short variables
+        uses: rlespinasse/github-slug-action@v2.x
+      - name: Set variables
+        run: |
+          echo "::set-env name=REPOSITORY::$(echo $GITHUB_REPOSITORY | tr '[A-Z]' '[a-z]')"
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v1.1.0
+        with:
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+          registry: docker.pkg.github.com
+          repository: ${{ env.REPOSITORY }}/server
+          tag_with_sha: true
+          tag_with_ref: true
\ No newline at end of file
diff --git a/.github/workflows/ci.yaml b/.github/workflows/test.yaml
similarity index 64%
rename from .github/workflows/ci.yaml
rename to .github/workflows/test.yaml
index 46ba5565..f84ed4a7 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/test.yaml
@@ -1,4 +1,4 @@
-name: CI
+name: Test
 on: [push, pull_request]
 jobs:
   test:
@@ -43,23 +43,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: server.zip
-          path: server/target/server*.zip
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Inject slug/short variables
-        uses: rlespinasse/github-slug-action@v2.x
-      - name: Set variables
-        run: |
-          echo "::set-env name=REPOSITORY::$(echo $GITHUB_REPOSITORY | tr '[A-Z]' '[a-z]')"
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v1.1.0
-        with:
-          username: ${{ github.actor }}
-          password: ${{ github.token }}
-          registry: docker.pkg.github.com
-          repository: ${{ env.REPOSITORY }}/server
-          tag_with_sha: true
-          tag_with_ref: true
\ No newline at end of file
+          path: server/target/server*.zip
\ No newline at end of file