diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker-compose/tasks/main.yml
index 30a7d38..d97da2e 100644
--- a/roles/docker-compose/tasks/main.yml
+++ b/roles/docker-compose/tasks/main.yml
@@ -1,17 +1,18 @@
 ---
 # docker-compose-pull/tasks/main.yml
 
-- name: Pull images from dockerhub with docker-compose
-  command: ansible "{{ item.name }}" -b -u ubuntu -m command \
-                    -a "docker-compose pull chdir={{ item.path | expanduser }}"
-  with_items: "{{ docker_compose_list | selectattr('pull') | list}}"
-
+# Note: build/pull are mutually exclusive in this case
 
 - name: Build images from dockerhub with docker-compose
   command: ansible "{{ item.name }}" -b -u ubuntu -m command \
                     -a "docker-compose build chdir={{ item.path | expanduser }}"
   with_items: "{{ docker_compose_list | selectattr('build') | list}}"
 
+- name: Pull images from dockerhub with docker-compose
+  command: ansible "{{ item.name }}" -b -u ubuntu -m command \
+                    -a "docker-compose pull chdir={{ item.path | expanduser }}"
+  with_items: "{{ docker_compose_list | rejectattr('build') | list}}"
+
 - name: Run "docker-compose up" where required
   command: ansible "{{ item.name }}" -b -u ubuntu -m command \
                     -a "docker-compose up -d chdir={{ item.path | expanduser }}"
diff --git a/roles/onos-vm-install/files/onos-setup-playbook.yml b/roles/onos-vm-install/files/onos-setup-playbook.yml
index e02b15a..7c3d7e5 100644
--- a/roles/onos-vm-install/files/onos-setup-playbook.yml
+++ b/roles/onos-vm-install/files/onos-setup-playbook.yml
@@ -63,8 +63,8 @@
        - id_rsa.pub
 
     - name: Copy SSL Certs so docker-compose can find it
-      command: "mv /usr/local/share/ca-certificates/keystone_juju_ca_cert.crt {{ ansible_user_dir }}/cord/xos-certs.crt"
-      creates: "{{ ansible_user_dir }}/cord/xos-certs.crt"
+      command: mv /usr/local/share/ca-certificates/keystone_juju_ca_cert.crt {{ ansible_user_dir }}/cord/xos-certs.crt
+        creates="{{ ansible_user_dir }}/cord/xos-certs.crt"
 
     - name: Copy over files to build XOS variant of ONOS
       copy: