diff --git a/README.md b/README.md
index 39c27f94..04e0a3f9 100644
--- a/README.md
+++ b/README.md
@@ -953,10 +953,10 @@ SOFTWARE.
 [traccar-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [traccar-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [traccar-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
-[addon-unifi]: https://github.com/hassio-addons/addon-unifi/tree/v0.8.0
-[addon-doc-unifi]: https://github.com/hassio-addons/addon-unifi/blob/v0.8.0/README.md
+[addon-unifi]: https://github.com/hassio-addons/addon-unifi/tree/v0.9.0
+[addon-doc-unifi]: https://github.com/hassio-addons/addon-unifi/blob/v0.9.0/README.md
 [unifi-issue]: https://github.com/hassio-addons/addon-unifi/issues
-[unifi-version-shield]: https://img.shields.io/badge/version-v0.8.0-blue.svg
+[unifi-version-shield]: https://img.shields.io/badge/version-v0.9.0-blue.svg
 [unifi-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/unifi-amd64.svg
 [unifi-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [unifi-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
diff --git a/unifi/CHANGELOG.md b/unifi/CHANGELOG.md
index 5186d1a4..ec00bc62 100644
--- a/unifi/CHANGELOG.md
+++ b/unifi/CHANGELOG.md
@@ -2,17 +2,14 @@
 
 ### Changed
 
-- :arrow_up: Upgrades UniFi Controller to 5.10.20 (#28) (@schliflo)
-- :arrow_up: Upgrades add-on base image to 3.0.0
-- :fire: Removes log_level from default options
-- :fire: Removes custom log format override
-- :ambulance: Workaround Docker issue by reinstating legacy tags
-- :books: Updates documentation for ARMv7
-- :fire: Removes armhf leftovers
-- :hammer: Rewrite add-on onto Bashio
-- :ambulance: Disables ARMHF in GitLab CI
+- :arrow_up: Upgrades add-on base image to 3.1.0
+- :hammer: Disables port 1900 by default to prevent collisions
+- :sparkles: Adds port descriptions
+- :fire: Removes default config options
+- :hammer: Simplifies add-on code logic
+- :arrow_up: Upgrades UniFi Controller to 5.10.21 (#31) (@Nyqi)
 
-[changelog]: https://github.com/hassio-addons/addon-unifi/compare/v0.7.1...v0.8.0
+[changelog]: https://github.com/hassio-addons/addon-unifi/compare/v0.8.0...v0.9.0
 
 Questions? Join our Discord server! https://discord.me/hassioaddons
 Enjoying my add-ons? Consider supporting my work: https://patreon.com/frenck
\ No newline at end of file
diff --git a/unifi/README.md b/unifi/README.md
index e60ea05f..c8c08a7b 100644
--- a/unifi/README.md
+++ b/unifi/README.md
@@ -29,13 +29,13 @@ Raspberry Pi.
 [buymeacoffee]: https://www.buymeacoffee.com/frenck
 [discord-shield]: https://img.shields.io/discord/478094546522079232.svg
 [discord]: https://discord.me/hassioaddons
-[docs]: https://github.com/hassio-addons/addon-unifi/blob/v0.8.0/README.md
+[docs]: https://github.com/hassio-addons/addon-unifi/blob/v0.9.0/README.md
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
 [forum]: https://community.home-assistant.io/t/community-hass-io-add-on-unifi-controller/56297?u=frenck
 [maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg
 [patreon-shield]: https://www.frenck.nl/images/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-v0.8.0-blue.svg
-[release]: https://github.com/hassio-addons/addon-unifi/tree/v0.8.0
+[release-shield]: https://img.shields.io/badge/version-v0.9.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-unifi/tree/v0.9.0
 [screenshot]: https://github.com/hassio-addons/addon-unifi/raw/master/images/screenshot.jpg
\ No newline at end of file
diff --git a/unifi/config.json b/unifi/config.json
index 60a2c595..2bd8f0ee 100644
--- a/unifi/config.json
+++ b/unifi/config.json
@@ -1,6 +1,6 @@
 {
   "name": "UniFi Controller",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "slug": "unifi",
   "description": "Manage your UniFi network using a web browser",
   "url": "https://github.com/hassio-addons/addon-unifi",
@@ -19,7 +19,7 @@
   ],
   "boot": "auto",
   "ports": {
-    "1900/udp": 1900,
+    "1900/udp": null,
     "3478/udp": 3478,
     "6789/tcp": 6789,
     "8080/tcp": 8080,
@@ -28,10 +28,18 @@
     "8880/tcp": 8880,
     "10001/udp": 10001
   },
+  "ports_description": {
+    "1900/udp": "L2 discoverable port",
+    "3478/udp": "Used for STUN",
+    "6789/tcp": "Used for UniFi mobile speed test",
+    "8080/tcp": "Used for device and controller communication",
+    "8443/tcp": "Used for controller web interface and API",
+    "8843/tcp": "Used for HTTPS portal redirection",
+    "8880/tcp": "Used for HTTP portal redirection",
+    "10001/udp": "Used for device discovery"
+  },
   "hassio_api": true,
   "hassio_role": "default",
-  "homeassistant_api": false,
-  "host_network": false,
   "options": {
     "ssl": true,
     "certfile": "fullchain.pem",
@@ -45,5 +53,5 @@
     "memory_max": "int?",
     "memory_init": "int?"
   },
-  "image": "hassioaddons/unifi"
+  "image": "hassioaddons/unifi-{arch}"
 }
\ No newline at end of file