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 e4e103e..e37392e 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,7 +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_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 b4d818d..2785866 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
@@ -855,8 +855,8 @@
   octavia_health_manager_node02_address: 192.168.1.11
   octavia_health_manager_node03_address: 192.168.1.12
   octavia_manager_cluster: 'True'
-  octavia_loadbalancer_topology: 'ACTIVE_STANDBY'
-  spare_amphora_pool_size: 1
+  octavia_amphora_topology: 'ACTIVE_STANDBY'
+  octavia_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 0df23b5..6af4ce3 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,7 +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_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/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index c4e3818..3ca199f 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
@@ -364,8 +364,8 @@
   octavia_health_manager_node02_address: 192.168.10.11
   octavia_health_manager_node03_address: 192.168.10.12
   octavia_manager_cluster: 'True'
-  octavia_loadbalancer_topology: 'ACTIVE_STANDBY'
-  spare_amphora_pool_size: 1
+  octavia_amphora_topology: 'ACTIVE_STANDBY'
+  octavia_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/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 2ee0e68..e632f83 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
@@ -360,7 +360,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: 1
+  octavia_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/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 9deaebd..d729d43 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
@@ -364,8 +364,8 @@
   octavia_health_manager_node02_address: 192.168.10.11
   octavia_health_manager_node03_address: 192.168.10.12
   octavia_manager_cluster: 'True'
-  octavia_loadbalancer_topology: 'SINGLE'
-  spare_amphora_pool_size: 0
+  octavia_amphora_topology: 'SINGLE'
+  octavia_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