diff --git a/.github/workflows/server.yaml b/.github/workflows/server.yaml
index 29984c6..9cb9999 100644
--- a/.github/workflows/server.yaml
+++ b/.github/workflows/server.yaml
@@ -4,9 +4,26 @@ on:
   - pull_request
 
 jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      #- name: Install Protoc
+      #  uses: arduino/setup-protoc@v1
+      #- name: Install Go protoc
+      #  run: go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
+      #- name: Generate protobuf
+      #  run: protoc --proto_path=./messages --go_out=./ messages/*.proto
+      - name: Lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: latest
+          working-directory: ./server/cmd/ptrun-server/
   build:
     name: Server build
     runs-on: ubuntu-latest
+    needs: lint
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
@@ -32,7 +49,6 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
       - name: Get Docker version
         run: docker --version
       - name: Docker Login