diff --git a/entrypoint.sh b/entrypoint.sh
index 55fbd62..69af820 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -5,10 +5,12 @@ USER_GROUP=${USER_GROUP:-nextcloudgroup}
 USER_UID=${USER_UID:-1000}
 USER_GID=${USER_GID:-1000}
 NEXTCLOUD_SLEEP=${NEXTCLOUD_SLEEP:-30}
+NEXTCLOUD_DIR_CHOWN=${NEXTCLOUD_DIR_CHOWN:-1}
+NEXTCLOUD_DIR=${NEXTCLOUD_DIR:-/data}
 
 # check if group already exists
 GRP_NAME=$(getent group "${USER_GID}" )
-if [ "${GRP_NAME}" ] ; then
+if [[ -n "${GRP_NAME}" ]] ; then
 	USER_GROUP="${GRP_NAME//:*/}"
 else
 	# if not, we create the group
@@ -17,7 +19,7 @@ fi
 
 # check if user already exists
 USR_NAME=$(getent passwd "${USER_UID}" )
-if [ "${USR_NAME}" ] ; then
+if [[ -n "${USR_NAME}" ]] ; then
 	USER_NAME="${USR_NAME//:*/}"
 else
 	# if not, we create the user
@@ -25,12 +27,12 @@ else
 fi
 
 # create dir if not exists (it should exist if you mapped it outside the container)
-if [ ! -d "${NEXTCLOUD_DIR}" ] ; then
+if [[ ! -d "${NEXTCLOUD_DIR}" ]] ; then
 	mkdir -p "${NEXTCLOUD_DIR}"
 fi
 
 # replace data directory permissions
-if [ "${NEXTCLOUD_DIR_CHOWN}" = "1" ] ; then
+if [[ "${NEXTCLOUD_DIR_CHOWN}" = "1" ]] ; then
 	chown -R "${USER_UID}":"${USER_GID}" "${NEXTCLOUD_DIR}"
 fi
 
diff --git a/start.sh b/start.sh
index 34bbb22..df8ab01 100755
--- a/start.sh
+++ b/start.sh
@@ -6,35 +6,43 @@ NEXTCLOUD_URL=${NEXTCLOUD_URL:-https://nextcloud.example.com}
 NEXTCLOUD_DIR=${NEXTCLOUD_DIR:-/data}
 NEXTCLOUD_DIR_CHOWN=${NEXTCLOUD_DIR_CHOWN:-1}
 
+NEXTCLOUD_FORCE_TRUST=${NEXTCLOUD_FORCE_TRUST:-0}
+NEXTCLOUD_HTTPPROXY=${NEXTCLOUD_HTTPPROXY:-}
+NEXTCLOUD_UPLIMIT=${NEXTCLOUD_UPLIMIT:-}
+NEXTCLOUD_DOWNLIMIT=${NEXTCLOUD_DOWNLIMIT:-}
+NEXTCLOUD_EXCLUDEFILE=${NEXTCLOUD_EXCLUDEFILE:-}
+NEXTCLOUD_UNSYNCFILE=${NEXTCLOUD_UNSYNCFILE:-}
+NEXTCLOUD_SILENT=${NEXTCLOUD_SILENT:-0}
+
 PARAMS=()
-if [ "${NEXTCLOUD_FORCE_TRUST}" = "1" ] ; then
+if [[ "${NEXTCLOUD_FORCE_TRUST}" = "1" ]] ; then
 	PARAMS+=("--trust")
 fi
-if [ ! "${NEXTCLOUD_HTTPPROXY}" = "" ] ; then
+if [[ ! "${NEXTCLOUD_HTTPPROXY}" = "" ]] ; then
 	PARAMS+=("--httpproxy")
 	PARAMS+=("${NEXTCLOUD_HTTPPROXY}")
 fi
-if [ ! "${NEXTCLOUD_UPLIMIT}" = "" ] ; then
+if [[ ! "${NEXTCLOUD_UPLIMIT}" = "" ]] ; then
 	PARAMS+=("--uplimit")
 	PARAMS+=("${NEXTCLOUD_UPLIMIT}")
 fi
-if [ ! "${NEXTCLOUD_DOWNLIMIT}" = "" ] ; then
+if [[ ! "${NEXTCLOUD_DOWNLIMIT}" = "" ]] ; then
 	PARAMS+=("--downlimit")
 	PARAMS+=("${NEXTCLOUD_DOWNLIMIT}")
 fi
-if [ ! "${NEXTCLOUD_EXCLUDEFILE}" = "" ] ; then
-	if [ -r "${NEXTCLOUD_EXCLUDEFILE}" ] ; then
+if [[ ! "${NEXTCLOUD_EXCLUDEFILE}" = "" ]] ; then
+	if [[ -r "${NEXTCLOUD_EXCLUDEFILE}" ]] ; then
 		PARAMS+=("--exclude")
 		PARAMS+=("${NEXTCLOUD_EXCLUDEFILE}")
 	fi
 fi
-if [ ! "${NEXTCLOUD_UNSYNCFILE}" = "" ] ; then
-	if [ -r "${NEXTCLOUD_UNSYNCFILE}" ] ; then
+if [[ ! "${NEXTCLOUD_UNSYNCFILE}" = "" ]] ; then
+	if [[ -r "${NEXTCLOUD_UNSYNCFILE}" ]] ; then
 		PARAMS+=("--unsyncedfolders")
 		PARAMS+=("${NEXTCLOUD_UNSYNCFILE}")
 	fi
 fi
-if [ "${NEXTCLOUD_SILENT}" = "1" ] ; then
+if [[ "${NEXTCLOUD_SILENT}" = "1" ]] ; then
 	PARAMS+=("--silent")
 fi