diff --git a/README.md b/README.md
index bcb6f15ecb2f677df335437c2ebac7fd5364d98d..f3797a4763c45f28fb0a0f0d9b1ab7b39377e55a 100755
--- a/README.md
+++ b/README.md
@@ -25,10 +25,10 @@ You can specify where is php with `env_proxy` variable. For example :
 
 You can also setup a global composer directory and make the bin directory available in the `$PATH` automatically by:
  
-    composer_home_path: /var/data/composer
-    composer_home_owner: kosssi
-    composer_home_group: kosssi
     composer_path_env: true
+    composer_home_path: /opt/composer
+    composer_home_owner: root
+    composer_home_group: root
     composer_global_packages:
       phpunit/phpunit: "@stable"
 
diff --git a/defaults/main.yml b/defaults/main.yml
index 8cc238e51a6cb2318ae40b235fb6fc496aa224bb..4a0f5defa69481d585e9852927123f02274a4d1d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,9 +3,9 @@
 composer_path: /usr/local/bin/composer
 composer_update: true
 composer_update_day: 20
-composer_home_path: ~
+composer_path_env: False
+#composer_home_path: /opt/composer
 composer_home_owner: root
 composer_home_group: root
-composer_path_env: False
 composer_global_packages: {}
 proxy_env: {}
diff --git a/tasks/configure.yml b/tasks/configure.yml
index 0d69020c62763cc71def3a2616b6b7447779d076..738dc4e098e9893a7a31af6d7fd156decaf0997e 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -2,12 +2,12 @@
 
 - name: Create composer home path
   file: path={{ composer_home_path }} state=directory owner={{ composer_home_owner }} group={{ composer_home_group }}
-  when: composer_home_path
+  when: composer_home_path is defined
 
 - name: Configure composer home path
   copy: dest=/etc/profile.d/composer-home.sh mode=0755
         content="export COMPOSER_HOME={{ composer_home_path}}\n"
-  when: composer_home_path
+  when: composer_home_path is defined
 
 - name: Configure composer path environment
   copy: dest=/etc/profile.d/composer-path.sh mode=0755
@@ -15,7 +15,8 @@
   when: composer_path_env
 
 - name: Global require packages
-  shell: composer global require {{ item.key }}:{{ item.value }} --no-progress
+  shell: COMPOSER_HOME={{ composer_home_path|default('~/.composer') }}
+         composer global require {{ item.key }}:{{ item.value }} --no-progress
          creates={{ composer_home_path|default('~/.composer') }}/vendor/{{ item.key }}
   with_dict: composer_global_packages
   when: composer_global_packages|length > 0