diff --git a/8.0/entrypoint.sh b/8.0/entrypoint.sh
index 8ec01b4..1cdcf6e 100755
--- a/8.0/entrypoint.sh
+++ b/8.0/entrypoint.sh
@@ -3,10 +3,10 @@
 set -e
 
 # set odoo database host, port, user and password
-: ${PGHOST:=$DB_PORT_5432_TCP_ADDR}
-: ${PGPORT:=$DB_PORT_5432_TCP_PORT}
-: ${PGUSER:=${DB_ENV_POSTGRES_USER:='postgres'}}
-: ${PGPASSWORD:=$DB_ENV_POSTGRES_PASSWORD}
+: ${PGHOST:=${RDS_HOSTNAME:=${PGHOST:=${DB_PORT_5432_TCP_ADDR:='localhost'}}}}
+: ${PGPORT:=${RDS_PORT:=${PGPORT:=${DB_PORT_5432_TCP_PORT:=5432}}}}
+: ${PGUSER:=${RDS_USERNAME:=${PGUSER:=${DB_ENV_POSTGRES_USER:='postgres'}}}}
+: ${PGPASSWORD:=${RDS_PASSWORD:=${PGPASSWORD:=$DB_ENV_POSTGRES_PASSWORD}}}
 export PGHOST PGPORT PGUSER PGPASSWORD
 
 case "$1" in