diff --git a/motioneye/build.json b/motioneye/build.json
deleted file mode 100644
index e55dc95..0000000
--- a/motioneye/build.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "build_from": {
-    "aarch64": "ghcr.io/hassio-addons/base/aarch64:10.1.0",
-    "amd64": "ghcr.io/hassio-addons/base/amd64:10.1.0",
-    "armhf": "ghcr.io/hassio-addons/base/armhf:10.1.0",
-    "armv7": "ghcr.io/hassio-addons/base/armv7:10.1.0",
-    "i386": "ghcr.io/hassio-addons/base/i386:10.1.0"
-  }
-}
diff --git a/motioneye/build.yaml b/motioneye/build.yaml
new file mode 100644
index 0000000..4fe7c07
--- /dev/null
+++ b/motioneye/build.yaml
@@ -0,0 +1,7 @@
+---
+build_from:
+  aarch64: ghcr.io/hassio-addons/base/aarch64:10.1.0
+  amd64: ghcr.io/hassio-addons/base/amd64:10.1.0
+  armhf: ghcr.io/hassio-addons/base/armhf:10.1.0
+  armv7: ghcr.io/hassio-addons/base/armv7:10.1.0
+  i386: ghcr.io/hassio-addons/base/i386:10.1.0
diff --git a/motioneye/config.json b/motioneye/config.json
deleted file mode 100755
index 07c5a81..0000000
--- a/motioneye/config.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "name": "motionEye",
-  "version": "dev",
-  "slug": "motioneye",
-  "description": "Simple, elegant and feature-rich CCTV/NVR for your cameras",
-  "url": "https://github.com/hassio-addons/addon-motioneye",
-  "ingress": true,
-  "ingress_port": 0,
-  "ingress_stream": true,
-  "panel_icon": "mdi:cctv",
-  "homeassistant": "0.92.0b2",
-  "arch": ["aarch64", "amd64", "armhf", "armv7", "i386"],
-  "init": false,
-  "ports": {
-    "80/tcp": null
-  },
-  "ports_description": {
-    "80/tcp": "Web interface (Not required for Ingress)"
-  },
-  "discovery": ["motioneye"],
-  "host_network": true,
-  "apparmor": false,
-  "video": true,
-  "privileged": ["DAC_READ_SEARCH", "SYS_ADMIN"],
-  "map": ["media:rw", "share:rw", "ssl"],
-  "options": {
-    "motion_webcontrol": false,
-    "ssl": true,
-    "certfile": "fullchain.pem",
-    "keyfile": "privkey.pem",
-    "action_buttons": []
-  },
-  "schema": {
-    "log_level": "list(trace|debug|info|notice|warning|error|fatal)?",
-    "motion_webcontrol": "bool",
-    "ssl": "bool",
-    "certfile": "str",
-    "keyfile": "str",
-    "action_buttons": [
-      {
-        "type": "list(lock|unlock|light_on|light_off|alarm_on|alarm_off|up|right|down|left|zoom_in|zoom_out|preset1|preset2|preset3|preset4|preset5|preset6|preset7|preset8|preset9)?",
-        "camera": "int?",
-        "command": "str?"
-      }
-    ]
-  }
-}
diff --git a/motioneye/config.yaml b/motioneye/config.yaml
new file mode 100644
index 0000000..a0d1ec3
--- /dev/null
+++ b/motioneye/config.yaml
@@ -0,0 +1,50 @@
+---
+name: motionEye
+version: dev
+slug: motioneye
+description: Simple, elegant and feature-rich CCTV/NVR for your cameras
+url: https://github.com/hassio-addons/addon-motioneye
+ingress: true
+ingress_port: 0
+ingress_stream: true
+panel_icon: mdi:cctv
+homeassistant: 0.92.0b2
+arch:
+  - aarch64
+  - amd64
+  - armhf
+  - armv7
+  - i386
+init: false
+ports:
+  80/tcp: null
+ports_description:
+  80/tcp: Web interface (Not required for Ingress)
+discovery:
+  - motioneye
+host_network: true
+apparmor: false
+video: true
+privileged:
+  - DAC_READ_SEARCH
+  - SYS_ADMIN
+map:
+  - media:rw
+  - share:rw
+  - ssl
+options:
+  motion_webcontrol: false
+  ssl: true
+  certfile: fullchain.pem
+  keyfile: privkey.pem
+  action_buttons: []
+schema:
+  log_level: list(trace|debug|info|notice|warning|error|fatal)?
+  motion_webcontrol: bool
+  ssl: bool
+  certfile: str
+  keyfile: str
+  action_buttons:
+    - type: list(lock|unlock|light_on|light_off|alarm_on|alarm_off|up|right|down|left|zoom_in|zoom_out|preset1|preset2|preset3|preset4|preset5|preset6|preset7|preset8|preset9)?
+      camera: int?
+      command: str?