diff --git a/.github/workflows/build-server.yml b/.github/workflows/build-server.yml
index e85af139e..d7c4b7143 100644
--- a/.github/workflows/build-server.yml
+++ b/.github/workflows/build-server.yml
@@ -1,4 +1,4 @@
-name: Smoke Test - Build Server
+name: Build Server
 
 on: [push]
 
@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-      - name: npm install, build, and test
+      - name: npm install, build
         run: |
           cd server
           npm install
diff --git a/.github/workflows/build.yml b/.github/workflows/build-web.yml
similarity index 92%
rename from .github/workflows/build.yml
rename to .github/workflows/build-web.yml
index d2cc68937..1efba2129 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build-web.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-      - name: npm install and  build
+      - name: npm install and build
         run: |
           npm --prefix web install
           npm --prefix web run build
diff --git a/.github/workflows/lint-server.yml b/.github/workflows/lint-server.yml
new file mode 100644
index 000000000..1ff8f3808
--- /dev/null
+++ b/.github/workflows/lint-server.yml
@@ -0,0 +1,24 @@
+name: Lint server
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16.14.0]
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: npm run lint
+        run: |
+          npm --prefix web install
+          npm --prefix web run lint
+        env:
+          CI: true
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint-web.yml
similarity index 100%
rename from .github/workflows/lint.yml
rename to .github/workflows/lint-web.yml
diff --git a/.github/workflows/server-tests.yml b/.github/workflows/test-server.yml
similarity index 100%
rename from .github/workflows/server-tests.yml
rename to .github/workflows/test-server.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test-web.yml
similarity index 100%
rename from .github/workflows/test.yml
rename to .github/workflows/test-web.yml