diff --git a/Makefile b/Makefile
index d2b84af..8d86cde 100644
--- a/Makefile
+++ b/Makefile
@@ -36,10 +36,10 @@
 KS_MS            ?= $(M)/prep-kubespray $(M)/deploy-kubespray $(M)/finish-kubespray $(M)/install-kubernetes-tools $(M)/start-xos-helm
 MAAS_MS          ?= $(M)/build-maas-images $(M)/maas-prime $(M)/publish-maas-images $(M)/deploy-maas
 OPENSTACK_MS     ?= $(M)/glance-images $(M)/deploy-openstack  $(M)/deploy-computenode $(M)/onboard-openstack
-XOS_MS           ?= $(M)/docker-images $(M)/core-image $(M)/publish-docker-images $(M)/start-xos $(M)/onboard-profile
+XOS_MS           ?= $(M)/docker-images $(M)/publish-docker-images $(M)/start-xos $(M)/onboard-profile
 ONOS_MS          ?= $(M)/build-onos-apps $(M)/publish-onos-apps $(M)/deploy-onos $(M)/deploy-mavenrepo
 POST_INSTALL_MS  ?= $(M)/setup-automation $(M)/setup-ciab-pcu $(M)/compute1-up $(M)/compute2-up $(M)/compute3-up
-LOCAL_MILESTONES ?= $(M)/local-cord-config $(M)/local-docker-images $(M)/local-core-image $(M)/local-start-xos $(M)/local-onboard-profile
+LOCAL_MILESTONES ?= $(M)/local-cord-config $(M)/local-docker-images $(M)/local-start-xos $(M)/local-onboard-profile
 ALL_MILESTONES   ?= $(PREP_MS) $(KS_MS) $(MAAS_MS) $(OPENSTACK_MS) $(XOS_MS) $(ONOS_MS) $(POST_INSTALL_MS) $(LOCAL_MILESTONES)
 
 # Configuration files
@@ -120,7 +120,7 @@
 	$(ANSIBLE) -m setup all $(LOGCMD)
 
 clean-images:
-	rm -f $(M)/docker-images $(M)/local-docker-images $(M)/copy-cord $(M)/core-image $(M)/local-core-image $(M)/build-maas-images $(M)/build-onos-apps $(M)/publish-maas-images $(M)/publish-docker-images $(M)/publish-onos-apps
+	rm -f $(M)/docker-images $(M)/local-docker-images $(M)/copy-cord $(M)/build-maas-images $(M)/build-onos-apps $(M)/publish-maas-images $(M)/publish-docker-images $(M)/publish-onos-apps
 
 clean-genconfig:
 	rm -f $(CONFIG_FILES)
@@ -338,16 +338,12 @@
 	$(SSH_BUILD) "cd $(BUILD_CORD_DIR)/build; $(IMAGEBUILDER) -f $(MASTER_CONFIG) -l $(BUILD)/image_logs -g $(BUILD)/ib_graph.dot -a $(BUILD)/ib_actions.yml " $(LOGCMD)
 	touch $@
 
-$(M)/core-image: | $(M)/docker-images
-	$(ANSIBLE_PB) $(PI)/build-core-image-playbook.yml $(LOGCMD)
-	touch $@
-
 # Requires ib_actions.yml file which is on the build host
-$(M)/publish-docker-images: | $(M)/docker-images $(M)/core-image $(PUBLISH_DOCKER_IMAGES_PREREQS)
+$(M)/publish-docker-images: | $(M)/docker-images $(PUBLISH_DOCKER_IMAGES_PREREQS)
 	$(SSH_BUILD) "cd $(BUILD_CORD_DIR)/build; $(ANSIBLE_PB_LOCAL) $(PI)/publish-images-playbook.yml" $(LOGCMD)
 	touch $@
 
-$(M)/start-xos: | $(M)/prep-headnode $(M)/cord-config $(M)/core-image $(START_XOS_PREREQS)
+$(M)/start-xos: | $(M)/prep-headnode $(M)/cord-config $(START_XOS_PREREQS)
 	$(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_LOCAL) $(PI)/start-xos-playbook.yml" $(LOGCMD)
 	touch $@
 
@@ -429,11 +425,7 @@
 	$(IMAGEBUILDER) -f $(MASTER_CONFIG) -l $(BUILD)/image_logs -g $(BUILD)/ib_graph.dot -a $(BUILD)/ib_actions.yml $(LOGCMD)
 	touch $@
 
-$(M)/local-core-image: | $(M)/local-docker-images
-	$(ANSIBLE_PB) $(PI)/build-core-image-playbook.yml $(LOGCMD)
-	touch $@
-
-$(M)/local-start-xos: | $(M)/local-core-image
+$(M)/local-start-xos: | $(M)/local-docker-images
 	$(ANSIBLE_PB) $(PI)/start-xos-playbook.yml $(LOGCMD)
 	touch $@
 
diff --git a/docker_images.yml b/docker_images.yml
index f778b85..09c1ffc 100644
--- a/docker_images.yml
+++ b/docker_images.yml
@@ -68,6 +68,12 @@
     dockerfile: "Dockerfile.xos"
     context: "../.."
 
+  - name: xosproject/xos-ui
+    repo: xos
+    path: "containers/xos"
+    dockerfile: "Dockerfile.UI"
+    context: "../.."
+
   - name: xosproject/xos-libraries
     repo: xos
     path: "containers/xos"
diff --git a/scenarios/controlkube/config.yml b/scenarios/controlkube/config.yml
index 7b4fea8..d1ccc15 100644
--- a/scenarios/controlkube/config.yml
+++ b/scenarios/controlkube/config.yml
@@ -100,6 +100,7 @@
 docker_image_whitelist:
   - "xosproject/xos-base"
   - "xosproject/xos"
+  - "xosproject/xos-ui"
   - "xosproject/xos-client"
   - "xosproject/xos-corebuilder"
   - "xosproject/xos-gui"
diff --git a/scenarios/controlpod/config.yml b/scenarios/controlpod/config.yml
index cef028c..652c245 100644
--- a/scenarios/controlpod/config.yml
+++ b/scenarios/controlpod/config.yml
@@ -65,6 +65,7 @@
 docker_image_whitelist:
   - "xosproject/xos-base"
   - "xosproject/xos"
+  - "xosproject/xos-ui"
   - "xosproject/xos-client"
   - "xosproject/xos-corebuilder"
   - "xosproject/xos-gui"
diff --git a/scenarios/cord/config.yml b/scenarios/cord/config.yml
index 66a3bef..d7b45f1 100644
--- a/scenarios/cord/config.yml
+++ b/scenarios/cord/config.yml
@@ -129,6 +129,7 @@
 docker_image_whitelist:
   - "xosproject/xos-base"
   - "xosproject/xos"
+  - "xosproject/xos-ui"
   - "xosproject/xos-client"
   - "xosproject/xos-corebuilder"
   - "xosproject/xos-gui"
diff --git a/scenarios/local/config.yml b/scenarios/local/config.yml
index 8c82e8b..bebcfd7 100644
--- a/scenarios/local/config.yml
+++ b/scenarios/local/config.yml
@@ -42,6 +42,7 @@
 docker_image_whitelist:
   - "xosproject/xos-base"
   - "xosproject/xos"
+  - "xosproject/xos-ui"
   - "xosproject/xos-client"
   - "xosproject/xos-corebuilder"
   - "xosproject/xos-gui"
diff --git a/scenarios/mock/config.yml b/scenarios/mock/config.yml
index 5db6506..51d045a 100644
--- a/scenarios/mock/config.yml
+++ b/scenarios/mock/config.yml
@@ -62,6 +62,7 @@
 docker_image_whitelist:
   - "xosproject/xos-base"
   - "xosproject/xos"
+  - "xosproject/xos-ui"
   - "xosproject/xos-client"
   - "xosproject/xos-corebuilder"
   - "xosproject/xos-gui"
diff --git a/scenarios/preppedkube/config.yml b/scenarios/preppedkube/config.yml
index b0aa9c1..4b617ec 100644
--- a/scenarios/preppedkube/config.yml
+++ b/scenarios/preppedkube/config.yml
@@ -101,6 +101,7 @@
 docker_image_whitelist:
   - "xosproject/xos-base"
   - "xosproject/xos"
+  - "xosproject/xos-ui"
   - "xosproject/xos-client"
   - "xosproject/xos-corebuilder"
   - "xosproject/xos-gui"
diff --git a/scenarios/preppedpod/config.yml b/scenarios/preppedpod/config.yml
index 172e213..cdad630 100644
--- a/scenarios/preppedpod/config.yml
+++ b/scenarios/preppedpod/config.yml
@@ -97,6 +97,7 @@
 docker_image_whitelist:
   - "xosproject/xos-base"
   - "xosproject/xos"
+  - "xosproject/xos-ui"
   - "xosproject/xos-client"
   - "xosproject/xos-corebuilder"
   - "xosproject/xos-gui"
diff --git a/scenarios/single/config.yml b/scenarios/single/config.yml
index d919c05..cb86c6c 100644
--- a/scenarios/single/config.yml
+++ b/scenarios/single/config.yml
@@ -67,6 +67,7 @@
 docker_image_whitelist:
   - "xosproject/xos-base"
   - "xosproject/xos"
+  - "xosproject/xos-ui"
   - "xosproject/xos-client"
   - "xosproject/xos-corebuilder"
   - "xosproject/xos-gui"