diff --git a/.gitea/workflows/push-ci.yaml b/.gitea/workflows/push-ci.yaml
index f967709..abcae19 100644
--- a/.gitea/workflows/push-ci.yaml
+++ b/.gitea/workflows/push-ci.yaml
@@ -91,7 +91,7 @@ jobs:
 
       - name: Build for linux
         run: |
-          fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}${EXE} main.go
+          fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
@@ -103,7 +103,7 @@ jobs:
 
       - name: Build for windows
         run: |
-          fyne package --appBuild=${BUILD} --exe bin/swiped-mod-switcher-${VERSION}.${BUILD}-${GOOS}-${GOARCH}${EXE} main.go
+                    fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
diff --git a/.gitea/workflows/tag-release.yaml b/.gitea/workflows/tag-release.yaml
index 1f9ac88..76a993c 100644
--- a/.gitea/workflows/tag-release.yaml
+++ b/.gitea/workflows/tag-release.yaml
@@ -87,7 +87,7 @@ jobs:
 
       - name: Build for linux
         run: |
-          fyne package --os linux --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go
+          fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
@@ -100,7 +100,7 @@ jobs:
 
       - name: Build for windows
         run: |
-          fyne package --os windows --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go
+          fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}