diff --git a/.env.example b/.env.example
index 44fceb6..b792f77 100644
--- a/.env.example
+++ b/.env.example
@@ -36,7 +36,7 @@ LOG_LEVEL=info
 LOG_HANDLER_LEVEL=INFO
 
 # Nginx
-CORS_ALLOWED_DOMAIN="'https://odoo.odoocker.com.mx'"
+CORS_ALLOWED_DOMAIN="'http://external-domain.test'"
 
 # Testing
 TEST_ENABLE=False
@@ -52,6 +52,13 @@ SMTP_PASSWORD=
 EMAIL_FROM=
 FROM_FILTER=
 
+# Postgres
+POSTGRES_MAIN_HOST=${DB_HOST}
+POSTGRES_MAIN_PORT=${DB_PORT}
+POSTGRES_MAIN_DB=postgres
+POSTGRES_MAIN_USER=postgres
+POSTGRES_MAIN_PASSWORD=${DB_PASSWORD}
+
 # Redis
 SESSION_REDIS=true
 REDIS_HOST=redis
@@ -62,13 +69,6 @@ REDIS_PREFIX=odoo
 REDIS_EXPIRATION=604800
 REDIS_EXPIRATION_ANONYMOUS=10800
 
-# Postgres
-POSTGRES_MAIN_HOST=${DB_HOST}
-POSTGRES_MAIN_PORT=${DB_PORT}
-POSTGRES_MAIN_DB=postgres
-POSTGRES_MAIN_USER=postgres
-POSTGRES_MAIN_PASSWORD=${DB_PASSWORD}
-
 # PgAdmin
 PGADMIN_DOMAIN=pgadmin.odoocker.test
 PGADMING_DB_NAME=pgadmin
@@ -87,7 +87,7 @@ PGADMIN_CONFIG_SERVER_MODE=True
 #------------------------------#
 # Docker
 PROJECT_NAME=odoocker
-SUPPORT_EMAIL=contacto@juarezsoft.com.mx
+SUPPORT_EMAIL=mail@example.com
 
 # Containers' Tags
 ODOO_TAG=15.0
@@ -199,7 +199,7 @@ SHELL_INTERFACE=ptpython
 STOP_AFTER_INIT=False
 OSV_MEMORY_COUNT_LIMIT=False
 TRANSIENT_AGE_LIMIT=1.0
-MAX_CRON_THREADS=1
+MAX_CRON_THREADS=2
 UNACCENT=${UNACCENT}
 GEOIP_DATABASE=/usr/share/GeoIP/GeoLite2-City.mmdb
 WORKERS=${WORKERS}
@@ -260,7 +260,7 @@ ODOO_SESSION_REDIS=${SESSION_REDIS}
 ODOO_SESSION_REDIS_HOST=${REDIS_HOST}
 ODOO_SESSION_REDIS_PORT=${REDIS_PORT}
 ODOO_SESSION_REDIS_PASSWORD=${REDIS_PASSWORD}
-# ODOO_SESSION_REDIS_URL=
+ODOO_SESSION_REDIS_URL=
 ODOO_SESSION_REDIS_PREFIX=${REDIS_PREFIX}
 ODOO_SESSION_REDIS_EXPIRATION=${REDIS_EXPIRATION}
 ODOO_SESSION_REDIS_EXPIRATION_ANONYMOUS=${REDIS_EXPIRATION_ANONYMOUS}
@@ -268,14 +268,10 @@ ODOO_SESSION_REDIS_EXPIRATION_ANONYMOUS=${REDIS_EXPIRATION_ANONYMOUS}
 #-------------#
 #   PgAdmin   #
 #-------------#
-# Container
+# Volume path
 PGADMIN_DATA=/var/lib/pgadmin
 
-PGADMIN_SERVERS_JSON=${PGADMIN_SERVERS_JSON}
-
-PGADMIN_DEFAULT_EMAIL=${PGADMIN_EMAIL}
-PGADMIN_DEFAULT_PASSWORD=${PGADMIN_PASSWORD}
-
+# Nginx Proxy Configuration
 PGADMIN_VIRTUAL_HOST=${PGADMIN_DOMAIN}
 PGADMIN_LETSENCRYPT_HOST=${PGADMIN_DOMAIN}
 PGADMIN_LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
@@ -283,22 +279,26 @@ PGADMIN_LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
 # PgAdmin Configuration
 PGADMIN_CONFIG_APP_NAME="'pgAdmin 4'"
 PGADMIN_CONFIG_SERVER_MODE=${PGADMIN_CONFIG_SERVER_MODE}
-PGADMIN_CONFIG_CONFIG_DATABASE_CONNECTION_POOL_SIZE=5
 PGADMIN_CONFIG_DEFAULT_SERVER="'127.0.0.1'"
 PGADMIN_CONFIG_DEFAULT_SERVER_PORT=5050
 PGADMIN_CONFIG_MAX_SESSION_IDLE_TIME=120
-PGADMIN_CONFIG_CONFIG_DATABASE_URI=${PGADMIN_DB_HOST}
-
-# Password Settings
+PGADMIN_CONFIG_MAX_QUERY_HIST_STORED=20
+# Security Settings
 PGADMIN_CONFIG_PASSWORD_LENGTH_MIN=6
 PGADMIN_CONFIG_ALLOW_SAVE_PASSWORD=True
 PGADMIN_CONFIG_ALLOW_SAVE_TUNNEL_PASSWORD=True
 PGADMIN_CONFIG_MAX_LOGIN_ATTEMPTS=10
+# DB Configuration
+PGADMIN_CONFIG_CONFIG_DATABASE_URI=${PGADMIN_DB_HOST}
+PGADMIN_CONFIG_CONFIG_DATABASE_CONNECTION_POOL_SIZE=5
+# Load Shared Servers Configuration into DB
+PGADMIN_SERVERS_JSON=${PGADMIN_SERVERS_JSON}
 
-# Query History
-PGADMIN_CONFIG_MAX_QUERY_HIST_STORED=20
+# Authentication
+PGADMIN_DEFAULT_EMAIL=${PGADMIN_EMAIL}
+PGADMIN_DEFAULT_PASSWORD=${PGADMIN_PASSWORD}
 
-# SMTP Server
+# PgAdmin SMTP Server
 PGADMIN_CONFIG_MAIL_SERVER="'localhost'"
 PGADMIN_CONFIG_MAIL_PORT=25
 PGADMIN_CONFIG_MAIL_USE_SSL=False
@@ -308,7 +308,7 @@ PGADMIN_CONFIG_MAIL_PASSWORD="''"
 PGADMIN_CONFIG_MAIL_DEBUG=False
 PGADMIN_CONFIG_SECURITY_EMAIL_SENDER="'$PGADMIN_DEFAULT_EMAIL'"
 
-# Dynamic PgAdmin Servers
+# Dynamic PgAdmin Servers (Add as many as you need following copying these variables like {DB1}, {DB2}, DB3)
 PGADMIN_DB1_NAME=Odoocker
 PGADMIN_DB1_HOST=localhost
 PGADMIN_DB1_PORT=5432