diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
index cfe6d327a..095518ce1 100644
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -25,6 +25,7 @@ jobs:
           ubuntu-latest,  # x86_64-linux
           ubuntu-24.04-arm,  # aarch64-linux
           macos-13,  # x86_64-darwin
+          macos-15,  # aarch64-darwin
         ]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 67b7af897..118fcb393 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -88,11 +88,8 @@ jobs:
         ]
         attribute: [
           pwndbg-lldb-portable-tarball,
+          pwndbg-gdb-portable-tarball,
         ]
-        include:
-          # gdb is only supported on macos x86_64
-          - os: macos-13  # x86_64-darwin
-            attribute: pwndbg-gdb-portable-tarball
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
diff --git a/flake.nix b/flake.nix
index e6e5f7964..a5ac4b216 100644
--- a/flake.nix
+++ b/flake.nix
@@ -226,7 +226,7 @@
         // (crossDrvs system)
         // (portableDrvs system)
         // (tarballDrv system)
-        // (pwndbg_gdb_drvs (if (system == "aarch64-darwin") then "x86_64-darwin" else system))
+        // (pwndbg_gdb_drvs system)
         // (pwndbg_lldb_drvs system)
       );
 
diff --git a/nix/overlay/gdb.nix b/nix/overlay/gdb.nix
index 0cdf7b22e..9f8f0b0a4 100644
--- a/nix/overlay/gdb.nix
+++ b/nix/overlay/gdb.nix
@@ -8,7 +8,17 @@ let
 
   drv =
     if !isCross then
-      prev.pwndbg_gdb
+      prev.pwndbg_gdb.overrideAttrs (
+        old:
+        prev.lib.optionalAttrs (prev.stdenv.targetPlatform.isDarwin && prev.stdenv.targetPlatform.isAarch64)
+          {
+            configureFlags = [
+              "--target=arm-none-eabi"
+            ] ++ old.configureFlags;
+            configurePlatforms = [ ];
+            meta.badPlatforms = [ ];
+          }
+      )
     else
       (prev.pwndbg_gdb.override { pythonSupport = true; }).overrideAttrs (old: {
         patches = (old.patches or [ ]) ++ [