diff --git a/base/entrypoint.sh b/base/entrypoint.sh
index d7b049b..eb061b0 100644
--- a/base/entrypoint.sh
+++ b/base/entrypoint.sh
@@ -23,7 +23,7 @@ function configure() {
     
     echo "Configuring $module"
     for c in `printenv | perl -sne 'print "$1 " if m/^${envPrefix}_(.+?)=.*/' -- -envPrefix=$envPrefix`; do 
-        name=`echo ${c} | perl -pe 's/___/-/g; s/__/_/g; s/_/./g'`
+        name=`echo ${c} | perl -pe 's/___/-/g; s/__/@/g; s/_/./g; s/@/_/g;'`
         var="${envPrefix}_${c}"
         value=${!var}
         echo " - Setting $name=$value"
diff --git a/hadoop.env b/hadoop.env
index 8bf3211..304592c 100644
--- a/hadoop.env
+++ b/hadoop.env
@@ -19,4 +19,4 @@ YARN_CONF_yarn_resourcemanager_hostname=resourcemanager
 YARN_CONF_yarn_timeline___service_hostname=historyserver
 YARN_CONF_yarn_resourcemanager_address=resourcemanager:8032
 YARN_CONF_yarn_resourcemanager_scheduler_address=resourcemanager:8030
-YARN_CONF_yarn_resourcemanager_resource__tracker_address=resourcemanager:8031
+YARN_CONF_yarn_resourcemanager_resource___tracker_address=resourcemanager:8031