diff --git a/run.sh b/run.sh
index f6883bb..2f3336a 100644
--- a/run.sh
+++ b/run.sh
@@ -4,13 +4,13 @@ binary=${APP_BINARY:-/usr/local/bin/imgsrv}
 MONGODB_SERVICE_HOST=${MONGODB_SERVICE_HOST:-localhost}
 MONGODB_SERVICE_PORT=${MONGODB_SERVICE_PORT:-27017}
 
-args=""
-if [ ! -z "${DATABASE_USER}" ] ; then
-	args=" ${args} -mongo-username=$DATABASE_USER "
+args=${ARGS:-""}
+if [ ! -z "${MONGODB_USER}" ] ; then
+	args=" ${args} -mongo-username=$MONGODB_USER "
 fi
 
-if [ ! -z "${DATABASE_PASSWORD}" ] ; then
-	args=" ${args} -mongo-password=$DATABASE_PASSWORD "
+if [ ! -z "${MONGODB_PASSWORD}" ] ; then
+	args=" ${args} -mongo-password=$MONGODB_PASSWORD "
 fi
 
 if ! echo "${1:-$@}" | grep -q '\-mongo-host' ; then