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 2ed6e55..d6ce531 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
@@ -19,7 +19,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '15000'
+        default: '18000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
@@ -30,7 +30,7 @@
         name: PLATFORM_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: PLATFORM_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 855169c..9895681 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
@@ -19,7 +19,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '15000'
+        default: '18000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
@@ -30,7 +30,7 @@
         name: PLATFORM_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: PLATFORM_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 0ef6280..5f42d33 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
@@ -19,7 +19,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '15000'
+        default: '18000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
@@ -30,7 +30,7 @@
         name: PLATFORM_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: PLATFORM_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 4d6f254..4df86a6 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: '15000'
+        default: '18000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
@@ -35,7 +35,7 @@
         name: PLATFORM_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: PLATFORM_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 62d8d4c..724439a 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: '15000'
+        default: '18000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
@@ -30,7 +30,7 @@
         name: PLATFORM_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: PLATFORM_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 7843dab..e58a4fb 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: '15000'
+        default: '18000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
@@ -29,7 +29,7 @@
         name: PLATFORM_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: PLATFORM_STACK_INSTALL_TIMEOUT
         trim: 'false'
diff --git a/jobs/templates/maintenance-heat-cicd-pike-dvr-sl.yml b/jobs/templates/maintenance-heat-cicd-pike-dvr-sl.yml
index eb15717..7e947a6 100644
--- a/jobs/templates/maintenance-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/maintenance-heat-cicd-pike-dvr-sl.yml
@@ -17,7 +17,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '18000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
@@ -28,7 +28,7 @@
         name: PLATFORM_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: PLATFORM_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 a239027..ea5943d 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: '15000'
+        default: '18000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
@@ -28,7 +28,7 @@
         name: PLATFORM_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: PLATFORM_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 12812eb..7f60422 100644
--- a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
@@ -17,7 +17,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '15000'
+        default: '18000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
@@ -28,7 +28,7 @@
         name: PLATFORM_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: PLATFORM_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 b4c39a9..7775830 100644
--- a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
@@ -17,7 +17,7 @@
         name: DRIVETRAIN_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '15000'
+        default: '18000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
@@ -28,7 +28,7 @@
         name: PLATFORM_STACK_INSTALL
         trim: 'false'
     - string:
-        default: '12000'
+        default: '15000'
         description: ''
         name: PLATFORM_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 03dc902..bbc1114 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: '15000'
+        default: '18000'
         description: ''
         name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
         trim: 'false'
diff --git a/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 52f4f8f..35aed20 100644
--- a/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -792,16 +792,9 @@
   ceph_rgw_node02_hostname: "rgw02"
   ceph_rgw_node03_address: "10.167.11.78"
   ceph_rgw_node03_hostname: "rgw03"
-  # FIXME after deleting Ceph public network
+
   ceph_public_network: 10.167.11.0/24
-  ceph_mon_node01_ceph_public_address: 10.167.11.66
-  ceph_mon_node02_ceph_public_address: 10.167.11.67
-  ceph_mon_node03_ceph_public_address: 10.167.11.68
-  ceph_rgw_node01_ceph_public_address: 10.167.11.76
-  ceph_rgw_node02_ceph_public_address: 10.167.11.77
-  ceph_rgw_node03_ceph_public_address: 10.167.11.78
-  ceph_osd_ceph_public_address_ranges: 10.167.11.201-10.167.11.203
-  # -end fixme
+
   rsync_fernet_rotation: 'True'
   compute_padding_with_zeros: True
   designate_backend: powerdns
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 187fd0f..c4ec68a 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -791,16 +791,9 @@
   ceph_osd_deploy_address_ranges: "172.16.164.8-172.16.164.10"
   ceph_osd_storage_address_ranges: "10.167.11.200-10.167.11.202"
   ceph_osd_backend_address_ranges: "10.167.12.200-10.167.12.202"
-  # FIXME after deleting Ceph public network
+
   ceph_public_network: 10.167.11.0/24
-  ceph_mon_node01_ceph_public_address: 10.167.11.66
-  ceph_mon_node02_ceph_public_address: 10.167.11.67
-  ceph_mon_node03_ceph_public_address: 10.167.11.68
-  ceph_rgw_node01_ceph_public_address: 10.167.11.76
-  ceph_rgw_node02_ceph_public_address: 10.167.11.77
-  ceph_rgw_node03_ceph_public_address: 10.167.11.78
-  ceph_osd_ceph_public_address_ranges: 10.167.11.201-10.167.11.203
-  # -end fixme
+
   ceph_osd_data_disks: "/dev/sdb"
   ceph_osd_journal_or_block_db_disks: ""
   ceph_osd_block_partition_prefix: ''
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
index 5724200..75605b9 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -876,15 +876,8 @@
   #ceph_rgw_node03_deploy_address: "172.16.48.78"
   ceph_rgw_node03_address: "==IPV4_NET_CONTROL_PREFIX==.78"
   ceph_rgw_node03_hostname: "rgw03"
-  # FIXME after deleting Ceph public network
+
   ceph_public_network: "==IPV4_NET_CONTROL_PREFIX==.0/24"
-  ceph_mon_node01_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.66"
-  ceph_mon_node02_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.67"
-  ceph_mon_node03_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.68"
-  ceph_rgw_node01_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.76"
-  ceph_rgw_node02_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.77"
-  ceph_rgw_node03_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.78"
-  ceph_osd_ceph_public_address_ranges: "==IPV4_NET_CONTROL_PREFIX==.201-==IPV4_NET_CONTROL_PREFIX==.203"
 
   manila_enabled: 'False'
   designate_backend: powerdns
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
index ff9a948..2ca190b 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -840,15 +840,8 @@
 
   ceph_public_network_allocation: storage
   ceph_cluster_network: "==IPV4_NET_CONTROL_PREFIX==.0/24"
-  # FIXME after deleting Ceph public network
+
   ceph_public_network: "==IPV4_NET_CONTROL_PREFIX==.0/24"
-  ceph_mon_node01_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.66"
-  ceph_mon_node02_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.67"
-  ceph_mon_node03_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.68"
-  ceph_rgw_node01_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.76"
-  ceph_rgw_node02_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.77"
-  ceph_rgw_node03_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.78"
-  ceph_osd_ceph_public_address_ranges: "==IPV4_NET_CONTROL_PREFIX==.201-==IPV4_NET_CONTROL_PREFIX==.203"
 
 # for 2018.11.0+
   ceph_osd_single_address_ranges: "==IPV4_NET_CONTROL_PREFIX==.200-==IPV4_NET_CONTROL_PREFIX==.202"
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 2c1c897..4c27d97 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
@@ -75,16 +75,9 @@
   ceph_rgw_node03_address: 10.167.4.78
   ceph_rgw_node03_hostname: rgw03
   ceph_version: "luminous"
-  # FIXME after deleting Ceph public network
+
   ceph_public_network: 10.167.4.0/24
-  ceph_mon_node01_ceph_public_address: 10.167.4.66
-  ceph_mon_node02_ceph_public_address: 10.167.4.67
-  ceph_mon_node03_ceph_public_address: 10.167.4.68
-  ceph_rgw_node01_ceph_public_address: 10.167.4.76
-  ceph_rgw_node02_ceph_public_address: 10.167.4.77
-  ceph_rgw_node03_ceph_public_address: 10.167.4.78
-  ceph_osd_ceph_public_address_ranges: 10.167.4.201-10.167.4.203
-  # -end fixme
+
   ceph_osd_block_partition_prefix: ''
   cicd_control_node01_address: 10.167.4.91
   cicd_control_node01_hostname: cid01
diff --git a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index ac07d99..7ea3233 100644
--- a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -261,15 +261,7 @@
   ceph_public_network_allocation: storage
 
   ceph_cluster_network: "==IPV4_NET_CONTROL_PREFIX==.0/24"
-  # FIXME after deleting Ceph public network
   ceph_public_network: "==IPV4_NET_CONTROL_PREFIX==.0/24"
-  ceph_mon_node01_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.66"
-  ceph_mon_node02_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.67"
-  ceph_mon_node03_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.68"
-  ceph_rgw_node01_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.76"
-  ceph_rgw_node02_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.77"
-  ceph_rgw_node03_ceph_public_address: "==IPV4_NET_CONTROL_PREFIX==.78"
-  ceph_osd_ceph_public_address_ranges: "==IPV4_NET_CONTROL_PREFIX==.201-==IPV4_NET_CONTROL_PREFIX==.203"
 
 # for 2018.11.0+
   ceph_osd_single_address_ranges: "==IPV4_NET_CONTROL_PREFIX==.201-==IPV4_NET_CONTROL_PREFIX==.203"
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 0c3f939..9b7306c 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
@@ -75,16 +75,9 @@
   ceph_rgw_node03_hostname: rgw03
   ceph_version: "nautilus"
   ceph_osd_block_partition_prefix: ''
-  # FIXME after deleting Ceph public network
+
   ceph_public_network: 10.167.4.0/24
-  ceph_mon_node01_ceph_public_address: 10.167.4.66
-  ceph_mon_node02_ceph_public_address: 10.167.4.67
-  ceph_mon_node03_ceph_public_address: 10.167.4.68
-  ceph_rgw_node01_ceph_public_address: 10.167.4.76
-  ceph_rgw_node02_ceph_public_address: 10.167.4.77
-  ceph_rgw_node03_ceph_public_address: 10.167.4.78
-  ceph_osd_ceph_public_address_ranges: 10.167.4.201-10.167.4.203
-  # -end fixme
+
   cicd_control_node01_address: 10.167.4.91
   cicd_control_node01_hostname: cid01
   cicd_control_node02_address: 10.167.4.92