diff --git a/roles/xos-container-test-addressmanager/tasks/main.yml b/roles/xos-container-test-addressmanager/tasks/main.yml
deleted file mode 100644
index 4e34503..0000000
--- a/roles/xos-container-test-addressmanager/tasks/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-addressmanager-sync tests
-
-- name: Check XOS AddressManager Synchronizer Process
-  shell: ps -f | grep "python addressmanager-synchronizer.py -C /opt/xos/synchronizers/addressmanager/addressmanager_synchronizer_config"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
diff --git a/roles/xos-container-test-chameleon/tasks/main.yml b/roles/xos-container-test-chameleon/tasks/main.yml
deleted file mode 100644
index baedbec..0000000
--- a/roles/xos-container-test-chameleon/tasks/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-spa-gui tests
-
-- name: Check Chameleon Process
-  shell: ps -f | grep "'python chameleon/chameleon/main.py -R 9101 -G xos-core:50055'"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
diff --git a/roles/xos-container-test-core/tasks/main.yml b/roles/xos-container-test-core/tasks/main.yml
deleted file mode 100644
index 5f7c22f..0000000
--- a/roles/xos-container-test-core/tasks/main.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#xos-core tests
-
-- name: Check XOS Core Process
-  shell: ps -f | grep "bash -c cd coreapi; bash ./start_coreapi.sh"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
diff --git a/roles/xos-container-test-fabric/tasks/main.yml b/roles/xos-container-test-fabric/tasks/main.yml
deleted file mode 100644
index 0607f76..0000000
--- a/roles/xos-container-test-fabric/tasks/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-fabric-sync tests
-
-- name: Check XOS Fabric Synchronizer Process
-  shell: ps -f | grep "python fabric-synchronizer.py -C /opt/xos/synchronizers/fabric/fabric_synchronizer_config"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-onos/tasks/main.yml b/roles/xos-container-test-onos/tasks/main.yml
deleted file mode 100644
index 11d1a8a..0000000
--- a/roles/xos-container-test-onos/tasks/main.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#xos-onos-sync tests
-
-- name: Check XOS ONOS Synchronizer Process
-  shell: ps -f | grep "python onos-synchronizer.py -C /opt/xos/synchronizers/onos/onos_synchronizer_config"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-openstack/tasks/main.yml b/roles/xos-container-test-openstack/tasks/main.yml
deleted file mode 100644
index 1deefaf..0000000
--- a/roles/xos-container-test-openstack/tasks/main.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#xos-openstack-sync tests
-
-- name: Check XOS Openstack Synchronizer Process
-  shell: ps -f | grep "python openstack-synchronizer.py -C /opt/xos/synchronizers/openstack/openstack_synchronizer_config"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-postgres/tasks/main.yml b/roles/xos-container-test-postgres/tasks/main.yml
deleted file mode 100644
index 6c81a8f..0000000
--- a/roles/xos-container-test-postgres/tasks/main.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#xos-postgres tests
-
-- name: Check PSQL Service Status
-  service:
-    name: postgresql
-    state: started
-  tags:
-    - skip_ansible_lint # running a sub job
-
-- name: Check PSQL Service Version/Port
-  shell: service postgresql status | grep "{{ item }}"
-  register: result
-  with_items:
-    - 9.6/main
-    - port 5432
-    - online
-  tags:
-    - skip_ansible_lint # running a sub job
diff --git a/roles/xos-container-test-restgw/tasks/main.yml b/roles/xos-container-test-restgw/tasks/main.yml
deleted file mode 100644
index ee32966..0000000
--- a/roles/xos-container-test-restgw/tasks/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-ws tests
-
-- name: Check Rest GW Process
-  shell: ps -f | grep "node src/server.js --config gateway-config.yml"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
diff --git a/roles/xos-container-test-spa-gui/tasks/main.yml b/roles/xos-container-test-spa-gui/tasks/main.yml
deleted file mode 100644
index d1b372d..0000000
--- a/roles/xos-container-test-spa-gui/tasks/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-spa-gui tests
-
-- name: Check GUI Process
-  shell: ps -f | grep "nginx -g daemon off"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
diff --git a/roles/xos-container-test-ui/tasks/main.yml b/roles/xos-container-test-ui/tasks/main.yml
deleted file mode 100644
index 9b3b05b..0000000
--- a/roles/xos-container-test-ui/tasks/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-ui tests
-
-- name: Check UI Process
-  shell: ps -f | grep "python /opt/xos/manage.py runserver 0.0.0.0:9000 --insecure --makemigrations"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-vee/tasks/main.yml b/roles/xos-container-test-vee/tasks/main.yml
deleted file mode 100644
index 97f7d1d..0000000
--- a/roles/xos-container-test-vee/tasks/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-vee-sync tests
-
-- name: Check XOS VEE Synchronizer Process
-  shell: ps -f | grep "python vee-synchronizer.py -C /opt/xos/synchronizers/vee/vee_synchronizer_config"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-veg/tasks/main.yml b/roles/xos-container-test-veg/tasks/main.yml
deleted file mode 100644
index f6de2c9..0000000
--- a/roles/xos-container-test-veg/tasks/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-veg-sync tests
-
-- name: Check XOS VEG Synchronizer Process
-  shell: ps -f | grep "python veg-synchronizer.py -C /opt/xos/synchronizers/veg/veg_synchronizer_config"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-vnaas/tasks/main.yml b/roles/xos-container-test-vnaas/tasks/main.yml
deleted file mode 100644
index 2fa9312..0000000
--- a/roles/xos-container-test-vnaas/tasks/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-vnaas-sync tests
-
-- name: Check XOS VNAAS Synchronizer Process
-  shell: ps -f | grep "python vnaas-synchronizer.py -C /opt/xos/synchronizers/vnaas/vnaas_synchronizer_config"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
diff --git a/roles/xos-container-test-vnod/tasks/main.yml b/roles/xos-container-test-vnod/tasks/main.yml
deleted file mode 100644
index b8b3c11..0000000
--- a/roles/xos-container-test-vnod/tasks/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-vnod-sync tests
-
-- name: Check XOS VNOD Synchronizer Process
-  shell: ps -f | grep "python vnod-synchronizer.py -C /opt/xos/synchronizers/vnod/vnod_synchronizer_config"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-volt/tasks/main.yml b/roles/xos-container-test-volt/tasks/main.yml
deleted file mode 100644
index 8c9092e..0000000
--- a/roles/xos-container-test-volt/tasks/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-volt-sync tests
-
-- name: Check XOS vOLT Synchronizer Process
-  shell: ps -f | grep "python volt-synchronizer.py -C /opt/xos/synchronizers/volt/volt_synchronizer_config"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
diff --git a/roles/xos-container-test-vrouter/tasks/main.yml b/roles/xos-container-test-vrouter/tasks/main.yml
deleted file mode 100644
index 8e72c13..0000000
--- a/roles/xos-container-test-vrouter/tasks/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-vrouter-sync tests
-
-- name: Check XOS VROUTER Synchronizer Process
-  shell: ps -f | grep "python vrouter-synchronizer.py -C /opt/xos/synchronizers/vrouter/vrouter_config"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-vsg/tasks/main.yml b/roles/xos-container-test-vsg/tasks/main.yml
deleted file mode 100644
index 343c553..0000000
--- a/roles/xos-container-test-vsg/tasks/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-vsg-sync tests
-
-- name: Check XOS VSG Synchronizer Process
-  shell: ps -f | grep "python vcpe-synchronizer.py -C /opt/xos/synchronizers/vsg/vsg_synchronizer_config"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
\ No newline at end of file
diff --git a/roles/xos-container-test-vtn/tasks/main.yml b/roles/xos-container-test-vtn/tasks/main.yml
deleted file mode 100644
index cbe460e..0000000
--- a/roles/xos-container-test-vtn/tasks/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-vtn-sync tests
-
-- name: Check XOS VTN Synchronizer Process
-  shell: ps -f | grep "python vtn-synchronizer.py -C /opt/xos/synchronizers/vtn/vtn_synchronizer_config"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
diff --git a/roles/xos-container-test-vtr/tasks/main.yml b/roles/xos-container-test-vtr/tasks/main.yml
deleted file mode 100644
index 91cb2cc..0000000
--- a/roles/xos-container-test-vtr/tasks/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#xos-vtr-sync tests
-
-- name: Check XOS VTR Synchronizer Process
-  shell: ps -f | grep "python vtr-synchronizer.py -C /opt/xos/synchronizers/vtr/vtr_synchronizer_config"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
diff --git a/roles/xos-container-test-ws/tasks/main.yml b/roles/xos-container-test-ws/tasks/main.yml
deleted file mode 100644
index 002b193..0000000
--- a/roles/xos-container-test-ws/tasks/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#xos-ws tests
-
-- name: Check Rest GW Process
-  shell: ps -f | grep "node src/server.js --config gateway-config.yml"
-  register: result
-  until: result | success
-  retries: 10
-  delay: 5
-  tags:
-    - skip_ansible_lint # running a sub job
-