diff --git a/README.md b/README.md
index 9ffc798b0..96df28069 100644
--- a/README.md
+++ b/README.md
@@ -897,10 +897,10 @@ SOFTWARE.
 [traccar-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [traccar-armhf-shield]: https://img.shields.io/badge/armhf-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/1acd1c1
-[addon-doc-unifi]: https://github.com/hassio-addons/addon-unifi/blob/1acd1c1/README.md
+[addon-unifi]: https://github.com/hassio-addons/addon-unifi/tree/d3c8156
+[addon-doc-unifi]: https://github.com/hassio-addons/addon-unifi/blob/d3c8156/README.md
 [unifi-issue]: https://github.com/hassio-addons/addon-unifi/issues
-[unifi-version-shield]: https://img.shields.io/badge/version-1acd1c1-blue.svg
+[unifi-version-shield]: https://img.shields.io/badge/version-d3c8156-blue.svg
 [unifi-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/unifi.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 5c34eb13d..ea475ed14 100644
--- a/unifi/CHANGELOG.md
+++ b/unifi/CHANGELOG.md
@@ -1,32 +1,48 @@
 # Changelog since v0.4.0
 
-2019/01/09 21:27 UTC - [1acd1c1](https://github.com/hassio-addons/addon-unifi/commit/1acd1c140a3727a1c6eeaad98118ab6acdf6f6f0) by [@frenck](https://github.com/frenck)
+2019/02/03 14:38 UTC - [d3c8156](https://github.com/hassio-addons/addon-unifi/commit/d3c81560b86aec4e57dd99ae23df5296630c504a) by [@frenck](https://github.com/frenck)
+> :sparkles: Adds control over Java Xmx & Xms settings
+
+Closes #13 
+
+2019/02/03 14:38 UTC - [6afb26f](https://github.com/hassio-addons/addon-unifi/commit/6afb26f5e7e46822bd1669857e1490cfd7d156ef) by [@frenck](https://github.com/frenck)
+> :ambulance: Fixes controll stuck on startup
+
+Fixes #11 
+
+2019/02/03 14:38 UTC - [848d56a](https://github.com/hassio-addons/addon-unifi/commit/848d56a492f06119be51eefa1a6c1a9cd45be553) by [@frenck](https://github.com/frenck)
+> :arrow_up: Upgrades openjdk-8-jdk-headless to 8u191-b12-2ubuntu0.18.04.1 
+
+2019/02/03 14:38 UTC - [b26c496](https://github.com/hassio-addons/addon-unifi/commit/b26c496cb29be44a0de5f018656d308caa4e11d6) by [@frenck](https://github.com/frenck)
+> :tractor: Replaces add-on link with GitHub link 
+
+2019/02/03 14:38 UTC - [1acd1c1](https://github.com/hassio-addons/addon-unifi/commit/1acd1c140a3727a1c6eeaad98118ab6acdf6f6f0) by [@frenck](https://github.com/frenck)
 > Update renovate.json 
 
-2019/01/09 21:27 UTC - [c6ff42e](https://github.com/hassio-addons/addon-unifi/commit/c6ff42efd5289d79aae1707e38487e6932f589c4) by [@renovate-bot](https://github.com/renovate-bot)
+2019/02/03 14:38 UTC - [c6ff42e](https://github.com/hassio-addons/addon-unifi/commit/c6ff42efd5289d79aae1707e38487e6932f589c4) by [@renovate-bot](https://github.com/renovate-bot)
 > Add renovate.json 
 
-2019/01/09 21:27 UTC - [1e65175](https://github.com/hassio-addons/addon-unifi/commit/1e65175d0fd21fd915efc25ecdb4d9e529ddcf23) by [@frenck](https://github.com/frenck)
+2019/02/03 14:38 UTC - [1e65175](https://github.com/hassio-addons/addon-unifi/commit/1e65175d0fd21fd915efc25ecdb4d9e529ddcf23) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades openjdk-8-jdk-headless to 8u191-b12-0ubuntu0.18.04.1 
 
-2019/01/09 21:27 UTC - [7579480](https://github.com/hassio-addons/addon-unifi/commit/7579480fa072d9317dfbfb900050e842e5fb3ef1) by [@frenck](https://github.com/frenck)
+2019/02/03 14:38 UTC - [7579480](https://github.com/hassio-addons/addon-unifi/commit/7579480fa072d9317dfbfb900050e842e5fb3ef1) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades add-on base image to 2.2.1 
 
-2019/01/09 21:27 UTC - [a7cf818](https://github.com/hassio-addons/addon-unifi/commit/a7cf8188b4954b4ec676ddef9ae15faf1e834b5c) by [@frenck](https://github.com/frenck)
+2019/02/03 14:38 UTC - [a7cf818](https://github.com/hassio-addons/addon-unifi/commit/a7cf8188b4954b4ec676ddef9ae15faf1e834b5c) by [@frenck](https://github.com/frenck)
 > :tractor: :rocket: Refactor of GitLab CI 
 
-2019/01/09 21:27 UTC - [d998a1c](https://github.com/hassio-addons/addon-unifi/commit/d998a1cbd7475f665800ebadcfab6070fc302dfa) by [@frenck](https://github.com/frenck)
+2019/02/03 14:38 UTC - [d998a1c](https://github.com/hassio-addons/addon-unifi/commit/d998a1cbd7475f665800ebadcfab6070fc302dfa) by [@frenck](https://github.com/frenck)
 > :fireworks: Updates maintenance year to 2019 
 
-2019/01/09 21:27 UTC - [96fb5c6](https://github.com/hassio-addons/addon-unifi/commit/96fb5c6a078e04941ab7cbf47187e41600e35f00) by [@frenck](https://github.com/frenck)
+2019/02/03 14:38 UTC - [96fb5c6](https://github.com/hassio-addons/addon-unifi/commit/96fb5c6a078e04941ab7cbf47187e41600e35f00) by [@frenck](https://github.com/frenck)
 > :fire: Removes Anchore.io links 
 
-2019/01/09 21:27 UTC - [b507179](https://github.com/hassio-addons/addon-unifi/commit/b507179b171b3a4e59de12424654778ab76aaea8) by [@frenck](https://github.com/frenck)
+2019/02/03 14:38 UTC - [b507179](https://github.com/hassio-addons/addon-unifi/commit/b507179b171b3a4e59de12424654778ab76aaea8) by [@frenck](https://github.com/frenck)
 > :fire: Removes BountySource links 
 
-2019/01/09 21:27 UTC - [6eafd08](https://github.com/hassio-addons/addon-unifi/commit/6eafd084a93463a486197534a6250194e512245c) by [@frenck](https://github.com/frenck)
+2019/02/03 14:38 UTC - [6eafd08](https://github.com/hassio-addons/addon-unifi/commit/6eafd084a93463a486197534a6250194e512245c) by [@frenck](https://github.com/frenck)
 > :pencil2: Fixes spelling error in Dockerfile 
 
-2019/01/09 21:27 UTC - [e15e80e](https://github.com/hassio-addons/addon-unifi/commit/e15e80e7eb4bb5bb5d40333f6b783df9447462c9) by [@frenck](https://github.com/frenck)
+2019/02/03 14:38 UTC - [e15e80e](https://github.com/hassio-addons/addon-unifi/commit/e15e80e7eb4bb5bb5d40333f6b783df9447462c9) by [@frenck](https://github.com/frenck)
 > :arrow_up: Upgrades openjdk to 8u181-b13-1ubuntu0.18.04.1 
 
diff --git a/unifi/README.md b/unifi/README.md
index f077db49a..92a2d4f10 100644
--- a/unifi/README.md
+++ b/unifi/README.md
@@ -48,13 +48,13 @@ If you are more interested in stable releases of our add-ons:
 [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/1acd1c1/README.md
+[docs]: https://github.com/hassio-addons/addon-unifi/blob/d3c8156/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-1acd1c1-blue.svg
-[release]: https://github.com/hassio-addons/addon-unifi/tree/1acd1c1
+[release-shield]: https://img.shields.io/badge/version-d3c8156-blue.svg
+[release]: https://github.com/hassio-addons/addon-unifi/tree/d3c8156
 [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 2166f556a..c1dfa72e2 100644
--- a/unifi/config.json
+++ b/unifi/config.json
@@ -1,9 +1,9 @@
 {
   "name": "UniFi Controller",
-  "version": "1acd1c1",
+  "version": "d3c8156",
   "slug": "unifi",
   "description": "Manage your UniFi network using a web browser",
-  "url": "https://community.home-assistant.io/t/community-hass-io-add-on-unifi-controller/56297?u=frenck",
+  "url": "https://github.com/hassio-addons/addon-unifi",
   "webui": "https://[HOST]:[PORT:8443]",
   "startup": "services",
   "arch": [
@@ -39,10 +39,12 @@
     "keyfile": "privkey.pem"
   },
   "schema": {
-    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
     "ssl": "bool",
     "certfile": "str",
-    "keyfile": "str"
+    "keyfile": "str",
+    "memory_max": "int?",
+    "memory_init": "int?"
   },
   "environment": {
     "LOG_FORMAT": "{LEVEL}: {MESSAGE}"