diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8fce603
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+data/
diff --git a/docker-compose.yml b/docker-compose.yml
index 76efd21..8f11847 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ historyserver:
   domainname: hadoop
   net: hadoop
   volumes:
-    - historyserver:/hadoop/yarn/timeline
+    - ./data/historyserver:/hadoop/yarn/timeline
   env_file:
     - ./hadoop.env
 
diff --git a/hadoop.env b/hadoop.env
index 5e88669..8bf3211 100644
--- a/hadoop.env
+++ b/hadoop.env
@@ -1,5 +1,3 @@
-#GANGLIA_HOST=ganglia.hadoop
-
 CORE_CONF_fs_defaultFS=hdfs://namenode:8020
 CORE_CONF_hadoop_http_staticuser_user=root
 CORE_CONF_hadoop_proxyuser_hue_hosts=*
@@ -13,12 +11,12 @@ YARN_CONF_yarn_resourcemanager_recovery_enabled=true
 YARN_CONF_yarn_resourcemanager_store_class=org.apache.hadoop.yarn.server.resourcemanager.recovery.FileSystemRMStateStore
 YARN_CONF_yarn_resourcemanager_fs_state___store_uri=/rmstate
 YARN_CONF_yarn_nodemanager_remote___app___log___dir=/app-logs
-
-YARN_CONF_yarn_log_server_url=http://historyserver.hadoop:8188/applicationhistory/logs/
+YARN_CONF_yarn_log_server_url=http://historyserver:8188/applicationhistory/logs/
 YARN_CONF_yarn_timeline___service_enabled=true
 YARN_CONF_yarn_timeline___service_generic___application___history_enabled=true
 YARN_CONF_yarn_resourcemanager_system___metrics___publisher_enabled=true
-
-
 YARN_CONF_yarn_resourcemanager_hostname=resourcemanager
-YARN_CONF_yarn_timeline___service_hostname=historyserver.hadoop
+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