diff --git a/ansible/roles/test/templates/decap_conf.j2 b/ansible/roles/test/templates/decap_conf.j2
index 133a4c2cf4f..c5536d70b41 100644
--- a/ansible/roles/test/templates/decap_conf.j2
+++ b/ansible/roles/test/templates/decap_conf.j2
@@ -1,9 +1,14 @@
 [
 {% if outer_ipv4 %}
+        {
+                "TUNNEL_DECAP_TERM_TABLE:TEST_IPINIP_V4_TUNNEL:{{ lo_ip }}" : {
+                    "term_type":"P2MP"
+                },
+                "OP": "{{ op }}"
+        },
         {
                 "TUNNEL_DECAP_TABLE:TEST_IPINIP_V4_TUNNEL" : {
                         "tunnel_type":"IPINIP",
-                        "dst_ip":"{{ lo_ip }}",
                         "dscp_mode":"{{ dscp_mode }}",
                         "ecn_mode":"{{ ecn_mode }}",
                         "ttl_mode":"{{ ttl_mode }}"
@@ -14,10 +19,15 @@
 {% if outer_ipv6 and outer_ipv4 %} ,
 {% endif %}
 {% if outer_ipv6 %}
+        {
+                "TUNNEL_DECAP_TERM_TABLE:TEST_IPINIP_V6_TUNNEL:{{ lo_ipv6 }}" : {
+                    "term_type":"P2MP"
+                },
+                "OP": "{{ op }}"
+        },
         {
                 "TUNNEL_DECAP_TABLE:TEST_IPINIP_V6_TUNNEL" : {
                         "tunnel_type":"IPINIP",
-                        "dst_ip":"{{ lo_ipv6 }}",
                         "dscp_mode":"{{ dscp_mode }}",
                         "ecn_mode":"{{ ecn_mode }}",
                         "ttl_mode":"{{ ttl_mode }}"