diff --git a/.github/renovate.json b/.github/renovate.json
index e31e1db..f9636b3 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -8,12 +8,13 @@
   "prBodyTemplate": "{{{table}}}{{{warnings}}}{{{notes}}}{{{changelogs}}}",
   "semanticCommits": "disabled",
   "commitMessageTopic": "{{#if (containsString depName 'teslamate')}}TeslaMate{{else}}{{depName}}{{/if}}",
-  "enabledManagers": ["custom.regex", "github-actions", "dockerfile"],
+  "enabledManagers": ["custom.regex", "github-actions"],
   "customManagers": [
     {
       "customType": "regex",
       "fileMatch": "^build.json$",
       "matchStrings": [
+        "\"teslamate/teslamate:(?<currentValue>\\d+\\.\\d+\\.\\d+)\"",
         "\"teslamate_version\": \"(?<currentValue>\\d+\\.\\d+\\.\\d+)\""
       ],
       "datasourceTemplate": "github-releases",
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 8a95d3b..e641aec 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -20,13 +20,3 @@ jobs:
         uses: frenck/action-addon-linter@v2
         with:
           path: "./"
-
-      - name: Check versions match
-        run: |
-          docker_ver=$(grep "FROM teslamate/teslamate" Dockerfile | cut -d':' -f2)
-          build_ver=$(jq -r ".args.teslamate_version" build.json)
-          if [ "$docker_ver" != "$build_ver" ]; then
-            echo -e "\033[31;1mTeslaMate versions don't match: Dockerfile => ${docker_ver} | build.json => ${build_ver}\033[0m"
-            exit 1
-          fi
-          echo -e "\033[32;1mTeslaMate versions match: Dockerfile => ${docker_ver} | build.json => ${build_ver}\033[0m"
diff --git a/Dockerfile b/Dockerfile
index f9d2b4f..2caaea0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,11 @@
-FROM teslamate/grafana:1.30.1 as grafana
+ARG BUILD_FROM
+ARG teslamate_version
+FROM teslamate/grafana:${teslamate_version} as grafana
 
 #---
 
-FROM teslamate/teslamate:1.30.1
+ARG BUILD_FROM
+FROM $BUILD_FROM
 
 ARG BUILD_ARCH
 ARG BASHIO_VERSION=0.16.2
diff --git a/build.json b/build.json
index a536977..f8af679 100644
--- a/build.json
+++ b/build.json
@@ -1,8 +1,8 @@
 {
   "build_from": {
-    "aarch64": "teslamate/teslamate:not-used",
-    "amd64": "teslamate/teslamate:not-used",
-    "armv7": "teslamate/teslamate:not-used"
+    "aarch64": "teslamate/teslamate:1.30.1",
+    "amd64": "teslamate/teslamate:1.30.1",
+    "armv7": "teslamate/teslamate:1.30.1"
   },
   "args": {
     "teslamate_version": "1.30.1"