diff --git a/unraid/unifi-controller.xml b/unraid/unifi-controller.xml
index 55f3903..475b28e 100755
--- a/unraid/unifi-controller.xml
+++ b/unraid/unifi-controller.xml
@@ -19,8 +19,11 @@
     <WebUI>https://[IP]:[PORT:8443]</WebUI>
     <TemplateURL>https://raw.githubusercontent.com/linuxserver/templates/main/unraid/unifi-controller.xml</TemplateURL>
     <Icon>https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/unifi-controller-logo.png</Icon>
-    <Date>2021-12-22</Date>
+    <Date>2021-12-23</Date>
     <Changes>
+### 2021-12-23
+- Move min/max memory config from run to system.properties.
+
 ### 2021-12-22
 - Move deb package install to first init to avoid overlayfs performance issues.
 
@@ -68,8 +71,8 @@
     <Config Name="Port: 6789" Target="6789" Default="6789" Mode="tcp" Description="For mobile throughput test" Type="Port" Display="always" Required="false" Mask="false"/>
     <Config Name="Port: 5514" Target="5514" Default="5514" Mode="udp" Description="Remote syslog port" Type="Port" Display="always" Required="false" Mask="false"/>
     <Config Name="Appdata" Target="/config" Default="" Mode="rw" Description="All Unifi data stored here" Type="Path" Display="advanced" Required="true" Mask="false"/>
-    <Config Name="MEM_LIMIT" Target="MEM_LIMIT" Default="1024M" Description="Optionally change the Java memory limit (-Xmx) (default is 1024M)." Type="Variable" Display="always" Required="false" Mask="false"/>
-    <Config Name="MEM_STARTUP" Target="MEM_STARTUP" Default="1024M" Description="Optionally change the Java initial memory (-Xms) (default is 1024M)." Type="Variable" Display="always" Required="false" Mask="false"/>
+    <Config Name="MEM_LIMIT" Target="MEM_LIMIT" Default="1024" Description="Optionally change the Java memory limit. Set to `default` to reset to default" Type="Variable" Display="always" Required="false" Mask="false"/>
+    <Config Name="MEM_STARTUP" Target="MEM_STARTUP" Default="1024" Description="Optionally change the Java initial/minimum memory. Set to `default` to reset to default" Type="Variable" Display="always" Required="false" Mask="false"/>
     <Config Name="PUID" Target="PUID" Default="99" Description="Container Variable: PUID" Type="Variable" Display="advanced" Required="true" Mask="false"/>
     <Config Name="PGID" Target="PGID" Default="100" Description="Container Variable: PGID" Type="Variable" Display="advanced" Required="true" Mask="false"/>
     <Config Name="UMASK" Target="UMASK" Default="022" Description="Container Variable: UMASK" Type="Variable" Display="advanced" Required="false" Mask="false"/>