diff --git a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
index 9da0619..3544485 100644
--- a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
@@ -17,7 +17,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
index 4b1e40a..13c683c 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
@@ -17,7 +17,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
index aeaa320..661b5b7 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
@@ -17,7 +17,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
diff --git a/jobs/templates/heat-cicd-pike-dvr-sl.yml b/jobs/templates/heat-cicd-pike-dvr-sl.yml
index d86493e..70adc48 100644
--- a/jobs/templates/heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-pike-dvr-sl.yml
@@ -24,7 +24,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
diff --git a/jobs/templates/heat-cicd-queens-contrail41-sl.yml b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
index b09c639..8e49249 100644
--- a/jobs/templates/heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
@@ -19,7 +19,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
diff --git a/jobs/templates/heat-cicd-queens-dvr-sl.yml b/jobs/templates/heat-cicd-queens-dvr-sl.yml
index 5d2df7c..7843dab 100644
--- a/jobs/templates/heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-queens-dvr-sl.yml
@@ -19,7 +19,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
diff --git a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
index 04de084..a1f2a1f 100644
--- a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
@@ -17,7 +17,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
diff --git a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
index 3ff5f73..150274f 100644
--- a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
@@ -19,7 +19,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
diff --git a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
index 99d9f93..3debe71 100644
--- a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
@@ -19,7 +19,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
diff --git a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
index e54db88..6129a45 100644
--- a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
@@ -17,7 +17,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 90e74b6..6edeaeb 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -70,7 +70,8 @@
   ceph_rgw_node02_hostname: rgw02
   ceph_rgw_node03_address: 10.167.4.78
   ceph_rgw_node03_hostname: rgw03
-  ceph_version: luminous
+  ceph_version: nautilus
+  ceph_osd_block_partition_prefix: ''
   cicd_control_node01_address: 10.167.4.91
   cicd_control_node01_hostname: cid01
   cicd_control_node02_address: 10.167.4.92
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index 66307eb..01bba3e 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -70,7 +70,8 @@
   ceph_rgw_node02_hostname: rgw02
   ceph_rgw_node03_address: 10.167.4.78
   ceph_rgw_node03_hostname: rgw03
-  ceph_version: luminous
+  ceph_version: nautilus
+  ceph_osd_block_partition_prefix: ''
   cicd_control_node01_address: 10.167.4.91
   cicd_control_node01_hostname: cid01
   cicd_control_node02_address: 10.167.4.92