diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 143dffa..9cb17a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,9 +8,7 @@ jobs:
   linux-x86_64:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
+    - uses: actions/checkout@v4
 
     - name: Build
       run: make all BUILD_TYPE=Release
@@ -25,9 +23,7 @@ jobs:
   mac-x86_64:
     runs-on: macos-11
     steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
+    - uses: actions/checkout@v4
 
     - name: Build
       run: make all BUILD_TYPE=Release
@@ -39,19 +35,39 @@ jobs:
         path: ./build/
         if-no-files-found: error
 
-  freebsd-x86_64:
+  netbsd-x86_64:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+    - name: Run NetBSD VM & Build
+      id: test
+      uses: vmactions/netbsd-vm@v1
       with:
-        submodules: recursive
+        usesh: true
+        prepare: |
+          /usr/sbin/pkg_add gmake
+
+        run: |
+          gmake all BUILD_TYPE=Release CC=clang
+
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: netbsd-x86_64
+        path: ./build/
+        if-no-files-found: error
+
+  freebsd-x86_64:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
     - name: Run FreeBSD VM & Build
       id: termrec
       uses: vmactions/freebsd-vm@v1
       with:
         usesh: true
         prepare: |
-          pkg install -y gmake git
+          pkg install -y gmake
 
         run: |
           gmake all BUILD_TYPE=Release CC=clang
@@ -59,7 +75,7 @@ jobs:
     - name: Upload Artifacts
       uses: actions/upload-artifact@v2
       with:
-        name: feeebsd-x86_64
+        name: freebsd-x86_64
         path: ./build/
         if-no-files-found: error