diff --git a/.gitignore b/.gitignore
index 65bbad1..497a91a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@
 
 # Ansible
 ansible/*.retry
+*.retry
 
 # Backup files
 *.bak
diff --git a/opencloud-multi-playbook.yml b/opencloud-multi-playbook.yml
deleted file mode 100644
index 931d6cb..0000000
--- a/opencloud-multi-playbook.yml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-# opencloud-multi-playbook.yml
-# Install an OpenCloud site, with multi-node Juju configured OpenStack
-
-- name: Include vars
-  hosts: all
-  tasks:
-    - name: Include variables
-      include_vars: "{{ item }}"
-      with_items:
-        - "profile_manifests/{{ cord_profile }}.yml"
-        - profile_manifests/local_vars.yml
-
-- name: Turn on virtualization
-  hosts: all
-  become: yes
-    - dell-virt
-
-- name: Check prerequisites
-  hosts: all
-  roles:
-    - prereqs-common
-
-- name: DNS Server and apt-cacher-ng Setup
-  hosts: head
-  become: yes
-  roles:
-    - dns-nsd
-    - dns-unbound
-    - apt-cacher-ng
-
-- name: Use the new DNS server, prep systems
-  hosts: all
-  become: yes
-  roles:
-    - dns-configure
-    - common-prep
-
-- name: Configure head node, configure virtualization
-  hosts: head
-  roles:
-    - { role: head-prep, become: yes }
-    - { role: config-virt, become: yes }
-
-- name: Create LXD's, Configure Juju, install XOS
-  hosts: head
-  roles:
-    - create-lxd
-    - onos-vm-install
-    - juju-setup
-    - juju-finish
-    - cord-profile
-    - xos-docker-images
-    - xos-bootstrap
-    - docker-compose
-    - xos-head-start
-
-- name: Configure compute nodes
-  hosts: compute
-  become: yes
-  roles:
-    - compute-prep
-
-- name: Deploy compute nodes
-  hosts: head
-  roles:
-    - juju-compute-setup
-
diff --git a/roles/cord-profile/tasks/main.yml b/roles/cord-profile/tasks/main.yml
index 676ee83..9b39107 100644
--- a/roles/cord-profile/tasks/main.yml
+++ b/roles/cord-profile/tasks/main.yml
@@ -117,16 +117,10 @@
     - xos_common_config
     - deployment.yaml
     - xos.yaml
-    - xos-bootstrap-docker-compose.yaml
-    - onboard-chameleon.yaml
-    - onboard-gui-extensions-store.yaml
-    - onboard-xos-gui.yaml
-    - onboard-xos-ws.yaml
     - gateway-config.yml
     - style.config.js
     - app.config.js
     - Dockerfile.xos
-    - xos-gui-extensions-onboard.yml
     - xos-gui-extensions.yml
     - docker-compose.yml
 
diff --git a/roles/cord-profile/templates/onboard-chameleon.yaml.j2 b/roles/cord-profile/templates/onboard-chameleon.yaml.j2
deleted file mode 100644
index caefaea..0000000
--- a/roles/cord-profile/templates/onboard-chameleon.yaml.j2
+++ /dev/null
@@ -1,26 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-
-description: chameleon component config, generated by platform-install
-
-topology_template:
-  node_templates:
-    xos_chameleon:
-      type: tosca.nodes.Component
-      properties:
-        command: python chameleon/chameleon/main.py -R 9101 -G xos-core:50055
-        image: {{ deploy_docker_registry }}xosproject/chameleon:{{ deploy_docker_tag }}
-        ports: 9101:9101
-
-    chameleon-to-core:
-      type: tosca.nodes.ComponentLink
-      properties:
-          container: xos_core
-          alias: xos-core
-          kind: internal
-      requirements:
-          - xos:
-             node: xos_chameleon
-             relationship: tosca.relationships.LinkOfComponent
diff --git a/roles/cord-profile/templates/onboard-gui-extensions-store.yaml.j2 b/roles/cord-profile/templates/onboard-gui-extensions-store.yaml.j2
deleted file mode 100644
index 02cc72c..0000000
--- a/roles/cord-profile/templates/onboard-gui-extensions-store.yaml.j2
+++ /dev/null
@@ -1,26 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Onboard the exampleservice
-
-imports:
-   - custom_types/xos.yaml
-
-topology_template:
-  node_templates:
-
-    # UI Extension Store
-    gui-extensions-store:
-      type: tosca.nodes.Component
-      properties:
-        image: {{ deploy_docker_registry }}node:argon
-        command: /bin/true
-
-    /var/www/dist/extensions:
-      type: tosca.nodes.ComponentVolume
-      properties:
-          host_path: ""
-          read_only: false
-      requirements:
-          - xos:
-             node: gui-extensions-store
-             relationship: tosca.relationships.VolumeOfComponent
diff --git a/roles/cord-profile/templates/onboard-xos-gui.yaml.j2 b/roles/cord-profile/templates/onboard-xos-gui.yaml.j2
deleted file mode 100644
index 2b41e81..0000000
--- a/roles/cord-profile/templates/onboard-xos-gui.yaml.j2
+++ /dev/null
@@ -1,70 +0,0 @@
-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:
-        image: {{ deploy_docker_registry }}xosproject/xos-gui:{{ deploy_docker_tag }}
-        ports: 4000:4000
-
-    # UI App Config
-    /var/www/dist/app.config.js:
-      type: tosca.nodes.ComponentVolume
-      properties:
-          host_path: {{ cord_profile_dir }}/app.config.js
-          read_only: false
-      requirements:
-          - xos:
-             node: xos-spa-gui
-             relationship: tosca.relationships.VolumeOfComponent
-
-    # UI Style Config
-    /var/www/dist/style.config.js:
-      type: tosca.nodes.ComponentVolume
-      properties:
-          host_path: {{ cord_profile_dir }}/style.config.js
-          read_only: false
-      requirements:
-          - xos:
-             node: xos-spa-gui
-             relationship: tosca.relationships.VolumeOfComponent
-
-    # Mounting volume from volume container
-    gui-extensions-store:
-      type: tosca.nodes.ComponentVolumeContainer
-      properties:
-          container: gui-extensions-store
-      requirements:
-          - xos:
-             node: xos-spa-gui
-             relationship: tosca.relationships.VolumeContainerOfComponent
-
-    gui-to-chameleon:
-      type: tosca.nodes.ComponentLink
-      properties:
-          container: xos_chameleon
-          alias: xos-chameleon
-          kind: internal
-      requirements:
-          - xos:
-             node: xos-spa-gui
-             relationship: tosca.relationships.LinkOfComponent
-
-    gui-to-gw:
-      type: tosca.nodes.ComponentLink
-      properties:
-          container: xos-ws
-          alias: xos-ws
-          kind: internal
-      requirements:
-          - xos:
-             node: xos-spa-gui
-             relationship: tosca.relationships.LinkOfComponent
diff --git a/roles/cord-profile/templates/onboard-xos-ws.yaml.j2 b/roles/cord-profile/templates/onboard-xos-ws.yaml.j2
deleted file mode 100644
index 3c8208a..0000000
--- a/roles/cord-profile/templates/onboard-xos-ws.yaml.j2
+++ /dev/null
@@ -1,50 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Onboard the exampleservice
-
-imports:
-   - custom_types/xos.yaml
-
-topology_template:
-  node_templates:
-
-    # API Gateway
-    xos-ws:
-      type: tosca.nodes.Component
-      properties:
-        image: {{ deploy_docker_registry }}xosproject/xos-ws:{{ deploy_docker_tag }}
-        command: npm start -- --config gateway-config.yml
-        ports: 3000:3000
-
-    # API Gateway config file
-    /var/www/src/config/gateway-config.yml:
-      type: tosca.nodes.ComponentVolume
-      properties:
-          host_path: "{{ cord_profile_dir }}/gateway-config.yml"
-          read_only: false
-      requirements:
-          - xos:
-             node: xos-rest-gateway
-             relationship: tosca.relationships.VolumeOfComponent
-
-    gw-to-xos:
-      type: tosca.nodes.ComponentLink
-      properties:
-          container: xos_ui
-          alias: xos
-          kind: internal
-      requirements:
-          - xos:
-             node: xos-ws
-             relationship: tosca.relationships.LinkOfComponent
-
-    gw-to-redis:
-      type: tosca.nodes.ComponentLink
-      properties:
-          container: {{ cord_profile | regex_replace('\\W','') }}bs_xos_redis_1
-          alias: redis
-          kind: external
-      requirements:
-          - xos:
-             node: xos-ws
-             relationship: tosca.relationships.LinkOfComponent
diff --git a/roles/cord-profile/templates/xos-gui-extensions-onboard.yml.j2 b/roles/cord-profile/templates/xos-gui-extensions-onboard.yml.j2
deleted file mode 100644
index a46c188..0000000
--- a/roles/cord-profile/templates/xos-gui-extensions-onboard.yml.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Onboard xos-sample-gui-extension
-
-imports:
-   - custom_types/xos.yaml
-
-topology_template:
-  node_templates:
-
-    # UI Extensions
-{% for ext in enabled_gui_extensions %}
-    gui-extensions-{{ext.name}}:
-      type: tosca.nodes.Component
-      properties:
-        image: {{ deploy_docker_registry }}xosproject/gui-extension-{{ ext.name }}:{{ deploy_docker_tag }}
-        command: npm run build
-
-    gui-extensions-store-{{ ext.name }}:
-      type: tosca.nodes.ComponentVolumeContainer
-      properties:
-          container: gui-extensions-store
-      requirements:
-          - xos:
-             node: gui-extensions-{{ext.name}}
-             relationship: tosca.relationships.VolumeContainerOfComponent
-{% endfor %}
-
diff --git a/roles/xos-docker-images/defaults/main.yml b/roles/xos-docker-images/defaults/main.yml
deleted file mode 100644
index bb96fea..0000000
--- a/roles/xos-docker-images/defaults/main.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-# xos-docker-images/defaults/main.yml
-
-pki_dir: "/opt/pki"
-cord_dir: "{{ ansible_user_dir + '/cord' }}"
-
-build_xos_base_image: False
-build_xos_test_image: False
-
-deploy_docker_registry: "localhost:5000"
-deploy_docker_tag: "latest"
-
-push_xos_base_image: False
-push_xos_image: False
diff --git a/roles/xos-docker-images/tasks/main.yml b/roles/xos-docker-images/tasks/main.yml
deleted file mode 100644
index 5fd3f81..0000000
--- a/roles/xos-docker-images/tasks/main.yml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-# xos-docker-images/tasks/main.yml
-
-- name: Build xos-base docker image
-  when: build_xos_base_image
-  docker_image:
-    name: "xosproject/xos-base"
-    path: "{{ cord_dir }}/orchestration/xos/containers/xos"
-    dockerfile: "Dockerfile.base"
-
-- name: Pull xos-base docker image from Dockerhub
-  when: not build_xos_base_image
-  docker_image:
-    name: "xosproject/xos-base"
-
-- name: Obtain XOS git repo metadata
-  command: "git log --pretty=format:'{\"XOS_GIT_COMMIT_DATE\":\"%ci\", \"XOS_GIT_COMMIT_HASH\":\"%H\"}' -n 1"
-  args:
-    chdir: "{{ cord_dir }}/orchestration/xos/"
-  register: xos_git_metadata
-  tags:
-    - skip_ansible_lint # idempotent git metadata retrieval, git module can't do this
-
-# Should mount certs in the image rather than baking them in
-- name: Copy over SSL CA certificates
-  copy:
-    src: "{{ pki_dir }}/im_cert_chain.pem"
-    dest: "{{ cord_dir }}/orchestration/xos/containers/xos/local_certs.crt"
-    mode: 0644
-
-- name: Build xosproject/xos devel image
-  docker_image:
-    name: "xosproject/xos"
-    path: "{{ cord_dir }}/orchestration/xos/"
-    dockerfile: "containers/xos/Dockerfile.devel"
-    buildargs: "{{ xos_git_metadata.stdout }}"
-    pull: False # should use locally created, or already pulled xos-base image
-
-- name: Build xosproject/xos-test testing image
-  when: build_xos_test_image
-  docker_image:
-    name: "xosproject/xos-test"
-    path: "{{ cord_dir }}/orchestration/xos/"
-    dockerfile: "containers/xos/Dockerfile.test"
-    pull: False # use the locally built copy of xosproject/xos
-
-- name: Clean up chameleon temp directory
-  file:
-    path: "{{ cord_dir }}/orchestration/xos/containers/chameleon/tmp.chameleon"
-    state: absent
-
-- name: Populate chameleon temp directory
-  shell: cp -a "{{ cord_dir }}/component/chameleon" "{{ cord_dir }}/orchestration/xos/containers/chameleon/tmp.chameleon"
-  tags:
-    - skip_ansible_lint # docker can't access files outside of build context, so we must copy
-
-- name: Build xosproject/chameleon image
-  docker_image:
-    name: "xosproject/chameleon"
-    path: "{{ cord_dir }}/orchestration/xos/containers/chameleon"
-    dockerfile: "Dockerfile.chameleon"
-    pull: False # use the locally built copy of xosproject/xos
-
-- name: Build xosproject/xos-ws container image
-  docker_image:
-    name: "xosproject/xos-ws"
-    path: "{{ cord_dir }}/orchestration/xos-rest-gw" # TODO rename repo
-    dockerfile: "Dockerfile"
-    pull: False # use the locally built copy of xosproject/xos
-
-- name: Build xosproject/xos-gui container image
-  docker_image:
-    name: "xosproject/xos-gui"
-    path: "{{ cord_dir }}/orchestration/xos-gui"
-    dockerfile: "Dockerfile"
-    pull: False # use the locally built copy of xosproject/xos
-
-- name: Tag and push xos-base image to docker registry
-  when: push_xos_base_image
-  docker_image:
-    name: "{{ deploy_docker_registry }}/xosproject/xos-base"
-    tag: "{{ deploy_docker_tag }}"
-    push: yes
-
-- name: Tag and push xos image to docker registry
-  when: push_xos_image
-  docker_image:
-    name: "{{ deploy_docker_registry }}/xosproject/xos"
-    tag: "{{ deploy_docker_tag }}"
-    push: True