diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5cd55f121..a19f62ac4 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -93,3 +93,30 @@ jobs:
         env:
           CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
         run: make apt-nightly
+
+  hassio:
+    name: Hassio Addon
+    needs:
+      - docker
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+        with:
+          repository: evcc-io/hassio-addon
+          token: ${{ secrets.GH_TOKEN }}
+          path: ./hassio
+
+      - name: Update version
+        run: |
+          sed -i -e s#.*version.*#'  "version": "nightly-'$(date +'%Y%m%d%H%M%S')'",'# ./hassio/evcc-nightly/config.json
+
+      - name: Push
+        run: |
+          cd ./hassio
+          git add .
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git commit -am "config.json updated from Project evcc release"
+          git push
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 50c41cb8f..db09446be 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -102,17 +102,23 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@master
+        with:
+          repository: evcc-io/hassio-addon
+          token: ${{ secrets.GH_TOKEN }}
+          path: ./hassio
 
       - name: Update version
         run: |
-          sed -i -e s#0.0.0#$(echo ${{ env.GITHUB_REF }} | sed -e s#refs/tags/##)# packaging/hassio/config.json
+          export RELEASE_VERSION=$(echo ${{ github.ref }} | sed -e s#refs/tags/v##)
+          sed -i -e s#.*version.*#'  "version": "'$RELEASE_VERSION'",'# ./hassio/evcc/config.json
 
-      - name: Copy config to hassio-addon
-        uses: andstor/copycat-action@v3
-        with:
-          personal_token: ${{ secrets.GH_TOKEN }}
-          src_path: packaging/hassio/config.json
-          dst_path: /evcc/config.json
-          dst_owner: evcc-io
-          dst_repo_name: hassio-addon
+      - name: Push
+        run: |
+          cd ./hassio
+          git add .
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git commit -am "Mirror evcc release"
+          git push
diff --git a/packaging/hassio/config.json b/packaging/hassio/config.json
deleted file mode 100644
index db2a31af4..000000000
--- a/packaging/hassio/config.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "name": "evcc",
-  "version": "0.0.0",
-  "slug": "evcc",
-  "description": "EV Charge Controller!",
-  "url": "https://github.com/evcc-io/evcc",
-  "arch": [
-    "armhf",
-    "armv7",
-    "aarch64",
-    "amd64",
-    "i386"
-  ],
-  "startup": "application",
-  "panel_icon": "mdi:ev-station",
-  "panel_admin": false,
-  "boot": "auto",
-  "legacy": true,
-  "stage": "experimental",
-  "ingress": true,
-  "ingress_port": 7070,
-  "init": false,
-  "image": "andig/evcc",
-  "options": {
-    "config_file": "/config/evcc.yaml"
-  },
-  "schema": {
-    "config_file": "str"
-  },
-  "host_network": true,
-  "map": [
-    "config:rw"
-  ],
-  "webui": "http://[HOST]:[PORT:7070]/",
-  "ports": {
-    "7070/tcp": 7070,
-    "9522/udp": 9522,
-    "8887/tcp": 8887
-  },
-  "ports_description": {
-    "7070/tcp": "Webserver",
-    "9522/udp": "Multicast (SMA Speedwire)",
-    "8887/tcp": "OCPP web socket"
-  }