diff --git a/18.0/docker-compose.yml b/18.0/docker-compose.yml
index fdc3db7..b01f585 100644
--- a/18.0/docker-compose.yml
+++ b/18.0/docker-compose.yml
@@ -13,40 +13,40 @@ services:
       DB_PORT: ${DB_PORT:-5432}
       DB_USER: ${DB_USER:-odoo}
       DB_PASSWORD: ${DB_PASSWORD:-odoo}
-#      DB_NAME: ${DB_NAME:-postgres}
-#      ADMIN_PASSWD: ${ADMIN_PASSWD:-admin}
-#      CSV_INTERNAL_SEP: ${CSV_INTERNAL_SEP:-,}
-#      DB_MAXCONN: ${DB_MAXCONN:-64}
-#      DB_TEMPLATE: ${DB_TEMPLATE:-template1}
-#      DBFILTER: ${DBFILTER:-.*}
-#      DEBUG_MODE: ${DEBUG_MODE:-False}
-#      EMAIL_FROM: ${EMAIL_FROM:-False}
-#      LIMIT_MEMORY_HARD: ${LIMIT_MEMORY_HARD:-2684354560}
-#      LIMIT_MEMORY_SOFT: ${LIMIT_MEMORY_SOFT:-2147483648}
-#      LIMIT_REQUEST: ${LIMIT_REQUEST:-8192}
-#      LIMIT_TIME_CPU: ${LIMIT_TIME_CPU:-60}
-#      LIMIT_TIME_REAL: ${LIMIT_TIME_REAL:-120}
-#      LIST_DB: ${LIST_DB:-True}
-#      LOG_DB: ${LOG_DB:-False}
-#      LOG_HANDLER: ${LOG_HANDLER:-[:INFO]}
-#      LOG_LEVEL: ${LOG_LEVEL:-info}
-#      LOGFILE: ${LOGFILE:-None}
-#      LONGPOLLING_PORT: ${LONGPOLLING_PORT:-8072}
-#      MAX_CRON_THREADS: ${MAX_CRON_THREADS:-2}
-#      OSV_MEMORY_AGE_LIMIT: ${OSV_MEMORY_AGE_LIMIT:-1.0}
-#      OSV_MEMORY_COUNT_LIMIT: ${OSV_MEMORY_COUNT_LIMIT:-False}
-#      SMTP_PASSWORD: ${SMTP_PASSWORD:-False}
-#      SMTP_PORT: ${SMTP_PORT:-25}
-#      SMTP_SERVER: ${SMTP_SERVER:-localhost}
-#      SMTP_SSL: ${SMTP_SSL:-False}
-#      SMTP_USER: ${SMTP_USER:-False}
-#      WORKERS: ${WORKERS:-0}
-#      XMLRPC: ${XMLRPC:-True}
-#      XMLRPC_INTERFACE: ${XMLRPC_INTERFACE:-}
-#      XMLRPC_PORT: ${XMLRPC_PORT:-8069}
-#      XMLRPCS: ${XMLRPCS:-True}
-#      XMLRPCS_INTERFACE: ${XMLRPCS_INTERFACE:-}
-#      XMLRPCS_PORT: ${XMLRPCS_PORT:-8071}
+      DB_NAME: ${DB_NAME:-postgres}
+      ADMIN_PASSWD: ${ADMIN_PASSWD:-admin}
+      CSV_INTERNAL_SEP: ${CSV_INTERNAL_SEP:-,}
+      DB_MAXCONN: ${DB_MAXCONN:-64}
+      DB_TEMPLATE: ${DB_TEMPLATE:-template1}
+      DBFILTER: ${DBFILTER:-.*}
+      DEBUG_MODE: ${DEBUG_MODE:-False}
+      EMAIL_FROM: ${EMAIL_FROM:-False}
+      LIMIT_MEMORY_HARD: ${LIMIT_MEMORY_HARD:-2684354560}
+      LIMIT_MEMORY_SOFT: ${LIMIT_MEMORY_SOFT:-2147483648}
+      LIMIT_REQUEST: ${LIMIT_REQUEST:-8192}
+      LIMIT_TIME_CPU: ${LIMIT_TIME_CPU:-60}
+      LIMIT_TIME_REAL: ${LIMIT_TIME_REAL:-120}
+      LIST_DB: ${LIST_DB:-True}
+      LOG_DB: ${LOG_DB:-False}
+      LOG_HANDLER: ${LOG_HANDLER:-[:INFO]}
+      LOG_LEVEL: ${LOG_LEVEL:-info}
+      LOGFILE: ${LOGFILE:-None}
+      LONGPOLLING_PORT: ${LONGPOLLING_PORT:-8072}
+      MAX_CRON_THREADS: ${MAX_CRON_THREADS:-2}
+      OSV_MEMORY_AGE_LIMIT: ${OSV_MEMORY_AGE_LIMIT:-1.0}
+      OSV_MEMORY_COUNT_LIMIT: ${OSV_MEMORY_COUNT_LIMIT:-False}
+      SMTP_PASSWORD: ${SMTP_PASSWORD:-False}
+      SMTP_PORT: ${SMTP_PORT:-25}
+      SMTP_SERVER: ${SMTP_SERVER:-localhost}
+      SMTP_SSL: ${SMTP_SSL:-False}
+      SMTP_USER: ${SMTP_USER:-False}
+      WORKERS: ${WORKERS:-0}
+      XMLRPC: ${XMLRPC:-True}
+      XMLRPC_INTERFACE: ${XMLRPC_INTERFACE:-}
+      XMLRPC_PORT: ${XMLRPC_PORT:-8069}
+      XMLRPCS: ${XMLRPCS:-True}
+      XMLRPCS_INTERFACE: ${XMLRPCS_INTERFACE:-}
+      XMLRPCS_PORT: ${XMLRPCS_PORT:-8071}
     ports:
       - "8069:8069"
       - "8071:8071"
diff --git a/18.0/entrypoint.sh b/18.0/entrypoint.sh
index 751c37f..f37fdb3 100755
--- a/18.0/entrypoint.sh
+++ b/18.0/entrypoint.sh
@@ -29,7 +29,7 @@ export LOG_LEVEL=${LOG_LEVEL:-info}
 export LOGFILE=${LOGFILE:-None}
 export LONGPOLLING_PORT=${LONGPOLLING_PORT:-8072}
 export MAX_CRON_THREADS=${MAX_CRON_THREADS:-2}
-export OSV_MEMORY_AGE_LIMIT=${OSV_MEMORY_AGE_LIMIT:-1.0}
+export TRANSIENT_AGE_LIMIT=${TRANSIENT_AGE_LIMIT:-1.0}
 export OSV_MEMORY_COUNT_LIMIT=${OSV_MEMORY_COUNT_LIMIT:-False}
 export SMTP_PASSWORD=${SMTP_PASSWORD:-False}
 export SMTP_PORT=${SMTP_PORT:-25}
diff --git a/18.0/odoo.conf b/18.0/odoo.conf
index 5b2025e..69fbcea 100644
--- a/18.0/odoo.conf
+++ b/18.0/odoo.conf
@@ -6,37 +6,37 @@ db_port = $DB_PORT
 db_user = $DB_USER
 db_password = $DB_PASSWORD
 
-; db_name = $DB_NAME
-; admin_passwd = $ADMIN_PASSWD
-; csv_internal_sep = $CSV_INTERNAL_SEP
-; db_maxconn = $DB_MAXCONN
-; db_template = $DB_TEMPLATE
-; dbfilter = $DBFILTER
-; debug_mode = $DEBUG_MODE
-; email_from = $EMAIL_FROM
-; limit_memory_hard = $LIMIT_MEMORY_HARD
-; limit_memory_soft = $LIMIT_MEMORY_SOFT
-; limit_request = $LIMIT_REQUEST
-; limit_time_cpu = $LIMIT_TIME_CPU
-; limit_time_real = $LIMIT_TIME_REAL
-; list_db = $LIST_DB
-; log_db = $LOG_DB
-; log_handler = $LOG_HANDLER
-; log_level = $LOG_LEVEL
-; logfile = $LOGFILE
-; longpolling_port = $LONGPOLLING_PORT
-; max_cron_threads = $MAX_CRON_THREADS
-; osv_memory_age_limit = $OSV_MEMORY_AGE_LIMIT
-; osv_memory_count_limit = $OSV_MEMORY_COUNT_LIMIT
-; smtp_password = $SMTP_PASSWORD
-; smtp_port = $SMTP_PORT
-; smtp_server = $SMTP_SERVER
-; smtp_ssl = $SMTP_SSL
-; smtp_user = $SMTP_USER
-; workers = $WORKERS
-; xmlrpc = $XMLRPC
-; xmlrpc_interface = $XMLRPC_INTERFACE
-; xmlrpc_port = $XMLRPC_PORT
-; xmlrpcs = $XMLRPCS
-; xmlrpcs_interface = $XMLRPCS_INTERFACE
-; xmlrpcs_port = $XMLRPCS_PORT
+;db_name = $DB_NAME
+;admin_passwd = $ADMIN_PASSWD
+;csv_internal_sep = $CSV_INTERNAL_SEP
+;db_maxconn = $DB_MAXCONN
+;db_template = $DB_TEMPLATE
+;dbfilter = $DBFILTER
+;debug_mode = $DEBUG_MODE
+;email_from = $EMAIL_FROM
+;limit_memory_hard = $LIMIT_MEMORY_HARD
+;limit_memory_soft = $LIMIT_MEMORY_SOFT
+;limit_request = $LIMIT_REQUEST
+;limit_time_cpu = $LIMIT_TIME_CPU
+;limit_time_real = $LIMIT_TIME_REAL
+;list_db = $LIST_DB
+;log_db = $LOG_DB
+;log_handler = $LOG_HANDLER
+;log_level = $LOG_LEVEL
+;logfile = $LOGFILE
+;longpolling_port = $LONGPOLLING_PORT
+;max_cron_threads = $MAX_CRON_THREADS
+;transient_age_limit = $TRANSIENT_AGE_LIMIT
+;osv_memory_count_limit = $OSV_MEMORY_COUNT_LIMIT
+;smtp_password = $SMTP_PASSWORD
+;smtp_port = $SMTP_PORT
+;smtp_server = $SMTP_SERVER
+;smtp_ssl = $SMTP_SSL
+;smtp_user = $SMTP_USER
+;workers = $WORKERS
+;xmlrpc = $XMLRPC
+;xmlrpc_interface = $XMLRPC_INTERFACE
+;xmlrpc_port = $XMLRPC_PORT
+;xmlrpcs = $XMLRPCS
+;xmlrpcs_interface = $XMLRPCS_INTERFACE
+;xmlrpcs_port = $XMLRPCS_PORT