diff --git a/.gitea/workflows/tag-release.yaml b/.gitea/workflows/tag-release.yaml
index d189fb0..1f9ac88 100644
--- a/.gitea/workflows/tag-release.yaml
+++ b/.gitea/workflows/tag-release.yaml
@@ -87,21 +87,29 @@ jobs:
 
       - name: Build for linux
         run: |
-          VERSION=${{github.ref_name}}
-          BUILD=${{github.run_number}}
-          GOFLAGS="-ldflags=-s -ldflags=-w"
-          CGO_ENABLED=1
-          CC=gcc
-          fyne package --os linux --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION}.${BUILD}-linux-amd64 main.go
+          fyne package --os linux --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}}
+          GOOS: linux
+          GOARCH: amd64
+          EXE: ""
+          CGO_ENABLED: 1
+          CC: gcc
+
 
       - name: Build for windows
         run: |
-          VERSION=${{github.ref_name}}
-          BUILD=${{github.run_number}}
-          GOFLAGS="-ldflags=-H=windowsgui -ldflags=-s -ldflags=-w"
-          CGO_ENABLED=1
-          CC=x86_64-w64-mingw32-gcc
-          fyne package --os windows --release --appVersion=${VERSION#v} --appBuild=${BUILD} --exe bin/sw1ped-mod-switcher-${VERSION}.${BUILD}-windows-amd64.exe main.go
+          fyne package --os windows --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}}
+          GOOS: windows
+          GOARCH: amd64
+          EXE: ".exe"
+          CGO_ENABLED: 1
+          CC: x86_64-w64-mingw32-gcc
+
 
       - name: Release binaries
         uses: https://gitea.com/actions/release-action@main