diff --git a/cord-single-playbook.yml b/cord-single-playbook.yml
index c226493..99b189b 100644
--- a/cord-single-playbook.yml
+++ b/cord-single-playbook.yml
@@ -45,6 +45,6 @@
   roles:
     - xos-vm-install
     - onos-vm-install
-    - docker-compose-pull
+    - docker-compose
     - simulate-fabric
 
diff --git a/roles/docker-compose-pull/tasks/main.yml b/roles/docker-compose-pull/tasks/main.yml
deleted file mode 100644
index 7ddeaac..0000000
--- a/roles/docker-compose-pull/tasks/main.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-# 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_pull_list }}"
-
-
-- name: Run "docker-compose up" where specified
-  command: ansible "{{ item.name }}" -b -u ubuntu -m command \
-                    -a "docker-compose up -d chdir={{ item.path | expanduser }}"
-  with_items: "{{ docker_compose_pull_list | selectattr('up') | list}}"
-
diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker-compose/tasks/main.yml
new file mode 100644
index 0000000..30a7d38
--- /dev/null
+++ b/roles/docker-compose/tasks/main.yml
@@ -0,0 +1,19 @@
+---
+# 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}}"
+
+
+- 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: Run "docker-compose up" where required
+  command: ansible "{{ item.name }}" -b -u ubuntu -m command \
+                    -a "docker-compose up -d chdir={{ item.path | expanduser }}"
+  with_items: "{{ docker_compose_list | selectattr('up') | list}}"
+
diff --git a/vars/cord_defaults.yml b/vars/cord_defaults.yml
index 59cbc04..93bfb32 100644
--- a/vars/cord_defaults.yml
+++ b/vars/cord_defaults.yml
@@ -13,13 +13,15 @@
   - apt.dockerproject.org
   - butler.opencloud.cs.arizona.edu
 
-docker_compose_pull_list:
+docker_compose_list:
   - name: 'onos-cord-1'
     path: 'cord'
+    build: yes
     up: yes
 
   - name: 'xos-1'
     path: 'xos/xos/configurations/cord-pod'
+    build: no
     up: no
 
 charm_versions: