diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index c7fc759f..922f9ef1 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -17,10 +17,8 @@ jobs:
         git push -f origin next_macOS
     - name: Build
       run: |
-        make -j4
-        cd module
-        make all -j4
-        cd ..
+        mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release
+        make -j6
     - name: Test
       run: make test
     - name: Package
@@ -33,7 +31,7 @@ jobs:
         prerelease: true
         draft: false
         files: |
-          nasal-Darwin.tar
+          nasal-macOS-aarch64.tar
     
   linux-x86_64-build:
     runs-on: ubuntu-latest
@@ -46,10 +44,8 @@ jobs:
         git push -f origin next_linux_x86_64
     - name: Build
       run: |
-        make -j4
-        cd module
-        make all -j4
-        cd ..
+        mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release
+        make -j6
     - name: Test
       run: make test
     - name: Package
@@ -62,4 +58,4 @@ jobs:
         prerelease: true
         draft: false
         files: |
-          nasal-Linux.tar
+          nasal-linux-x86_64.tar
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 329941f6..3ffb188d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,10 +14,8 @@ jobs:
     - uses: actions/checkout@v4
     - name: Build
       run: |
-        make -j4
-        cd module
-        make all -j4
-        cd ..
+        mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release
+        make -j6
     - name: Test
       run: make test
     
@@ -27,9 +25,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Build
       run: |
-        make -j4
-        cd module
-        make all -j4
-        cd ..
+        mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release
+        make -j6
     - name: Test
       run: make test
diff --git a/tools/pack.py b/tools/pack.py
index 3be7d006..97c2fab5 100644
--- a/tools/pack.py
+++ b/tools/pack.py
@@ -43,7 +43,15 @@
     nasal_modules.append(lib)
 
 
-tar_file_name = "nasal-{}".format(platform.system())
+tar_file_name = "nasal"
+if platform.system()=="Windows":
+    tar_file_name += "-windows-x86_64"
+elif platform.system()=="Linux":
+    tar_file_name += "-linux-x86_64"
+elif platform.system()=="Darwin":
+    tar_file_name += "-macos-aarch64"
+else:
+    print("pack binaries failed: unsupported platform")
 
 # create package directory in build directory and copy files needed
 package_directory = build_directory.joinpath(tar_file_name)