diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f8a2190c7..4c53f35ec 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,11 +25,14 @@ jobs:
       with:
         go-version: 1.15
 
-    - name: Build server
-      run: make server
+    - name: Build server Linux package
+      run: make server-linux-package
 
-    - name: Build webapp
-      run: cd webapp; npm run pack
+    - uses: actions/upload-artifact@v1
+      with:
+        name: octo-linux-amd64.tar.gz
+        path: ${{ github.workspace }}/dist/octo-linux-amd64.tar.gz
+      name: Upload server package
 
     - name: "Test webapp: Jest"
       run: cd webapp; npm run test
@@ -38,4 +41,4 @@ jobs:
       run: "cd webapp; npm run cypress:ci"
 
     - name: Test server
-      run: cd server; go test -v ./...
+      run: make server-test