diff --git a/.github/workflows/all-nodejs-packages-publish.yaml b/.github/workflows/all-nodejs-packages-publish.yaml
index 65cee8ccab..7c20744739 100644
--- a/.github/workflows/all-nodejs-packages-publish.yaml
+++ b/.github/workflows/all-nodejs-packages-publish.yaml
@@ -62,8 +62,6 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           NPM_CONFIG_PROVENANCE: true
         run: |
-          git config --global user.email "npm-ci@hyperledger.org"
-          git config --global user.name "hyperledger-ghci"
           npm whoami
           yarn lerna publish from-git --yes --loglevel=debug --ignore-scripts
 
@@ -98,7 +96,7 @@ jobs:
 
       - name: Configure git user and email
         run: |
-          git config --global user.email "npm-ci@hyperledger.org"
+          git config --global user.email "npm-ci@${{ github.repository_owner }}.org"
           git config --global user.name "hyperledger-ghci"
 
       # We run the publish script a second time after having reconfigured the registry to be GHCR
diff --git a/.github/workflows/publish-npm.yaml b/.github/workflows/publish-npm.yaml
index 1a16e8c4db..6ec66dccd5 100644
--- a/.github/workflows/publish-npm.yaml
+++ b/.github/workflows/publish-npm.yaml
@@ -43,7 +43,5 @@ jobs:
         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         NPM_CONFIG_PROVENANCE: true
       run: |
-        git config --global user.email "npm-ci@hyperledger.org"
-        git config --global user.name "hyperledger-ghci"
         npm whoami
         yarn lerna publish from-git --yes --loglevel=debug