diff --git a/feature/bgp/otg_tests/bgp_afi_safi_defaults/README.md b/feature/bgp/otg_tests/bgp_afi_safi_defaults/README.md
index 10037d7171c..b89367d3fa2 100644
--- a/feature/bgp/otg_tests/bgp_afi_safi_defaults/README.md
+++ b/feature/bgp/otg_tests/bgp_afi_safi_defaults/README.md
@@ -30,7 +30,7 @@ BGP AFI SAFI OC DEFAULTS TEST
             "IPv6-unicast enabled" boolean is left to OC default for the IPv4 peer".
         *   Ensure that only IPv6-Unicast enabled boolean is made "true" for IPv6 neighbor. 
             "IPv4-unicast enabled" boolean is left to OC default for the IPv6 peer".
-        *   Ensure that there are no AFI-SAFI configurations at the global and peer-group levels. 
+        *   Ensure that there are no AFI-SAFI configurations at peer-group levels. 
         *   On the ATE side ensure that IPv4-unicast and IPv6-unicast AFI-SAFI are enabled==true for 
             IPv4 and IPv6 neighbors.
         *   Ensure that there is extended-next-hop encoding feature is configured via OC path and the
@@ -46,7 +46,7 @@ BGP AFI SAFI OC DEFAULTS TEST
     
     *   Configuration at the neighbor level is same as in [Test case-1] except for IPv4-unicast and 
         IPv6-unicast being enabled at the peer-group level
-    *   No configuration should be made at the global AFI-SAFI level
+    *   No configuration should be made at the neighbor AFI-SAFI level
     
     *   Verification:
         *   For IPv4 neighbor, ensure that the IPv4 neighborship is up and both IPv4-unicast and 
@@ -78,7 +78,6 @@ BGP AFI SAFI OC DEFAULTS TEST
         *   For IPv6 neighbor ensure that the IPv6 neighborship is not ESTABLISHED and
             IPv6-unicast capabilities are set to FALSE.
 
-
 ## OpenConfig Path and RPC Coverage
 
 The below yaml defines the OC paths intended to be covered by this test.  OC paths used for test setup are not listed here.
diff --git a/feature/bgp/otg_tests/bgp_afi_safi_defaults/bgp_afi_safi_defaults_test.go b/feature/bgp/otg_tests/bgp_afi_safi_defaults/bgp_afi_safi_defaults_test.go
index 77d1a362bc5..948ddf3157b 100644
--- a/feature/bgp/otg_tests/bgp_afi_safi_defaults/bgp_afi_safi_defaults_test.go
+++ b/feature/bgp/otg_tests/bgp_afi_safi_defaults/bgp_afi_safi_defaults_test.go
@@ -166,8 +166,10 @@ func bgpCreateNbr(t *testing.T, localAs, peerAs uint32, dut *ondatra.DUTDevice,
 		case globalLevel:
 			if nbr.isV4 == true {
 				global.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(true)
+				nv4.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV4_UNICAST).Enabled = ygot.Bool(true)
 			} else {
 				global.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Enabled = ygot.Bool(true)
+				nv4.GetOrCreateAfiSafi(oc.BgpTypes_AFI_SAFI_TYPE_IPV6_UNICAST).Enabled = ygot.Bool(true)
 			}
 			if !isV4Only {
 				if !deviations.BGPGlobalExtendedNextHopEncodingUnsupported(dut) {
diff --git a/feature/system/system_base_test/tests/system_banner_test/system_banner_test.go b/feature/system/system_base_test/tests/system_banner_test/system_banner_test.go
index fdd39700e17..28b3a6ae0c7 100644
--- a/feature/system/system_base_test/tests/system_banner_test/system_banner_test.go
+++ b/feature/system/system_base_test/tests/system_banner_test/system_banner_test.go
@@ -57,10 +57,8 @@ func TestMotdBanner(t *testing.T) {
 
 			t.Run("Get MOTD Config", func(t *testing.T) {
 				if testCase.banner == "" {
-					if gnmi.LookupConfig(t, dut, config.Config()).IsPresent() {
+					if v, ok := gnmi.LookupConfig(t, dut, config.Config()).Val(); ok && v != "" {
 						t.Errorf("MOTD Banner not empty")
-					} else {
-						t.Logf("No response for the path is expected as the config is empty")
 					}
 				} else {
 					configGot := gnmi.Get(t, dut, config.Config())
@@ -73,10 +71,8 @@ func TestMotdBanner(t *testing.T) {
 
 			t.Run("Get MOTD Telemetry", func(t *testing.T) {
 				if testCase.banner == "" {
-					if gnmi.LookupConfig(t, dut, config.Config()).IsPresent() {
+					if v, ok := gnmi.Lookup(t, dut, state.State()).Val(); ok && v != "" {
 						t.Errorf("MOTD Telemetry Banner not empty")
-					} else {
-						t.Logf("No response for the path is expected as the config is empty")
 					}
 				} else {
 					stateGot := gnmi.Get(t, dut, state.State())
@@ -124,10 +120,8 @@ func TestLoginBanner(t *testing.T) {
 
 			t.Run("Get Login Banner Config", func(t *testing.T) {
 				if testCase.banner == "" {
-					if gnmi.LookupConfig(t, dut, config.Config()).IsPresent() {
+					if v, ok := gnmi.LookupConfig(t, dut, config.Config()).Val(); ok && v != "" {
 						t.Errorf("Config Login Banner not empty")
-					} else {
-						t.Logf("No response for the path expected is expected as the config is empty")
 					}
 				} else {
 					configGot := gnmi.Get(t, dut, config.Config())
@@ -140,10 +134,8 @@ func TestLoginBanner(t *testing.T) {
 
 			t.Run("Get Login Banner Telemetry", func(t *testing.T) {
 				if testCase.banner == "" {
-					if gnmi.LookupConfig(t, dut, config.Config()).IsPresent() {
+					if v, ok := gnmi.Lookup(t, dut, state.State()).Val(); ok && v != "" {
 						t.Errorf("Telemetry Login Banner not empty")
-					} else {
-						t.Logf("No response for the path is expected as the config is empty")
 					}
 				} else {
 					stateGot := gnmi.Get(t, dut, state.State())
diff --git a/tools/ci-trigger/config.go b/tools/ci-trigger/config.go
index 3ab5af1e244..9061579e951 100644
--- a/tools/ci-trigger/config.go
+++ b/tools/ci-trigger/config.go
@@ -58,8 +58,7 @@ const (
 
 // authorizedTeams is the list of GitHub organization teams authorized to launch Cloud Build jobs.
 var authorizedTeams = []string{
-	"featureprofiles-maintainers",
-	"featureprofiles-quattro-tl",
+	"featureprofiles-writers",
 }
 
 // triggerKeywords is the list of authorized keywords to launch a test.  The