diff --git a/.github/workflows/teslamate.yml b/.github/workflows/teslamate.yml
index fe29eca..18a8864 100644
--- a/.github/workflows/teslamate.yml
+++ b/.github/workflows/teslamate.yml
@@ -7,20 +7,12 @@ on:
     paths:
       - '**'
       - '!**.md'
-  pull_request:
-    branches:
-      - main
-    paths:
-      - '**'
-      - '!**.md'
 
 env:
   DOCKER_USERNAME: mattffffff
 
 jobs:
   build:
-    env:
-      TESLAMATE_TAG: 1.20.1
 
     runs-on: ubuntu-latest
 
@@ -33,6 +25,9 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: 'true'
+    - name: Set TESLAMATE_TAG
+      run: |
+        echo "TESLAMATE_TAG=$(jq -r '.args.TESLAMATE_TAG ' < build.json)" >> $GITHUB_ENV
     - name: Docker version
       run: docker version
     - name: Setup qemu
diff --git a/CHANGELOG-FULL.md b/CHANGELOG-FULL.md
index 1a243ff..04f5c7a 100644
--- a/CHANGELOG-FULL.md
+++ b/CHANGELOG-FULL.md
@@ -3,6 +3,7 @@
 ## 0.5.0
 
 * [Ingress support](https://github.com/matt-FFFFFF/hassio-addon-teslamate/pull/1)! Thanks to [tcm0116](https://github.com/tcm0116)
+* Teslamate 1.21.0
 
 ## 0.4.0
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33b4fee..c517f69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,5 +3,6 @@
 ## 0.5.0
 
 * [Ingress support](https://github.com/matt-FFFFFF/hassio-addon-teslamate/pull/1)! Thanks to [tcm0116](https://github.com/tcm0116)
+* Teslamate 1.21.0
 
 [Full Changelog](https://github.com/matt-FFFFFF/hassio-addon-teslamate/blob/master/teslamate/CHANGELOG-FULL.md)
diff --git a/build.json b/build.json
index 905b9e3..59301ec 100644
--- a/build.json
+++ b/build.json
@@ -1,5 +1,5 @@
 {
     "args": {
-      "TESLAMATE_TAG": "1.20.1"
+      "TESLAMATE_TAG": "1.21.0"
     }
 }
\ No newline at end of file