diff --git a/.github/workflows/abismal_build_macos.yml b/.github/workflows/abismal_build_macos.yml
new file mode 100644
index 0000000..358a4fc
--- /dev/null
+++ b/.github/workflows/abismal_build_macos.yml
@@ -0,0 +1,46 @@
+name: Abismal build (macOS)
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build-on-x86:
+    runs-on: macos-13
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    - name: Update Homebrew
+      run: brew update
+    - name: Install automake
+      run: brew install automake
+    - name: Install dependencies
+      run: brew install htslib
+    - name: Generate configure script
+      run: ./autogen.sh
+    - name: configure with g++-14
+      run: ./configure CXX="g++-14" CPPFLAGS="-I$(brew --prefix)/include" LDFLAGS="-L$(brew --prefix)/lib"
+    - name: Build with g++-14
+      run: make -j4
+  build-on-arm64:
+    runs-on: macos-15
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    - name: Update Homebrew
+      run: brew update
+    - name: Install automake
+      run: brew install automake
+    - name: Install dependencies
+      run: brew install htslib
+    - name: Generate configure script
+      run: ./autogen.sh
+    - name: configure with g++-14
+      run: ./configure CXX="g++-14" CPPFLAGS="-I$(brew --prefix)/include" LDFLAGS="-L$(brew --prefix)/lib"
+    - name: Build with g++-14
+      run: make -j4
diff --git a/.github/workflows/ubuntu-builds.yml b/.github/workflows/abismal_build_ubuntu.yml
similarity index 58%
rename from .github/workflows/ubuntu-builds.yml
rename to .github/workflows/abismal_build_ubuntu.yml
index a993a91..9d1eacb 100644
--- a/.github/workflows/ubuntu-builds.yml
+++ b/.github/workflows/abismal_build_ubuntu.yml
@@ -1,4 +1,4 @@
-name: Abismal builds on Ubuntu
+name: Abismal build (Ubuntu)
 
 on:
   workflow_dispatch:
@@ -8,10 +8,8 @@ on:
     branches: [ "master" ]
 
 jobs:
-  build:
-
+  build-with-gcc:
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v4
       with:
@@ -25,14 +23,20 @@ jobs:
     - name: configure for GCC
       run: ./configure CXX="g++"
     - name: make with g++
-      run: make
-    - name: cleanup after GCC
-      run: make distclean
-    - name: install Clang dependencies
-      run: sudo apt-get install -y libomp-dev
+      run: make -j4
+  build-with-clang:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    - name: Update apt
+      run: sudo apt update
+    - name: Install dependencies
+      run: sudo apt-get install -y libhts-dev libomp-dev
+    - name: Generate configure script
+      run: ./autogen.sh
     - name: configure for Clang
       run: ./configure CXX="clang++"
     - name: make with clang++
-      run: make
-    - name: cleanup after clang++
-      run: make clean
+      run: make -j4
diff --git a/.github/workflows/ubuntu-distcheck.yml b/.github/workflows/abismal_distcheck_ubuntu.yml
similarity index 65%
rename from .github/workflows/ubuntu-distcheck.yml
rename to .github/workflows/abismal_distcheck_ubuntu.yml
index 36b71b1..8b93039 100644
--- a/.github/workflows/ubuntu-distcheck.yml
+++ b/.github/workflows/abismal_distcheck_ubuntu.yml
@@ -1,4 +1,4 @@
-name: Abismal distribution check on Ubuntu
+name: Abismal distcheck (Ubuntu)
 
 on:
   workflow_dispatch:
@@ -9,11 +9,9 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: Update packages
@@ -22,9 +20,7 @@ jobs:
       run: sudo apt-get install -y libhts-dev
     - name: Generate configure script
       run: ./autogen.sh
-    - name: configure
+    - name: Generate the Makefile
       run: ./configure
-    - name: make check with two threads
-      run: make -j2 check
-    - name: make distcheck
-      run: make distcheck
+    - name: Distcheck
+      run: make -j4 distcheck
diff --git a/.github/workflows/abismal_linux_release.yml b/.github/workflows/abismal_release_linux.yml
similarity index 100%
rename from .github/workflows/abismal_linux_release.yml
rename to .github/workflows/abismal_release_linux.yml
diff --git a/.github/workflows/macos-builds.yml b/.github/workflows/macos-builds.yml
deleted file mode 100644
index eaac3e6..0000000
--- a/.github/workflows/macos-builds.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Abismal builds on macOS (x86)
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-jobs:
-  build:
-    runs-on: macos-14
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-    - name: Update Homebrew
-      run: brew update
-    - name: Install automake
-      run: brew install automake
-    - name: Install dependencies
-      run: brew install htslib
-    - name: Generate configure script
-      run: ./autogen.sh
-    - name: configure with g++-13
-      run: ./configure CXX="g++-13" CPPFLAGS="-I$(brew --prefix)/include" LDFLAGS="-L$(brew --prefix)/lib"
-    - name: Build with g++
-      run: make CXXFLAGS="-O3 -DNDEBUG -Wl,-ld_classic"