diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dfcb96c17..38411a181 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,8 +2,8 @@ name: Release
 # only trigger on pull request closed events
 on:
   push:
-    tags:        
-      - '*'  
+    tags:
+      - '*'
 jobs:
   linux:
     runs-on: ubuntu-latest
@@ -19,9 +19,10 @@ jobs:
           make dep-github-release
       - name: Releasing
         env:
+          GITHUB_ORG: ${{ env.GITHUB_REPOSITORY_OWNER }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: make github-release
-  
+
   darwin:
     needs: linux
     runs-on: macos-latest
@@ -37,11 +38,12 @@ jobs:
           brew install wget
       - name: Releasing
         env:
+          GITHUB_ORG: ${{ env.GITHUB_REPOSITORY_OWNER }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           make github-release-darwin
           make mac-installer-release
-  
+
   windows:
     needs: darwin
     runs-on: windows-latest
@@ -58,6 +60,7 @@ jobs:
           choco install make
       - name: Releasing
         env:
+          GITHUB_ORG: ${{ env.GITHUB_REPOSITORY_OWNER }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           make github-release-windows
diff --git a/.goreleaser-archlinux.yml b/.goreleaser-archlinux.yml
index 4ce8e1604..e0657c678 100644
--- a/.goreleaser-archlinux.yml
+++ b/.goreleaser-archlinux.yml
@@ -6,7 +6,7 @@ release:
   # Default is extracted from the origin remote URL or empty if its private hosted.
   # Note: it can only be one: either github or gitlab or gitea
   github:
-    owner: ${{ env.GITHUB_REPOSITORY_OWNER }}
+    owner: ${{ env.GITHUB_ORG }}
     name: skywire
 
 
diff --git a/.goreleaser-darwin.yml b/.goreleaser-darwin.yml
index 2ab34bb6a..94f1c6c30 100644
--- a/.goreleaser-darwin.yml
+++ b/.goreleaser-darwin.yml
@@ -6,7 +6,7 @@ release:
   # Default is extracted from the origin remote URL or empty if its private hosted.
   # Note: it can only be one: either github or gitlab or gitea
   github:
-    owner: ${{ env.GITHUB_REPOSITORY_OWNER }}
+    owner: ${{ env.GITHUB_ORG }}
     name: skywire
 
 
diff --git a/.goreleaser-linux.yml b/.goreleaser-linux.yml
index 54a49f837..e52c01b92 100644
--- a/.goreleaser-linux.yml
+++ b/.goreleaser-linux.yml
@@ -7,7 +7,7 @@ release:
   # Default is extracted from the origin remote URL or empty if its private hosted.
   # Note: it can only be one: either github or gitlab or gitea
   github:
-    owner: ${{ env.GITHUB_REPOSITORY_OWNER }}
+    owner: ${{ env.GITHUB_ORG }}
     name: skywire
 
 
diff --git a/.goreleaser-windows.yml b/.goreleaser-windows.yml
index 81212bba0..8e6e0653f 100644
--- a/.goreleaser-windows.yml
+++ b/.goreleaser-windows.yml
@@ -6,7 +6,7 @@ release:
   # Default is extracted from the origin remote URL or empty if its private hosted.
   # Note: it can only be one: either github or gitlab or gitea
   github:
-    owner: ${{ env.GITHUB_REPOSITORY_OWNER }}
+    owner: ${{ env.GITHUB_ORG }}
     name: skywire
 
   #prerelease: true