diff --git a/feature/bgp/policybase/otg_tests/aspath_and_community_test/aspath_and_community_test.go b/feature/bgp/policybase/otg_tests/aspath_and_community_test/aspath_and_community_test.go
index de109463b72..f9bab65b546 100644
--- a/feature/bgp/policybase/otg_tests/aspath_and_community_test/aspath_and_community_test.go
+++ b/feature/bgp/policybase/otg_tests/aspath_and_community_test/aspath_and_community_test.go
@@ -100,7 +100,9 @@ func configureImportBGPPolicy(t *testing.T, dut *ondatra.DUTDevice, ipv4 string,
 			cs = append(cs, oc.UnionString(communityMatch))
 		}
 		communitySet.SetCommunityMember(cs)
-		communitySet.SetMatchSetOptions(commMatchSetOptions)
+		if deviations.BGPConditionsMatchCommunitySetUnsupported(dut) {
+			communitySet.SetMatchSetOptions(commMatchSetOptions)
+		}
 	}
 
 	var communitySetCLIConfig string
@@ -118,6 +120,7 @@ func configureImportBGPPolicy(t *testing.T, dut *ondatra.DUTDevice, ipv4 string,
 		stmt1.GetOrCreateConditions().GetOrCreateBgpConditions().SetCommunitySet(communitySetName)
 	} else {
 		stmt1.GetOrCreateConditions().GetOrCreateBgpConditions().GetOrCreateMatchCommunitySet().SetCommunitySet(communitySetName)
+		stmt1.GetOrCreateConditions().GetOrCreateBgpConditions().GetOrCreateMatchCommunitySet().SetMatchSetOptions(oc.E_RoutingPolicy_MatchSetOptionsType(commMatchSetOptions))
 	}
 
 	if deviations.CommunityMemberRegexUnsupported(dut) && communitySetName == "any_my_3_comms" {
diff --git a/feature/bgp/policybase/otg_tests/aspath_and_community_test/metadata.textproto b/feature/bgp/policybase/otg_tests/aspath_and_community_test/metadata.textproto
index fc8bcf61ac6..a30baf8abd5 100644
--- a/feature/bgp/policybase/otg_tests/aspath_and_community_test/metadata.textproto
+++ b/feature/bgp/policybase/otg_tests/aspath_and_community_test/metadata.textproto
@@ -35,4 +35,14 @@ platform_exceptions: {
     default_route_policy_unsupported: true
   }
 }
+platform_exceptions: {
+  platform: {
+    vendor: NOKIA
+  }
+  deviations: {
+    interface_enabled: true
+    static_protocol_name: "static"
+    explicit_interface_in_default_vrf: true
+  }
+}