diff --git a/18.0/docker-compose.yml b/18.0/docker-compose.yml
index 364690c..fdc3db7 100644
--- a/18.0/docker-compose.yml
+++ b/18.0/docker-compose.yml
@@ -9,11 +9,11 @@ services:
     environment:
       ADDONS_PATH: ${ADDONS_PATH:-/mnt/extra-addons}
       DATA_DIR: ${DATA_DIR:-/var/lib/odoo}
-      DB_HOST: ${HOST:-${DB_PORT_5432_TCP_ADDR:-postgres}}
-      DB_PORT: ${PORT:-${DB_PORT_5432_TCP_PORT:-5432}}
-      DB_USER: ${USER:-${DB_ENV_POSTGRES_USER:-${POSTGRES_USER:-odoo}}}
-      DB_PASSWORD: ${PASSWORD:-${DB_ENV_POSTGRES_PASSWORD:-${POSTGRES_PASSWORD:-odoo}}}
-#      DB_NAME: ${DB_NAME:-${DATABASE:-${DB_ENV_POSTGRES_DATABASE:-odoo}}}
+      DB_HOST: ${DB_HOST:-db}
+      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}
diff --git a/18.0/entrypoint.sh b/18.0/entrypoint.sh
index 6d71d8d..6b1313c 100755
--- a/18.0/entrypoint.sh
+++ b/18.0/entrypoint.sh
@@ -5,10 +5,10 @@ set -e
 # Setup default configuration values
 export ADDONS_PATH=${ADDONS_PATH:-/mnt/extra-addons}
 export DATA_DIR=${DATA_DIR:-/var/lib/odoo}
-export DB_HOST=${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
-export DB_PORT=${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
-export DB_USER=${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
-export DB_PASSWORD=${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
+export DB_HOST=${DB_HOST:=${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}}
+export DB_PORT=${DB_PORT:=${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}}
+export DB_USER=${DB_USER:=${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}}
+export DB_PASSWORD=${DB_PASSWORD:=${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}}
 export DB_NAME=${DB_NAME:-'postgres'}
 export ADMIN_PASSWD=${ADMIN_PASSWD:-admin}
 export CSV_INTERNAL_SEP=${CSV_INTERNAL_SEP:-,}
@@ -44,6 +44,8 @@ export XMLRPCS=${XMLRPCS:-True}
 export XMLRPCS_INTERFACE=${XMLRPCS_INTERFACE:-}
 export XMLRPCS_PORT=${XMLRPCS_PORT:-8071}
 
+echo $DB_HOST
+
 # Set the password file environment variable
 if [ -v PASSWORD_FILE ]; then
     DB_PASSWORD="$(< $PASSWORD_FILE)"
@@ -51,7 +53,7 @@ fi
 
 # Substitute environment variables into the config file
 # and write them back to the Odoo config
-envsubst < /etc/odoo/odoo.conf > /etc/odoo/odoo_docker.conf
+envsubst < /etc/odoo/odoo.conf > "${ODOO_RC}"
 
 case "$1" in
     -- | odoo)