diff --git a/roles/docker-compose-pull/tasks/main.yml b/roles/docker-compose-pull/tasks/main.yml
index 49079a9..921e42d 100644
--- a/roles/docker-compose-pull/tasks/main.yml
+++ b/roles/docker-compose-pull/tasks/main.yml
@@ -3,12 +3,12 @@
 
 - name: Pull images from dockerhub with docker-compose
   command: ansible "{{ item.name }}" -b -u ubuntu -m command \
-                    -a "docker pull chdir={{ item.path }}"
+                    -a "docker-compose pull chdir={{ item.path | expanduser }}"
   with_items: "{{ docker_compose_pull_list }}"
 
 
 - name: Run "docker-compose up" where specified
   command: ansible "{{ item.name }}" -b -u ubuntu -m command \
-                    -a "docker up -d chdir={{ item.path }}"
+                    -a "docker-compose up -d chdir={{ item.path | expanduser }}"
   with_items: "{{ docker_compose_pull_list | selectattr('up') }}"
 
diff --git a/vars/cord_defaults.yml b/vars/cord_defaults.yml
index 34857dc..002cb7a 100644
--- a/vars/cord_defaults.yml
+++ b/vars/cord_defaults.yml
@@ -8,8 +8,14 @@
 xos_configuration: cord-pod
 
 docker_compose_pull_list:
-  - { name:'onos-cord-1', path:'~/cord', up:True}
-  - { name:'xos-1', path:'~//xos/xos/configurations/cord-pod', up:False }
+  - name: 'onos-cord-1'
+    path: '~/cord'
+    up: yes
+
+  - name: 'xos-1'
+    path: '~/xos/xos/configurations/cord-pod'
+    up: no
+
 
 charm_versions:
   ceilometer: "cs:trusty/ceilometer-17"