diff --git a/.env.example b/.env.example
index 74e1cbe..78b2152 100644
--- a/.env.example
+++ b/.env.example
@@ -90,7 +90,7 @@ PROJECT_NAME=odoocker
 SUPPORT_EMAIL=mail@example.com
 
 # Containers' Tags
-ODOO_TAG=15.0
+ODOO_TAG=16.0
 POSTGRES_TAG=16.0
 NGINX_TAG=1.25.2
 NGINX_PROXY_TAG=1.3.1
@@ -140,7 +140,7 @@ DEBUG_INTERFACE=${HTTP_INTERFACE}
 HTTP_PORT=8069
 DEBUG_PORT=8070
 XMLRPCS_PORT=8071
-LONGPOLLING_PORT=8072
+GEVENT_PORT=8072
 HTTP_ENABLE=True
 XMLRPCS=True
 PROXY_MODE=True
diff --git a/odoo/odoo.example.conf b/odoo/odoo.example.conf
index 53affd4..bfea948 100644
--- a/odoo/odoo.example.conf
+++ b/odoo/odoo.example.conf
@@ -1,4 +1,4 @@
-[options]
+options]
 ;------------------------------------------;
 ; Options not exposed on the command line. ;
 ;------------------------------------------;
@@ -64,7 +64,7 @@ xmlrpcs_interface = {XMLRPCS_INTERFACE}
 ; --xmlrpcs-port
 xmlrpcs_port = {XMLRPCS_PORT}
 
-; --longpolling_port
+; --gevent-port | --longpolling_port (deprecated)
 gevent_port = {GEVENT_PORT}
 
 ; --no-http | --no-xmlrpc
@@ -214,7 +214,7 @@ dbfilter = {DBFILTER}
 ;------------------;
 ; Advanced options ;
 ;------------------;
-; --dev
+; --dev (all, reload, xml, qweb, werkzeug, sql, shell, assets, tests)
 dev_mode = {DEV_MODE}
 
 ; --shell-interface
@@ -262,26 +262,26 @@ limit_request = {LIMIT_REQUEST}
 ;-------------;
 ;    Redis    ;
 ;-------------;
-; has to be 1 or true
+; Possible values: 1 or true
 ODOO_SESSION_REDIS = {ODOO_SESSION_REDIS}
 
-; is the redis hostname (default is localhost)
+; Defaults to is localhost
 ODOO_SESSION_REDIS_HOST = {ODOO_SESSION_REDIS_HOST}
 
-; is the redis port (default is 6379)
+; Defaults to 6379
 ODOO_SESSION_REDIS_PORT = {ODOO_SESSION_REDIS_PORT}
 
-; is the password for the AUTH command (optional)
+; Sets the password for the AUTH command (optional)
 ODOO_SESSION_REDIS_PASSWORD = {ODOO_SESSION_REDIS_PASSWORD}
 
-; is an alternative way to define the Redis server address. It's the preferred way when you're using the rediss:// protocol.
+; Alternative way to define the Redis server address like rediss:// protocol.
 ODOO_SESSION_REDIS_URL = {ODOO_SESSION_REDIS_URL}
 
-; is the prefix for the session keys (optional)
+; Prefix for the session keys (optional)
 ODOO_SESSION_REDIS_PREFIX = {ODOO_SESSION_REDIS_PREFIX}
 
-; is the time in seconds before expiration of the sessions (default is 7 days)
+; Time in seconds before expiration of the sessions (default is 7 days)
 ODOO_SESSION_REDIS_EXPIRATION = {ODOO_SESSION_REDIS_EXPIRATION}
 
-; the time in seconds before expiration of the anonymous sessions (default is 3 hours)
+; Time in seconds before expiration of the anonymous sessions (default is 3 hours)
 ODOO_SESSION_REDIS_EXPIRATION_ANONYMOUS = {ODOO_SESSION_REDIS_EXPIRATION_ANONYMOUS}
diff --git a/odoo/odoorc.sh b/odoo/odoorc.sh
index f14b7ba..f14f03f 100755
--- a/odoo/odoorc.sh
+++ b/odoo/odoorc.sh
@@ -336,7 +336,7 @@ dbfilter = {DBFILTER}
 ;------------------;
 ; Advanced options ;
 ;------------------;
-; --dev
+; --dev (all, reload, xml, qweb, werkzeug, sql, shell, assets, tests)
 dev_mode = {DEV_MODE}
 
 ; --shell-interface
@@ -384,25 +384,25 @@ limit_request = {LIMIT_REQUEST}
 ;-------------;
 ;    Redis    ;
 ;-------------;
-; has to be 1 or true
+; Possible values: 1 or true
 ODOO_SESSION_REDIS = {ODOO_SESSION_REDIS}
 
-; is the redis hostname (default is localhost)
+; Defaults to is localhost
 ODOO_SESSION_REDIS_HOST = {ODOO_SESSION_REDIS_HOST}
 
-; is the redis port (default is 6379)
+; Defaults to 6379
 ODOO_SESSION_REDIS_PORT = {ODOO_SESSION_REDIS_PORT}
 
-; is the password for the AUTH command (optional)
+; Sets the password for the AUTH command (optional)
 ODOO_SESSION_REDIS_PASSWORD = {ODOO_SESSION_REDIS_PASSWORD}
 
-; is an alternative way to define the Redis server address. It's the preferred way when you're using the rediss:// protocol.
+; Alternative way to define the Redis server address like rediss:// protocol.
 ODOO_SESSION_REDIS_URL = {ODOO_SESSION_REDIS_URL}
 
-; is the prefix for the session keys (optional)
+; Prefix for the session keys (optional)
 ODOO_SESSION_REDIS_PREFIX = {ODOO_SESSION_REDIS_PREFIX}
 
-; is the time in seconds before expiration of the sessions (default is 7 days)
+; Time in seconds before expiration of the sessions (default is 7 days)
 ODOO_SESSION_REDIS_EXPIRATION = {ODOO_SESSION_REDIS_EXPIRATION}
 
 ; the time in seconds before expiration of the anonymous sessions (default is 3 hours)