diff --git a/mcord/Makefile b/mcord/Makefile
index f51d99f..d7eeb92 100644
--- a/mcord/Makefile
+++ b/mcord/Makefile
@@ -8,11 +8,11 @@
 DOCKER_PROJECT     ?= mcord
 BOOTSTRAP_PROJECT  ?= mcordbs
 
-XOS_UI_PORT        :=8888
+XOS_UI_PORT        := 8000
 
 include $(COMMON_DIR)/Makefile
 
-xos: prereqs config_dirs xos_download cord_services cord_libraries bootstrap onboarding podconfig
+xos: prereqs config_dirs xos_download cord_services cord_libraries bootstrap onboarding podconfig rest-gw ui
 
 onboarding:
 	@echo "[ONBOARDING]"
diff --git a/mcord/docker-compose-bootstrap.yml b/mcord/docker-compose-bootstrap.yml
index 4ce8359..a4ce102 100644
--- a/mcord/docker-compose-bootstrap.yml
+++ b/mcord/docker-compose-bootstrap.yml
@@ -66,7 +66,7 @@
 #            max-file: "5"
 
   xos_bootstrap_ui:
-    command: python /opt/xos/manage.py runserver 0.0.0.0:81 --insecure --makemigrations
+    command: python /opt/xos/manage.py runserver 0.0.0.0:9001 --insecure --makemigrations
     environment:
         - CONFIG_DIR
     image: xosproject/xos
@@ -75,7 +75,7 @@
     links:
         - xos_db
     ports:
-        - "81:81"
+        - "9001:9001"
     volumes:
         - ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config:ro
         - ./xos_cord_config:/opt/xos/xos_configuration/xos_cord_config:ro
diff --git a/mcord/xos-gui.yaml b/mcord/xos-gui.yaml
new file mode 100644
index 0000000..457e946
--- /dev/null
+++ b/mcord/xos-gui.yaml
@@ -0,0 +1,29 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Onboard the exampleservice
+
+imports:
+   - custom_types/xos.yaml
+
+topology_template:
+  node_templates:
+
+    # UI Container
+    xos-spa-gui:
+      type: tosca.nodes.Component
+      properties:
+        # command: cd /var/www; BRAND=opencloud npm run build
+        name: xos-spa-gui
+        image: xosproject/xos-gui
+        ports: 4000:4000
+
+    gui-to-gw:
+      type: tosca.nodes.ComponentLink
+      properties:
+          container: xos-rest-gateway
+          alias: xos-rest-gw
+          kind: internal
+      requirements:
+          - xos:
+             node: xos-spa-gui
+             relationship: tosca.relationships.LinkOfComponent
\ No newline at end of file
diff --git a/mcord/xos.yaml b/mcord/xos.yaml
index 270ad3d..f1662d5 100644
--- a/mcord/xos.yaml
+++ b/mcord/xos.yaml
@@ -10,8 +10,8 @@
     xos:
       type: tosca.nodes.XOS
       properties:
-        ui_port: 8888
-        bootstrap_ui_port: 81
+        ui_port:  9000
+        bootstrap_ui_port:  9001
         docker_project_name: mcord
         db_container_name: mcordbs_xos_db_1
         redis_container_name: mcordbs_xos_redis_1