diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index dc6eeb716..000000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-environment:
-  matrix:
-    # - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
-    - JAVA_HOME: C:\Program Files\Java\jdk11
-
-install:
-  - java -version
-  - mvn --version
-
-build_script:
-  - mvn -B -V -Prun-its clean verify
-
-cache:
-  - C:\maven\
-  - C:\Users\appveyor\.m2
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 5744477f1..f70e5518e 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,11 +1,15 @@
 name: Panda CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
-
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        java_version: [11, 17, 21]
+        os: [windows-latest, macos-14, macos-13, ubuntu-latest] # Macos 13 is x86-64 and 14 is aarch64
 
     steps:
       - uses: actions/checkout@v1