diff --git a/.github/workflows/publish-python.yaml b/.github/workflows/publish-python.yaml
index 4006b38c7..426ff1415 100644
--- a/.github/workflows/publish-python.yaml
+++ b/.github/workflows/publish-python.yaml
@@ -3,7 +3,7 @@ name: Publish nostr-protocol to PyPI
 on: [workflow_dispatch]
 
 jobs:
-  build-manylinux_2_31-x86_64-wheels:
+  build-linux-x86_64:
     name: "Build manylinux_2_31 x86_64 wheel"
     runs-on: ubuntu-20.04
     strategy:
@@ -36,7 +36,7 @@ jobs:
           name: nostr_sdk-manylinux_2_31_x86_64-${{ matrix.python }}
           path: /home/runner/work/nostr/nostr/bindings/nostr-ffi/bindings-python/dist/*.whl
 
-  build-manylinux_2_31-aarch64-wheels:
+  build-linux-aarch64:
     name: "Build manylinux_2_31 aarch64 wheel"
     runs-on: ubuntu-20.04
     strategy:
@@ -74,7 +74,7 @@ jobs:
           name: nostr_protocol-manylinux_2_31_aarch64-${{ matrix.python }}
           path: /home/runner/work/nostr/nostr/bindings/nostr-ffi/bindings-python/dist/*.whl
 
-  build-macos-arm64-wheels:
+  build-macos-arm64:
     name: "Build macOS arm64 wheel"
     runs-on: macos-13
     defaults:
@@ -108,7 +108,7 @@ jobs:
           name: nostr_protocol-macos-arm64-${{ matrix.python }}
           path: /Users/runner/work/nostr/nostr/bindings/nostr-ffi/bindings-python/dist/*.whl
 
-  build-macos-x86_64-wheels:
+  build-macos-x86_64:
     name: "Build macOS x86_64 wheel"
     runs-on: macos-13
     defaults:
@@ -141,7 +141,7 @@ jobs:
           name: nostr_protocol-macos-x86_64-${{ matrix.python }}
           path: /Users/runner/work/nostr/nostr/bindings/nostr-ffi/bindings-python/dist/*.whl
 
-  build-windows-wheels:
+  build-windows:
     name: "Build Windows wheel"
     runs-on: windows-2024
     defaults:
@@ -177,7 +177,7 @@ jobs:
     defaults:
       run:
         working-directory: bindings/nostr-ffi/bindings-python
-    needs: [build-manylinux2014-x86_64-wheels, build-manylinux_2_31-aarch64-wheels, build-macos-arm64-wheels, build-macos-x86_64-wheels, build-windows-wheels]
+    needs: [build-linux-x86_64, build-linux-aarch64, build-macos-arm64, build-macos-x86_64, build-windows]
     steps:
       - name: "Checkout"
         uses: actions/checkout@v3
diff --git a/.github/workflows/publish-sdk-python.yaml b/.github/workflows/publish-sdk-python.yaml
index 291f40b4c..690f76d53 100644
--- a/.github/workflows/publish-sdk-python.yaml
+++ b/.github/workflows/publish-sdk-python.yaml
@@ -3,7 +3,7 @@ name: Publish nostr-sdk to PyPI
 on: [workflow_dispatch]
 
 jobs:
-  build-manylinux_2_31-x86_64-wheels:
+  build-linux-x86_64:
     name: "Build manylinux_2_31 x86_64 wheel"
     runs-on: ubuntu-20.04
     strategy:
@@ -36,7 +36,7 @@ jobs:
           name: nostr_sdk-manylinux_2_31_x86_64-${{ matrix.python }}
           path: /home/runner/work/nostr/nostr/bindings/nostr-sdk-ffi/bindings-python/dist/*.whl
 
-  build-manylinux_2_31-aarch64-wheels:
+  build-linux-aarch64:
     name: "Build manylinux_2_31 aarch64 wheel"
     runs-on: ubuntu-20.04
     strategy:
@@ -74,7 +74,7 @@ jobs:
           name: nostr_sdk-manylinux_2_31_aarch64-${{ matrix.python }}
           path: /home/runner/work/nostr/nostr/bindings/nostr-sdk-ffi/bindings-python/dist/*.whl
 
-  build-macos-arm64-wheels:
+  build-macos-arm64:
     name: "Build macOS arm64 wheel"
     runs-on: macos-13
     defaults:
@@ -108,7 +108,7 @@ jobs:
           name: nostr_sdk-macos-arm64-${{ matrix.python }}
           path: /Users/runner/work/nostr/nostr/bindings/nostr-sdk-ffi/bindings-python/dist/*.whl
 
-  build-macos-x86_64-wheels:
+  build-macos-x86_64:
     name: "Build macOS x86_64 wheel"
     runs-on: macos-13
     defaults:
@@ -141,7 +141,7 @@ jobs:
           name: nostr_sdk-macos-x86_64-${{ matrix.python }}
           path: /Users/runner/work/nostr/nostr/bindings/nostr-sdk-ffi/bindings-python/dist/*.whl
 
-  build-windows-wheels:
+  build-windows:
     name: "Build Windows wheel"
     runs-on: windows-2024
     defaults:
@@ -177,7 +177,7 @@ jobs:
     defaults:
       run:
         working-directory: bindings/nostr-sdk-ffi/bindings-python
-    needs: [build-manylinux2014-x86_64-wheels, build-manylinux_2_31-aarch64-wheels, build-macos-arm64-wheels, build-macos-x86_64-wheels, build-windows-wheels]
+    needs: [build-linux-x86_64, build-linux-aarch64, build-macos-arm64, build-macos-x86_64, build-windows]
     steps:
       - name: "Checkout"
         uses: actions/checkout@v3