diff --git a/scripts/env-data.sh b/scripts/env-data.sh
index 3783231..a3191b2 100644
--- a/scripts/env-data.sh
+++ b/scripts/env-data.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-DATADIR="/var/lib/postgresql/12/main"
+DEFAULT_DATADIR="/var/lib/postgresql/12/main"
 ROOT_CONF="/etc/postgresql/12/main"
 PG_ENV="$ROOT_CONF/environment"
 CONF="$ROOT_CONF/postgresql.conf"
@@ -66,9 +66,9 @@ fi
 if [ -z "${POSTGRES_DBNAME}" ]; then
 	POSTGRES_DBNAME=gis
 fi
-# If datadir is defined use this
-if [ -n "${DATADIR}" ]; then
-  DATADIR=${DATADIR}
+# If datadir is not defined, then use this
+if [ -z "${DATADIR}" ]; then
+  DATADIR=${DEFAULT_DATADIR}
 fi
 # RECREATE_DATADIR flag default value
 # Always assume that we don't want to recreate datadir if not explicitly defined