diff --git a/15.0/entrypoint.sh b/15.0/entrypoint.sh
index f802bcb25..4dc691aba 100755
--- a/15.0/entrypoint.sh
+++ b/15.0/entrypoint.sh
@@ -10,10 +10,13 @@ fi
 # and pass them as arguments to the odoo process if not present in the config file
 : ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
 : ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
+: ${NAME:=${DB_ENV_POSTGRES_NAME:=${POSTGRES_NAME:='postgres'}}}
 : ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
 : ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
+: ${SEED:=${DB_ENV_SEED:=false}}
 
 DB_ARGS=()
+ODOO_ARGS=()
 function check_config() {
     param="$1"
     value="$2"
@@ -23,11 +26,17 @@ function check_config() {
     DB_ARGS+=("--${param}")
     DB_ARGS+=("${value}")
 }
+
+check_config "db_name" "$NAME"
 check_config "db_host" "$HOST"
 check_config "db_port" "$PORT"
 check_config "db_user" "$USER"
 check_config "db_password" "$PASSWORD"
 
+if "$SEED" ; then
+    ODOO_ARGS+=("-i base")
+fi
+
 case "$1" in
     -- | odoo)
         shift
@@ -35,7 +44,7 @@ case "$1" in
             exec odoo "$@"
         else
             wait-for-psql.py ${DB_ARGS[@]} --timeout=30
-            exec odoo "$@" "${DB_ARGS[@]}"
+            exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}"
         fi
         ;;
     -*)
diff --git a/16.0/entrypoint.sh b/16.0/entrypoint.sh
index f802bcb25..4dc691aba 100755
--- a/16.0/entrypoint.sh
+++ b/16.0/entrypoint.sh
@@ -10,10 +10,13 @@ fi
 # and pass them as arguments to the odoo process if not present in the config file
 : ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
 : ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
+: ${NAME:=${DB_ENV_POSTGRES_NAME:=${POSTGRES_NAME:='postgres'}}}
 : ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
 : ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
+: ${SEED:=${DB_ENV_SEED:=false}}
 
 DB_ARGS=()
+ODOO_ARGS=()
 function check_config() {
     param="$1"
     value="$2"
@@ -23,11 +26,17 @@ function check_config() {
     DB_ARGS+=("--${param}")
     DB_ARGS+=("${value}")
 }
+
+check_config "db_name" "$NAME"
 check_config "db_host" "$HOST"
 check_config "db_port" "$PORT"
 check_config "db_user" "$USER"
 check_config "db_password" "$PASSWORD"
 
+if "$SEED" ; then
+    ODOO_ARGS+=("-i base")
+fi
+
 case "$1" in
     -- | odoo)
         shift
@@ -35,7 +44,7 @@ case "$1" in
             exec odoo "$@"
         else
             wait-for-psql.py ${DB_ARGS[@]} --timeout=30
-            exec odoo "$@" "${DB_ARGS[@]}"
+            exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}"
         fi
         ;;
     -*)
diff --git a/17.0/entrypoint.sh b/17.0/entrypoint.sh
index f802bcb25..4dc691aba 100755
--- a/17.0/entrypoint.sh
+++ b/17.0/entrypoint.sh
@@ -10,10 +10,13 @@ fi
 # and pass them as arguments to the odoo process if not present in the config file
 : ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
 : ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
+: ${NAME:=${DB_ENV_POSTGRES_NAME:=${POSTGRES_NAME:='postgres'}}}
 : ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
 : ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
+: ${SEED:=${DB_ENV_SEED:=false}}
 
 DB_ARGS=()
+ODOO_ARGS=()
 function check_config() {
     param="$1"
     value="$2"
@@ -23,11 +26,17 @@ function check_config() {
     DB_ARGS+=("--${param}")
     DB_ARGS+=("${value}")
 }
+
+check_config "db_name" "$NAME"
 check_config "db_host" "$HOST"
 check_config "db_port" "$PORT"
 check_config "db_user" "$USER"
 check_config "db_password" "$PASSWORD"
 
+if "$SEED" ; then
+    ODOO_ARGS+=("-i base")
+fi
+
 case "$1" in
     -- | odoo)
         shift
@@ -35,7 +44,7 @@ case "$1" in
             exec odoo "$@"
         else
             wait-for-psql.py ${DB_ARGS[@]} --timeout=30
-            exec odoo "$@" "${DB_ARGS[@]}"
+            exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}"
         fi
         ;;
     -*)