diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bf38f57..528efd1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -57,8 +57,10 @@ jobs:
           jq '.version="${{ steps.semver.outputs.semver }}"' < ${{ github.workspace }}/teslamate/config.json > ${{ github.workspace }}/repo/teslamate/config.json
       - name: Add changes to addon repo
         run: |
-          git add .
-          git commit -m 'Update from hassio-addon-teslamate'
-          git push
+          if [ "$(git status -s)" ]; then
+            git add .
+            git commit -m 'Update from hassio-addon-teslamate'
+            git push
+          fi
         working-directory: ${{ github.workspace }}/repo/teslamate
 
diff --git a/.github/workflows/teslamate.yml b/.github/workflows/teslamate.yml
index 6dc5201..2c69945 100644
--- a/.github/workflows/teslamate.yml
+++ b/.github/workflows/teslamate.yml
@@ -66,8 +66,8 @@ jobs:
         esac
     - name: Update config.json if release
       run: |
-        export RELEASE=$( $GITHUB_REF | sed s/v// )
-        jq ".version=\"$RELEASE\"" < /config.json > config_release.json
+        export RELEASE=$( $GITHUB_REF | cut -d/ -f3 | sed s/v// )
+        jq ".version=\"$RELEASE\"" < config.json > config_release.json
         rm config.json && mv config_release.json config.json
       if: ${{ github.event_name == 'release' }}
     - name: Set environment variables from config.json