diff --git a/yang/confd/confd.frr-ripd.yang b/yang/confd/confd.frr-ripd.yang
index 9b21c0756f..7bbe54cca9 100644
--- a/yang/confd/confd.frr-ripd.yang
+++ b/yang/confd/confd.frr-ripd.yang
@@ -11,8 +11,10 @@ module confd.frr-ripd {
 
   tailf:annotate-module "frr-ripd" {
     tailf:annotate-statement "container[name='ripd']" {
-      tailf:annotate-statement "container[name='state']" {
-        tailf:callpoint "state";
+      tailf:annotate-statement "list[name='instance']" {
+        tailf:annotate-statement "container[name='state']" {
+          tailf:callpoint "state";
+        }
       }
     }
     tailf:annotate-statement "rpc[name='clear-rip-route']" {
diff --git a/yang/confd/confd.frr-ripngd.yang b/yang/confd/confd.frr-ripngd.yang
index 5d876ff4d3..83383fb454 100644
--- a/yang/confd/confd.frr-ripngd.yang
+++ b/yang/confd/confd.frr-ripngd.yang
@@ -11,8 +11,10 @@ module confd.frr-ripngd {
 
   tailf:annotate-module "frr-ripngd" {
     tailf:annotate-statement "container[name='ripngd']" {
-      tailf:annotate-statement "container[name='state']" {
-        tailf:callpoint "state";
+      tailf:annotate-statement "list[name='instance']" {
+        tailf:annotate-statement "container[name='state']" {
+          tailf:callpoint "state";
+        }
       }
     }
     tailf:annotate-statement "rpc[name='clear-ripng-route']" {