diff --git a/.gitea/workflows/push-ci.yaml b/.gitea/workflows/push-ci.yaml
index 6d71745..7a8024b 100644
--- a/.gitea/workflows/push-ci.yaml
+++ b/.gitea/workflows/push-ci.yaml
@@ -91,26 +91,25 @@ jobs:
 
       - name: Build for linux
         run: |
-          fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go
-          mv *.tar.xz bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64.tar.xz
+          fyne build --os=${{GOOS}} --metadata Version=${{VERSION}} --metadata Build=${{BUILD}} -o bin/sw1ped-mod-switcher-${{VERSION#v}}.${{BUILD}}-${{GOOS}}-${{GOARCH}} main.go
+          ls bin
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
           GOOS: linux
           GOARCH: amd64
-          EXE: ""
           CGO_ENABLED: 1
           CC: gcc
 
       - name: Build for windows
         run: |
-          fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go
+          fyne build --os=${{GOOS}} --metadata Version=${{VERSION}} --metadata Build=${{BUILD}} -o bin/sw1ped-mod-switcher-${{VERSION#v}}.${{BUILD}}-${{GOOS}}-${{GOARCH}}.exe main.go
+          ls bin
         env:
           VERSION: ${{github.ref_name}}
           BUILD: ${{github.run_number}}
           GOOS: windows
           GOARCH: amd64
-          EXE: ".exe"
           CGO_ENABLED: 1
           CC: x86_64-w64-mingw32-gcc
 
diff --git a/.gitea/workflows/tag-release.yaml b/.gitea/workflows/tag-release.yaml
index 038e2bc..761d977 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 ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go
+          fyne package --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64 main.go
           mv *.tar.xz bin/swiped-mod-switcher-${VERSION#v}.${BUILD}-linux-amd64.tar.xz
         env:
           VERSION: ${{github.ref_name}}
@@ -100,7 +100,7 @@ jobs:
 
       - name: Build for windows
         run: |
-          fyne package --os ${{GOOS}} --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION#v}.${BUILD}-windows-amd64.exe main.go
+          fyne package --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}}