CORD-1175 Always rebuild all XOS containers

Change-Id: Iad9bd3ed843ec1416d80d2e6940060e4d71d30a5
diff --git a/README.md b/README.md
index ccea68a..aa4ab50 100644
--- a/README.md
+++ b/README.md
@@ -101,22 +101,6 @@
 
 You can then make changes to code and re-run the same or a different profile.
 
-#### Re-building Containers
-
-By default, container images are not rebuilt if they already exist in the development
-environment.  (NOTE: The `xos_core` container is an exception; it is always rebuilt.)
-To force the development loop to rebuild and redeploy specific containers, add
-`rebuild: true` in the appropriate place as described below.
-
-For service synchronizers, add `rebuild: true` to the service's entry in the `xos_services`
-list in the profile manifest.
-
-For GUI extensions, add `rebuild: true` to the extension's entry in the `enabled_gui_extensions`
-list in the profile manifest.
-
-For all other containers, add `rebuild: true` to the container's entry in the `docker_images`
-list in the XOS repo's `group_vars/all` file.
-
 ### Creating a new CORD profile
 
 To create a new CORD profile, you should:
diff --git a/roles/pull-xos-docker-images/tasks/main.yml b/roles/pull-xos-docker-images/tasks/main.yml
index d145454..ad394cd 100644
--- a/roles/pull-xos-docker-images/tasks/main.yml
+++ b/roles/pull-xos-docker-images/tasks/main.yml
@@ -6,7 +6,6 @@
     name: "{{ item }}:latest"
     repository: "{{ item }}:candidate"
   with_items:
-    - xosproject/xos-postgres
     - xosproject/vsg
     - redis
 
diff --git a/roles/xos-core-build/tasks/main.yml b/roles/xos-core-build/tasks/main.yml
index b2d14b2..a96d419 100644
--- a/roles/xos-core-build/tasks/main.yml
+++ b/roles/xos-core-build/tasks/main.yml
@@ -49,6 +49,5 @@
     tag: "{{ build_docker_tag }}"
     dockerfile: "containers/xos/Dockerfile.UI"
     pull: False
-    force: yes
-
-
+    force: True
+    rm: False