diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
index c91608cee..08fad2878 100644
--- a/.github/workflows/default.yml
+++ b/.github/workflows/default.yml
@@ -189,6 +189,8 @@ jobs:
         run: make ui
 
       - name: Cache dist
+        # avoid cache thrashing by nightly
+        if: github.event_name != 'workflow_call'
         uses: actions/cache/save@v4
         id: cache-dist
         with:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 6d663f0e9..e3f90a689 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -117,7 +117,6 @@ jobs:
           repository: evcc-io/hassio-addon
           token: ${{ secrets.HASSIO_DEPLOY_TOKEN }}
           path: ./hassio
-          persist-credentials: false
 
       - name: Update version
         run: |
@@ -168,7 +167,7 @@ jobs:
       - name: Create nightly build
         uses: goreleaser/goreleaser-action@v6
         with:
-          version: latest
+          version: '~> v2'
           args: --snapshot -f .goreleaser-nightly.yml --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}