diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index caa31a470..5cd55f121 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -49,7 +49,7 @@ jobs:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
 
-      - name: Set up Docker Buildx
+      - name: Setup Buildx
         uses: docker/setup-buildx-action@v2
 
       - name: Publish
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7267b1d48..50c41cb8f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,22 +28,26 @@ jobs:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
 
-      - name: Set up Docker Buildx
+      - name: Setup Buildx
         uses: docker/setup-buildx-action@v2
 
+      - name: Meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: andig/evcc
+
       - name: Publish
         uses: docker/build-push-action@v3
         with:
           context: .
           platforms: linux/amd64,linux/arm64,linux/arm/v6
           push: true
-          build-args: |
-            RELEASE=1
-          tags: |
-            andig/evcc:latest
+          build-args: RELEASE=1
+          tags: ${{ steps.meta.outputs.tags }}
 
   apt:
-    name: Publish Github & APT release
+    name: Github & APT
     needs:
       - call-build-workflow
     runs-on: ubuntu-latest
@@ -92,7 +96,7 @@ jobs:
         run: make apt-release
 
   hassio:
-    name: Create Hassio Addon Release
+    name: Hassio Addon
     needs:
       - docker
     runs-on: ubuntu-latest
@@ -101,12 +105,6 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Update version
-        # uses: pocket-apps/action-update-version@v1
-        # with:
-        #   files: "packaging/hassio/config.json"
-        #   version-regexp: '\d+.\d+.\d+'
-        #   branch-name: master
-        #   author-name: evcc-io
         run: |
           sed -i -e s#0.0.0#$(echo ${{ env.GITHUB_REF }} | sed -e s#refs/tags/##)# packaging/hassio/config.json