diff --git a/18.0/entrypoint.sh b/18.0/entrypoint.sh
index a208e2c..36466e8 100755
--- a/18.0/entrypoint.sh
+++ b/18.0/entrypoint.sh
@@ -15,15 +15,23 @@ fi
 : ${DB_NAME:=${DB_ENV_POSTGRES_DB_NAME:=${POSTGRES_DB_NAME:='odoo'}}}
 
 DB_ARGS=()
+PY_DB_ARGS=()
 function check_config() {
     param="$1"
     value="$2"
     if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then       
         value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g')
     fi;
-    DB_ARGS+=("--${param}")
-    DB_ARGS+=("${value}")
+
+    if [ "${param}" != "db_name" ]; then
+      DB_ARGS+=("--${param}")
+      DB_ARGS+=("${value}")
+    fi;
+
+    PY_DB_ARGS+=("--${param}")
+    PY_DB_ARGS+=("${value}")
 }
+
 check_config "db_host" "$HOST"
 check_config "db_port" "$PORT"
 check_config "db_user" "$USER"
@@ -36,12 +44,12 @@ case "$1" in
         if [[ "$1" == "scaffold" ]] ; then
             exec odoo "$@"
         else
-            wait-for-psql.py ${DB_ARGS[@]} --timeout=30
+            wait-for-psql.py ${PY_DB_ARGS[@]} --timeout=30
             exec odoo "$@" "${DB_ARGS[@]}"
         fi
         ;;
     -*)
-        wait-for-psql.py ${DB_ARGS[@]} --timeout=30
+        wait-for-psql.py ${PY_DB_ARGS[@]} --timeout=30
         exec odoo "$@" "${DB_ARGS[@]}"
         ;;
     *)