diff --git a/wireguard/build.json b/wireguard/build.json
deleted file mode 100644
index 407e3ee..0000000
--- a/wireguard/build.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "build_from": {
-    "aarch64": "ghcr.io/hassio-addons/base/aarch64:10.0.1",
-    "amd64": "ghcr.io/hassio-addons/base/amd64:10.0.1",
-    "armhf": "ghcr.io/hassio-addons/base/armhf:10.0.1",
-    "armv7": "ghcr.io/hassio-addons/base/armv7:10.0.1",
-    "i386": "ghcr.io/hassio-addons/base/i386:10.0.1"
-  }
-}
diff --git a/wireguard/build.yaml b/wireguard/build.yaml
new file mode 100644
index 0000000..efba9d2
--- /dev/null
+++ b/wireguard/build.yaml
@@ -0,0 +1,7 @@
+---
+build_from:
+  aarch64: ghcr.io/hassio-addons/base/aarch64:10.0.1
+  amd64: ghcr.io/hassio-addons/base/amd64:10.0.1
+  armhf: ghcr.io/hassio-addons/base/armhf:10.0.1
+  armv7: ghcr.io/hassio-addons/base/armv7:10.0.1
+  i386: ghcr.io/hassio-addons/base/i386:10.0.1
diff --git a/wireguard/config.json b/wireguard/config.json
deleted file mode 100755
index b749332..0000000
--- a/wireguard/config.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "name": "WireGuard",
-  "version": "dev",
-  "slug": "wireguard",
-  "description": "Fast, modern, secure VPN tunnel",
-  "url": "https://github.com/hassio-addons/addon-wireguard",
-  "arch": ["aarch64", "amd64", "armhf", "armv7", "i386"],
-  "init": false,
-  "ports": {
-    "80/tcp": null,
-    "51820/udp": 51820
-  },
-  "ports_description": {
-    "80/tcp": "WireGuard peers status API",
-    "51820/udp": "WireGuard: forward this port in your router"
-  },
-  "hassio_api": true,
-  "privileged": ["NET_ADMIN"],
-  "devices": ["/dev/net/tun"],
-  "map": ["ssl:rw"],
-  "options": {
-    "server": {
-      "host": "myautomatedhome.duckdns.org",
-      "addresses": ["172.27.66.1"],
-      "dns": []
-    },
-    "peers": [
-      {
-        "name": "hassio",
-        "addresses": ["172.27.66.2"],
-        "allowed_ips": [],
-        "client_allowed_ips": []
-      }
-    ]
-  },
-  "schema": {
-    "log_level": "list(trace|debug|info|notice|warning|error|fatal)?",
-    "server": {
-      "host": "str",
-      "interface": "match(^wg([0-9])+$)?",
-      "addresses": ["str"],
-      "dns": ["str"],
-      "private_key": "password?",
-      "public_key": "str?",
-      "fwmark": "str?",
-      "table": "str?",
-      "pre_up": "str?",
-      "pre_down": "str?",
-      "post_up": "str?",
-      "post_down": "str?",
-      "mtu": "int?"
-    },
-    "peers": [
-      {
-        "name": "match(^[a-zA-Z0-9\\d](?:[a-zA-Z0-9\\d]|-(?=[a-zA-Z0-9\\d])){0,32}$)",
-        "private_key": "str?",
-        "public_key": "str?",
-        "addresses": ["str"],
-        "allowed_ips": ["str"],
-        "client_allowed_ips": ["str"],
-        "persistent_keep_alive": "int?",
-        "endpoint": "str?",
-        "pre_shared_key": "str?",
-        "fwmark": "str?"
-      }
-    ]
-  }
-}
diff --git a/wireguard/config.yaml b/wireguard/config.yaml
new file mode 100644
index 0000000..975302c
--- /dev/null
+++ b/wireguard/config.yaml
@@ -0,0 +1,70 @@
+---
+name: WireGuard
+version: dev
+slug: wireguard
+description: Fast, modern, secure VPN tunnel
+url: https://github.com/hassio-addons/addon-wireguard
+arch:
+  - aarch64
+  - amd64
+  - armhf
+  - armv7
+  - i386
+init: false
+ports:
+  80/tcp: null
+  51820/udp: 51820
+ports_description:
+  80/tcp: WireGuard peers status API
+  51820/udp: "WireGuard: forward this port in your router"
+hassio_api: true
+privileged:
+  - NET_ADMIN
+devices:
+  - /dev/net/tun
+map:
+  - ssl:rw
+options:
+  server:
+    host: myautomatedhome.duckdns.org
+    addresses:
+      - 172.27.66.1
+    dns: []
+  peers:
+    - name: hassio
+      addresses:
+        - 172.27.66.2
+      allowed_ips: []
+      client_allowed_ips: []
+schema:
+  log_level: list(trace|debug|info|notice|warning|error|fatal)?
+  server:
+    host: str
+    interface: match(^wg([0-9])+$)?
+    addresses:
+      - str
+    dns:
+      - str
+    private_key: password?
+    public_key: str?
+    fwmark: str?
+    table: str?
+    pre_up: str?
+    pre_down: str?
+    post_up: str?
+    post_down: str?
+    mtu: int?
+  peers:
+    - name: match(^[a-zA-Z0-9\d](?:[a-zA-Z0-9\d]|-(?=[a-zA-Z0-9\d])){0,32}$)
+      private_key: str?
+      public_key: str?
+      addresses:
+        - str
+      allowed_ips:
+        - str
+      client_allowed_ips:
+        - str
+      persistent_keep_alive: int?
+      endpoint: str?
+      pre_shared_key: str?
+      fwmark: str?