diff --git a/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/neutron.yaml b/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/neutron.yaml
index fb5348cb..c583ec08 100644
--- a/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/neutron.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/neutron.yaml
@@ -52,6 +52,8 @@ data:
           labels:
             application: neutron
             component: ks-endpoints
+  test:
+    timeout: 2700
   wait:
     timeout: 1800
   values:
diff --git a/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/nova.yaml b/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/nova.yaml
index 19fcc193..0271de45 100644
--- a/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/nova.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/nova.yaml
@@ -72,6 +72,10 @@ data:
           labels:
             application: nova
             component: cell-setup
+  test:
+    timeout: 2700
+  wait:
+    timeout: 2700
   values:
     labels:
       agent: