diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 00fb349..80aac4f 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -3,9 +3,12 @@ name: Java CI
 on: [push]
 
 jobs:
-  build-server:
-    name: Build Server
-    runs-on: ubuntu-latest
+  build:
+    name: Build & Package
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
 
     steps:
     - uses: actions/checkout@v2
@@ -20,8 +23,10 @@ jobs:
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
     - name: Build with Maven
-      run: mvn -B package -pl server -am
-    - uses: actions/upload-artifact@v1
+      run: mvn -B package
+    - uses: actions/upload-artifact@v2
       with:
-        name: envoy-server
-        path: server/target/envoy-server-jar-with-dependencies.jar
+        name: envoy-${{ matrix.os }}
+        path: |
+          server/target/envoy-server-jar-with-dependencies.jar
+          client/target/envoy-client*shaded.jar