diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 9e4a998e..f5b01d49 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -53,7 +53,7 @@ jobs:
           git commit -a -m "fix(lint): auto-fix [ci]"
           git push
 
-  build:
+  build-and-test:
     needs: lint
     name: build
     runs-on: ubuntu-latest
@@ -84,3 +84,9 @@ jobs:
 
       - name: Build project
         run: yarn build
+
+      - name: Build Docker
+        run: yarn docker:build
+
+      - name: Test
+        run: yarn test
diff --git a/package.json b/package.json
index ba7844c0..977fb49b 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "lint": "eslint . --ext .ts --fix",
     "build": "run-s codegen && graph build",
-    "build:docker": "docker build -t matchstick .",
+    "docker:build": "docker build -t matchstick .",
     "buildonly": "graph build",
     "deploy:alchemy": "graph deploy --node https://subgraphs.alchemy.com/api/subgraphs/deploy --ipfs https://ipfs.satsuma.xyz",
     "codegen": "graph codegen --output-dir src/types/",