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 8e20166..e4e103e 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
@@ -840,6 +840,7 @@
   octavia_health_manager_node02_address: 192.168.1.11
   octavia_health_manager_node03_address: 192.168.1.12
   octavia_manager_cluster: 'False'
+  spare_amphora_pool_size: 0
   octavia_hm_bind_ip: 192.168.1.12
   octavia_lb_mgmt_cidr: 192.168.1.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.1.2
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 b253972..b4d818d 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
@@ -854,7 +854,9 @@
   octavia_health_manager_node01_address: 192.168.1.10
   octavia_health_manager_node02_address: 192.168.1.11
   octavia_health_manager_node03_address: 192.168.1.12
-  octavia_manager_cluster: 'False'
+  octavia_manager_cluster: 'True'
+  octavia_loadbalancer_topology: 'ACTIVE_STANDBY'
+  spare_amphora_pool_size: 1
   octavia_hm_bind_ip: 192.168.1.12
   octavia_lb_mgmt_cidr: 192.168.1.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.1.2
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 276d1e4..0df23b5 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
@@ -364,6 +364,7 @@
   octavia_health_manager_node02_address: 192.168.10.11
   octavia_health_manager_node03_address: 192.168.10.12
   octavia_manager_cluster: 'False'
+  spare_amphora_pool_size: 0
   octavia_hm_bind_ip: 192.168.10.12
   octavia_lb_mgmt_cidr: 192.168.10.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.10.2
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 80af0a6..c4e3818 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
@@ -363,7 +363,9 @@
   octavia_health_manager_node01_address: 192.168.10.10
   octavia_health_manager_node02_address: 192.168.10.11
   octavia_health_manager_node03_address: 192.168.10.12
-  octavia_manager_cluster: 'False'
+  octavia_manager_cluster: 'True'
+  octavia_loadbalancer_topology: 'ACTIVE_STANDBY'
+  spare_amphora_pool_size: 1
   octavia_hm_bind_ip: 192.168.10.12
   octavia_lb_mgmt_cidr: 192.168.10.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.10.2
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index eca61c0..2ee0e68 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -359,7 +359,8 @@
   octavia_health_manager_node01_address: 192.168.10.10
   octavia_health_manager_node02_address: 192.168.10.11
   octavia_health_manager_node03_address: 192.168.10.12
-  octavia_manager_cluster: 'True'
+  octavia_manager_cluster: 'False'
+  spare_amphora_pool_size: 1
   octavia_hm_bind_ip: 192.168.10.12
   octavia_lb_mgmt_cidr: 192.168.10.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.10.2
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index f5886e3..9deaebd 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -363,7 +363,9 @@
   octavia_health_manager_node01_address: 192.168.10.10
   octavia_health_manager_node02_address: 192.168.10.11
   octavia_health_manager_node03_address: 192.168.10.12
-  octavia_manager_cluster: 'False'
+  octavia_manager_cluster: 'True'
+  octavia_loadbalancer_topology: 'SINGLE'
+  spare_amphora_pool_size: 0
   octavia_hm_bind_ip: 192.168.10.12
   octavia_lb_mgmt_cidr: 192.168.10.0/24
   octavia_lb_mgmt_allocation_pool_start: 192.168.10.2