diff --git a/README.md b/README.md
index de62bc96..9a70fa12 100644
--- a/README.md
+++ b/README.md
@@ -714,10 +714,10 @@ SOFTWARE.
 [aircast-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
 [aircast-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [aircast-i386-shield]: https://img.shields.io/badge/i386-no-red.svg
-[addon-airsonos]: https://github.com/hassio-addons/addon-airsonos/tree/v3.6.1
-[addon-doc-airsonos]: https://github.com/hassio-addons/addon-airsonos/blob/v3.6.1/README.md
+[addon-airsonos]: https://github.com/hassio-addons/addon-airsonos/tree/v4.0.0
+[addon-doc-airsonos]: https://github.com/hassio-addons/addon-airsonos/blob/v4.0.0/README.md
 [airsonos-issue]: https://github.com/hassio-addons/addon-airsonos/issues
-[airsonos-version-shield]: https://img.shields.io/badge/version-v3.6.1-blue.svg
+[airsonos-version-shield]: https://img.shields.io/badge/version-v4.0.0-blue.svg
 [airsonos-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [airsonos-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [airsonos-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
diff --git a/airsonos/CHANGELOG.md b/airsonos/CHANGELOG.md
index dba42f68..cea7ae30 100644
--- a/airsonos/CHANGELOG.md
+++ b/airsonos/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## What’s changed
 
-## ⬆️ Dependency updates
+## 🚨 Breaking changes
 
-- ⬆️ Update ghcr.io/hassio-addons/debian-base Docker tag to v7.2.0 @renovate ([#146](https://github.com/hassio-addons/addon-airsonos/pull/146))
+- Drop support for i386 @frenck ([#148](https://github.com/hassio-addons/addon-airsonos/pull/148))
+
+## 🚀 Enhancements
+
+- Migrate AirSonos config out of Home Assistant config folder @frenck ([#149](https://github.com/hassio-addons/addon-airsonos/pull/149))
diff --git a/airsonos/DOCS.md b/airsonos/DOCS.md
index ef4e9cf8..e7e79248 100644
--- a/airsonos/DOCS.md
+++ b/airsonos/DOCS.md
@@ -168,8 +168,8 @@ lack of audio. Note that `latency_rtp` does not delay playback start.
 
 ## Tweaking AirSonos
 
-AirSonos creates a configuration file called `airsonos.xml` in your Home
-Assistant configuration directory. This file allows you to tweak each device
+AirSonos creates a configuration file called `airsonos.xml` in the add-on
+configuration directory. This file allows you to tweak each device
 separately. Every time it finds a new device, it will be added to that file.
 
 > **NOTE**: It is HIGHLY recommended to stop the addon before making changes
diff --git a/airsonos/README.md b/airsonos/README.md
index 3b8045f8..bc9262d7 100644
--- a/airsonos/README.md
+++ b/airsonos/README.md
@@ -52,5 +52,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-production%20ready-brightgreen.svg
-[release-shield]: https://img.shields.io/badge/version-v3.6.1-blue.svg
-[release]: https://github.com/hassio-addons/addon-airsonos/tree/v3.6.1
\ No newline at end of file
+[release-shield]: https://img.shields.io/badge/version-v4.0.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-airsonos/tree/v4.0.0
\ No newline at end of file
diff --git a/airsonos/config.yaml b/airsonos/config.yaml
index 2a67e7d0..f0ad78a6 100644
--- a/airsonos/config.yaml
+++ b/airsonos/config.yaml
@@ -1,5 +1,5 @@
 name: AirSonos
-version: 3.6.1
+version: 4.0.0
 slug: airsonos
 description: AirPlay capabilities for your Sonos (and UPnP) devices.
 url: https://github.com/hassio-addons/addon-airsonos
@@ -10,11 +10,11 @@ arch:
 - aarch64
 - amd64
 - armv7
-- i386
 hassio_api: true
 host_network: true
 map:
-- config:rw
+- addon_config:rw
+- homeassistant_config:rw
 options:
   port: 49152
   latency_rtp: 1000