diff --git a/tcp_tests/requirements.txt b/tcp_tests/requirements.txt
index b4b4f55..16fdebc 100644
--- a/tcp_tests/requirements.txt
+++ b/tcp_tests/requirements.txt
@@ -28,6 +28,7 @@
 retrying
 virtualbmc<2.0
 requests-oauthlib==1.3.1
+jq
 
 
 # For Queens: https://github.com/openstack/requirements/blob/stable/queens/global-requirements.txt
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/env_add.yml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/env_add.yml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/infra_config_nodes_add.yml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/infra_config_nodes_add.yml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/infra_kvm_add.yml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/infra_kvm_add.yml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/openstack_init_add.yml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/openstack_init_add.yml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/openstack_vcompute_cluster.yml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/openstack_vcompute_cluster.yml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/vcmp.yml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/vcmp.yml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/vcmpcompute.yml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/vcmpcompute.yml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/encryption-key.asc b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/encryption-key.asc
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/env_add.yml b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/env_add.yml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/infra_config_nodes_add.yml b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/infra_config_nodes_add.yml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/infra_kvm_add.yml b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/infra_kvm_add.yml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/openstack_init_add.yml b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/openstack_init_add.yml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/openstack_vcompute_cluster.yml b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/openstack_vcompute_cluster.yml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/salt-context-environment.yaml b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/salt-context-environment.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/salt-context-vcp-environment.yaml b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/salt-context-vcp-environment.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/salt.yaml b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/salt.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/tempest_skip.list b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/tempest_skip.list
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/underlay--user-data-foundation.yaml b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/underlay--user-data-foundation.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/underlay-userdata.yaml b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/underlay-userdata.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/underlay.hot b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/underlay.hot
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/vcmp.yml b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/vcmp.yml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/vcmpcompute.yml b/tcp_tests/templates/bm-b300-e7-cicd-pike-ovs-maas/vcmpcompute.yml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/encryption-key.asc b/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/encryption-key.asc
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/salt-context-cookiecutter-openstack_ovs.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/salt-context-environment.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/salt-context-environment.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/salt-context-vcp-environment.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/salt-context-vcp-environment.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/salt.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/salt.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/tempest_skip.list b/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/tempest_skip.list
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/underlay--user-data-foundation.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/underlay--user-data-foundation.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/underlay-userdata.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/underlay-userdata.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/underlay.hot b/tcp_tests/templates/bm-cicd-queens-ovs-cl-maas/underlay.hot
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/salt-context-cookiecutter-contrail.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/salt-context-environment.yaml b/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/salt-context-environment.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/salt.yaml b/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/salt.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/tempest_skip.list b/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/tempest_skip.list
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/underlay--user-data-foundation.yaml b/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/underlay--user-data-foundation.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/underlay-userdata.yaml b/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/underlay-userdata.yaml
old mode 100755
new mode 100644
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/underlay.hot b/tcp_tests/templates/heat-cicd-pike-contrail-stb-sl/underlay.hot
old mode 100755
new mode 100644