diff --git a/start.sh b/start.sh
index 6b06d47..6a7dfc3 100755
--- a/start.sh
+++ b/start.sh
@@ -2,11 +2,17 @@
 
 set -eu -o pipefail
 
-mkdir -p /run/traccar/logs
+mkdir -p /run/traccar/logs /app/data/media
+
+disable_registration() {
+    echo "==> disabling registration"
+    PGPASSWORD=${CLOUDRON_POSTGRESQL_PASSWORD} psql -h ${CLOUDRON_POSTGRESQL_HOST} -p ${CLOUDRON_POSTGRESQL_PORT} -U ${CLOUDRON_POSTGRESQL_USERNAME} -d ${CLOUDRON_POSTGRESQL_DATABASE} -c "UPDATE tc_servers SET registration=false WHERE id=1"
+}
 
 echo "=> Ensure traccar.xml config"
 if [[ ! -f /app/data/traccar.xml ]]; then
     cp /app/pkg/traccar.xml.template /app/data/traccar.xml
+    (sleep 10000; disable_registration) &
 fi
 
 xmlstarlet ed --inplace \
diff --git a/traccar.xml.template b/traccar.xml.template
index 546bce8..d3ea423 100644
--- a/traccar.xml.template
+++ b/traccar.xml.template
@@ -31,4 +31,8 @@
     <entry key='ldap.user'>##CLOUDRON_LDAP_BIND_DN##</entry>
     <entry key='ldap.password'>##CLOUDRON_LDAP_BIND_PASSWORD##</entry>
 
+    <!-- https://github.com/traccar/traccar/blob/8eecfdcf5c59f92158a6c339d1622e0e9d67968c/src/main/java/org/traccar/config/Keys.java -->
+    <entry key='users.defaultDeviceLimit'>-1</entry>
+    <entry key='media.path'>/app/data/media</entry>
+
 </properties>