diff --git a/src/load_generator/load_gen/RequestGenerator.py b/src/load_generator/load_gen/RequestGenerator.py
index 5e420c2f44cc074758bd961f54923cf5d2d1e02d..5c56ea6ec603f4e9bb3fc72d5baa47f05ea0c991 100644
--- a/src/load_generator/load_gen/RequestGenerator.py
+++ b/src/load_generator/load_gen/RequestGenerator.py
@@ -352,8 +352,8 @@ class RequestGenerator:
                         'vlan_id'            : vlan_id,
                         'address_ip'         : dst_address_ip,
                         'address_prefix'     : 16,
-                        'policy_AZ'           : policy_AZ,
-                        'policy_ZA'           : policy_ZA,
+                        'policy_ZA'           : policy_AZ,
+                        'policy_AZ'           : policy_ZA,
                     }),
             ]
             return json_service_l3nm_planned(
diff --git a/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py b/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py
index 351efe5a5f32db99c36846ad2fd96e2c8567148e..ef93dcdda8145cab15ff21c24b6318e9eb00e098 100644
--- a/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py
+++ b/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py
@@ -252,7 +252,7 @@ def teardown_config_rules(
 
         #Delete interface; automatically deletes:
         # - /interface[]/subinterface[]
-        json_config_rule_delete('/interface[{:s}]'.format(if_subif_name),
+        json_config_rule_delete('/interface[{:s}]/subinterface[0]'.format(if_subif_name),
         {
             'name': if_subif_name,
         }),