diff --git a/.github/workflows/mjolnir.yml b/.github/workflows/mjolnir.yml
index ce31095..e7d0066 100644
--- a/.github/workflows/mjolnir.yml
+++ b/.github/workflows/mjolnir.yml
@@ -11,11 +11,38 @@ env:
 
 jobs:
   build:
+    name: Build & Lint
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Specifically use node 16 like in the readme. 
+      uses: actions/setup-node@v3
+      with:
+        node-version: '16'
+    - run: yarn install
+    - run: yarn build
+    - run: yarn lint
+  unit:
+    name: Unit tests
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Specifically use node 16 like in the readme. 
+      uses: actions/setup-node@v3
+      with:
+        node-version: '16'
+    - run: yarn install
+    - run: yarn test
+  integration:
     name: Integration tests
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: '16'
     - name: install mx-tester
       run: cargo install mx-tester
     - name: Setup image
diff --git a/Dockerfile b/Dockerfile
index 08781f0..02b650d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14-alpine
+FROM node:16-alpine
 COPY . /tmp/src
 RUN cd /tmp/src \
     && yarn install \
diff --git a/docs/setup_selfbuild.md b/docs/setup_selfbuild.md
index 34cbb94..908078a 100644
--- a/docs/setup_selfbuild.md
+++ b/docs/setup_selfbuild.md
@@ -1,4 +1,4 @@
-To build mjolnir, you have to have installed `yarn` 1.x and Node 14.
+To build mjolnir, you have to have installed `yarn` 1.x and Node 16.
 
 ```bash
 git clone https://github.com/matrix-org/mjolnir.git
@@ -12,4 +12,4 @@ cp config/default.yaml config/development.yaml
 nano config/development.yaml
 
 node lib/index.js
-```
\ No newline at end of file
+```
diff --git a/package.json b/package.json
index 6594532..6d4932a 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,6 @@
     "shell-quote": "^1.7.3"
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
   }
 }