diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0c5bd525a..2791ee887 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -139,6 +139,9 @@ jobs:
     - name: Build Root Filesystem
       run: make image-rootfs
 
+    - name: Clean git
+      run: git checkout go.*
+
     - name: Create Github Release
       uses: goreleaser/goreleaser-action@v2
       with:
diff --git a/.gitignore b/.gitignore
index 5f40ce001..0436b6e3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ __debug_bin
 .cache
 *.yaml
 evcc
+evcc_*
 linux-*.Dockerfile
 !evcc.dist.yaml
 dist
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 97f511e56..a01910479 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -5,6 +5,9 @@ release:
 # before:
 #   hooks:
 #   - make npm assets
+  extra_files:
+  - glob: evcc_*.image.gz
+  - glob: evcc_*.rootfs.gz
 builds:
 - id: evcc
   main: main.go
@@ -37,8 +40,6 @@ archives:
     format: zip
   files:
   - evcc.dist.yaml
-  - evcc_*.image.gz
-  - evcc_*.rootfs.gz
 checksum:
   name_template: 'checksums.txt'
 snapshot: