diff --git a/README.md b/README.md
index 70a101221..c0d73abbb 100644
--- a/README.md
+++ b/README.md
@@ -944,10 +944,10 @@ SOFTWARE.
 [spotify-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
 [spotify-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [spotify-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-tailscale]: https://github.com/hassio-addons/addon-tailscale/tree/e348aec
-[addon-doc-tailscale]: https://github.com/hassio-addons/addon-tailscale/blob/e348aec/README.md
+[addon-tailscale]: https://github.com/hassio-addons/addon-tailscale/tree/35cc6c4
+[addon-doc-tailscale]: https://github.com/hassio-addons/addon-tailscale/blob/35cc6c4/README.md
 [tailscale-issue]: https://github.com/hassio-addons/addon-tailscale/issues
-[tailscale-version-shield]: https://img.shields.io/badge/version-e348aec-blue.svg
+[tailscale-version-shield]: https://img.shields.io/badge/version-35cc6c4-blue.svg
 [tailscale-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [tailscale-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [tailscale-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
diff --git a/tailscale/CHANGELOG.md b/tailscale/CHANGELOG.md
index 34e0eff30..cb3f1ad76 100644
--- a/tailscale/CHANGELOG.md
+++ b/tailscale/CHANGELOG.md
@@ -1,4 +1,5 @@
 # Changelog since v0.2.0
+- Migrate JSON config to YAML (#48) 
 - Switch to centralized GitHub Action Workflows (#47) 
 - Bump actions/checkout from 2.3.4 to 2.3.5 (#40)
 
diff --git a/tailscale/README.md b/tailscale/README.md
index 2e7e72507..814c94309 100644
--- a/tailscale/README.md
+++ b/tailscale/README.md
@@ -48,5 +48,5 @@ If you are more interested in stable releases of our add-ons:
 [patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
 [patreon]: https://www.patreon.com/frenck
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
-[release-shield]: https://img.shields.io/badge/version-e348aec-blue.svg
-[release]: https://github.com/hassio-addons/addon-tailscale/tree/e348aec
\ No newline at end of file
+[release-shield]: https://img.shields.io/badge/version-35cc6c4-blue.svg
+[release]: https://github.com/hassio-addons/addon-tailscale/tree/35cc6c4
\ No newline at end of file
diff --git a/tailscale/config.json b/tailscale/config.json
deleted file mode 100644
index f0769ee9a..000000000
--- a/tailscale/config.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "Tailscale",
-  "version": "e348aec",
-  "slug": "tailscale",
-  "description": "Zero config VPN for building secure networks",
-  "url": "https://github.com/hassio-addons/addon-tailscale",
-  "ingress": true,
-  "ingress_port": 0,
-  "ingress_stream": true,
-  "startup": "services",
-  "panel_icon": "mdi:vpn",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "armv7",
-    "i386"
-  ],
-  "init": false,
-  "hassio_api": true,
-  "privileged": [
-    "NET_ADMIN"
-  ],
-  "devices": [
-    "/dev/net/tun"
-  ],
-  "host_network": true,
-  "image": "ghcr.io/hassio-addons/tailscale/{arch}"
-}
\ No newline at end of file
diff --git a/tailscale/config.yaml b/tailscale/config.yaml
new file mode 100644
index 000000000..7bbc34149
--- /dev/null
+++ b/tailscale/config.yaml
@@ -0,0 +1,24 @@
+arch:
+- aarch64
+- amd64
+- armhf
+- armv7
+- i386
+description: Zero config VPN for building secure networks
+devices:
+- /dev/net/tun
+hassio_api: true
+host_network: true
+image: ghcr.io/hassio-addons/tailscale/{arch}
+ingress: true
+ingress_port: 0
+ingress_stream: true
+init: false
+name: Tailscale
+panel_icon: mdi:vpn
+privileged:
+- NET_ADMIN
+slug: tailscale
+startup: services
+url: https://github.com/hassio-addons/addon-tailscale
+version: 35cc6c4