diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 0000000..499e55c
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,16 @@
+name: Lint
+on: [push, pull_request]
+jobs:
+  build:
+    name: Add-on configuration
+    runs-on: ubuntu-latest
+    strategy:
+       matrix:
+         channel: [esphome, esphome-beta, esphome-dev]
+    steps:
+      - name: ⤵️ Check out code from GitHub
+        uses: actions/checkout@v2
+      - name: 🚀 Run Home Assistant Add-on Lint on ${{ matrix.channel }}
+        uses: frenck/action-addon-linter@v2
+        with:
+          path: "./${{ matrix.channel }}"
diff --git a/esphome-beta/config.json b/esphome-beta/config.json
index 8643d03..51a3244 100644
--- a/esphome-beta/config.json
+++ b/esphome-beta/config.json
@@ -5,12 +5,9 @@
     "aarch64"
   ],
   "auth_api": true,
-  "auto_uart": true,
-  "boot": "auto",
+  "uart": true,
   "description": "Beta version of ESPHome Hass.io add-on.",
   "hassio_api": true,
-  "hassio_role": "default",
-  "homeassistant_api": false,
   "host_network": true,
   "image": "esphome/esphome-hassio-{arch}",
   "ingress": true,
@@ -20,7 +17,6 @@
     "config:rw"
   ],
   "name": "ESPHome (beta)",
-  "options": {},
   "panel_icon": "mdi:chip",
   "ports": {
     "6052/tcp": null
@@ -40,8 +36,6 @@
   },
   "slug": "esphome-beta",
   "stage": "experimental",
-  "startup": "application",
   "url": "https://beta.esphome.io/",
-  "version": "1.16.0",
-  "webui": "http://[HOST]:[PORT:6052]"
+  "version": "1.16.0"
 }
\ No newline at end of file
diff --git a/esphome-dev/build.json b/esphome-dev/build.json
index 8b3d460..9a71196 100644
--- a/esphome-dev/build.json
+++ b/esphome-dev/build.json
@@ -1,9 +1,7 @@
 {
-  "args": {},
   "build_from": {
     "aarch64": "esphome/esphome-hassio-base-aarch64:2.5.0",
     "amd64": "esphome/esphome-hassio-base-amd64:2.5.0",
     "armv7": "esphome/esphome-hassio-base-armv7:2.5.0"
-  },
-  "squash": false
+  }
 }
\ No newline at end of file
diff --git a/esphome-dev/config.json b/esphome-dev/config.json
index 2db67d9..f143a21 100644
--- a/esphome-dev/config.json
+++ b/esphome-dev/config.json
@@ -5,12 +5,9 @@
     "aarch64"
   ],
   "auth_api": true,
-  "auto_uart": true,
-  "boot": "auto",
+  "uart": true,
   "description": "Development Version! Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files",
   "hassio_api": true,
-  "hassio_role": "default",
-  "homeassistant_api": false,
   "host_network": true,
   "ingress": true,
   "ingress_port": 0,
@@ -41,8 +38,6 @@
   },
   "slug": "esphome-dev",
   "stage": "experimental",
-  "startup": "application",
   "url": "https://next.esphome.io/",
-  "version": "dev",
-  "webui": "http://[HOST]:[PORT:6052]"
+  "version": "dev"
 }
\ No newline at end of file
diff --git a/esphome/config.json b/esphome/config.json
index d66c351..88b5040 100644
--- a/esphome/config.json
+++ b/esphome/config.json
@@ -5,12 +5,9 @@
     "aarch64"
   ],
   "auth_api": true,
-  "auto_uart": true,
-  "boot": "auto",
+  "uart": true,
   "description": "ESPHome Hass.io add-on for intelligently managing all your ESP8266/ESP32 devices.",
   "hassio_api": true,
-  "hassio_role": "default",
-  "homeassistant_api": false,
   "host_network": true,
   "image": "esphome/esphome-hassio-{arch}",
   "ingress": true,
@@ -20,7 +17,6 @@
     "config:rw"
   ],
   "name": "ESPHome",
-  "options": {},
   "panel_icon": "mdi:chip",
   "ports": {
     "6052/tcp": null
@@ -39,9 +35,6 @@
     "streamer_mode": "bool?"
   },
   "slug": "esphome",
-  "stage": "stable",
-  "startup": "application",
   "url": "https://esphome.io/",
-  "version": "1.16.0",
-  "webui": "http://[HOST]:[PORT:6052]"
+  "version": "1.16.0"
 }
\ No newline at end of file