diff --git a/release/models/bgp/openconfig-bgp-common-multiprotocol.yang b/release/models/bgp/openconfig-bgp-common-multiprotocol.yang
index 056246d7f..6b7e5b5a1 100644
--- a/release/models/bgp/openconfig-bgp-common-multiprotocol.yang
+++ b/release/models/bgp/openconfig-bgp-common-multiprotocol.yang
@@ -24,7 +24,15 @@ submodule openconfig-bgp-common-multiprotocol {
     for multiple protocols in BGP. The groupings are common across
     multiple contexts.";
 
-  oc-ext:openconfig-version "9.9.1";
+  oc-ext:openconfig-version "9.10.0";
+
+  revision "2026-06-16" {
+    description
+      "Deprecation of ../config/local-as leaf and replacement with
+      local-as-options container. Extending with RFC7705 no-prepend
+      and replace-as explicit flags and dual-as option.";
+    reference "9.10.0";
+  }
 
   revision "2025-04-18" {
     description
diff --git a/release/models/bgp/openconfig-bgp-common-structure.yang b/release/models/bgp/openconfig-bgp-common-structure.yang
index d233f26f8..2e91ee823 100644
--- a/release/models/bgp/openconfig-bgp-common-structure.yang
+++ b/release/models/bgp/openconfig-bgp-common-structure.yang
@@ -21,7 +21,15 @@ submodule openconfig-bgp-common-structure {
     "This sub-module contains groupings that are common across multiple BGP
     contexts and provide structure around other primitive groupings.";
 
-  oc-ext:openconfig-version "9.9.1";
+  oc-ext:openconfig-version "9.10.0";
+
+  revision "2026-06-16" {
+    description
+      "Deprecation of ../config/local-as leaf and replacement with
+      local-as-options container. Extending with RFC7705 no-prepend
+      and replace-as explicit flags and dual-as option.";
+    reference "9.10.0";
+  }
 
   revision "2025-04-18" {
     description
diff --git a/release/models/bgp/openconfig-bgp-common.yang b/release/models/bgp/openconfig-bgp-common.yang
index 630a4600e..0b23a6cdb 100644
--- a/release/models/bgp/openconfig-bgp-common.yang
+++ b/release/models/bgp/openconfig-bgp-common.yang
@@ -24,13 +24,21 @@ submodule openconfig-bgp-common {
     may be application to a subset of global, peer-group or neighbor
     contexts.";
 
-  oc-ext:openconfig-version "9.9.1";
+  oc-ext:openconfig-version "9.10.0";
+
+  revision "2026-06-16" {
+    description
+      "Deprecation of ../config/local-as leaf and replacement with
+      local-as-options container. Extending with RFC7705 no-prepend
+      and replace-as explicit flags and dual-as option.";
+    reference "9.10.0";
+  }
 
   revision "2025-04-18" {
     description
       "Clarification to usage of link-bandwidth-ext-community
       container under BGP use-multiple-paths`.";
-          reference "9.9.1";
+    reference "9.9.1";
   }
 
   revision "2025-03-30" {
@@ -279,6 +287,55 @@ submodule openconfig-bgp-common {
     }
   }
 
+  grouping bgp-local-as-group-config {
+    description
+      "Local-AS configuration items.
+      Local-AS is a migration tool described in RFC7705";
+
+    leaf local-as {
+      type oc-inet:as-number;
+      description
+        "The local autonomous system number that is to be used
+        when establishing sessions with the remote peer or peer
+        group, if this differs from the global BGP router
+        autonomous system number. Value is set in My Autonomous
+        System of the OPEN message sent to establish session.";
+      reference
+        "RFC7705: Autonomous System Migration Mechanisms
+        and Their Effects on the BGP AS_PATH Attribute.
+        Section 3.1 - Modify Inbound BGP AS_PATH Attribute";
+    }
+
+    leaf no-prepend {
+      type boolean;
+      description
+        "When set to TRUE, the value configured as local-as is
+        not prepended to AS-PATH on received routes.";
+      reference
+        "RFC7705: Autonomous System Migration Mechanisms
+        and Their Effects on the BGP AS_PATH Attribute.
+        Section 3.1 - Modify Inbound BGP AS_PATH Attribute";
+    }
+
+    leaf replace-as {
+      type boolean;
+      description
+        "When set to TRUE, the global AS is not added to AS-PATH
+        when route is advertised to peer. Only local-as is prepended.";
+      reference
+        "RFC7705: Autonomous System Migration Mechanisms
+        and Their Effects on the BGP AS_PATH Attribute.
+        Section 3.2 - Modify Outbound BGP AS_PATH Attribute";
+    }
+
+    leaf dual-as {
+      type boolean;
+      description
+        "When set to TRUE, the speaker alternates between local-ASN
+        and global ASN in every other OPEN messages.";
+    }
+  }
+
   grouping bgp-common-neighbor-group-config {
     description
       "Neighbor level configuration items.";
@@ -291,6 +348,7 @@ submodule openconfig-bgp-common {
 
     leaf local-as {
       type oc-inet:as-number;
+      status deprecated;
       description
         "The local autonomous system number that is to be used
         when establishing sessions with the remote peer or peer
diff --git a/release/models/bgp/openconfig-bgp-global.yang b/release/models/bgp/openconfig-bgp-global.yang
index 4921fc07b..de480a346 100644
--- a/release/models/bgp/openconfig-bgp-global.yang
+++ b/release/models/bgp/openconfig-bgp-global.yang
@@ -27,7 +27,15 @@ submodule openconfig-bgp-global {
     "This sub-module contains groupings that are specific to the
     global context of the OpenConfig BGP module";
 
-  oc-ext:openconfig-version "9.9.1";
+  oc-ext:openconfig-version "9.10.0";
+
+  revision "2026-06-16" {
+    description
+      "Deprecation of ../config/local-as leaf and replacement with
+      local-as-options container. Extending with RFC7705 no-prepend
+      and replace-as explicit flags and dual-as option.";
+    reference "9.10.0";
+  }
 
   revision "2025-04-18" {
     description
diff --git a/release/models/bgp/openconfig-bgp-neighbor.yang b/release/models/bgp/openconfig-bgp-neighbor.yang
index 9afa0c748..8721cff18 100644
--- a/release/models/bgp/openconfig-bgp-neighbor.yang
+++ b/release/models/bgp/openconfig-bgp-neighbor.yang
@@ -30,7 +30,15 @@ submodule openconfig-bgp-neighbor {
     "This sub-module contains groupings that are specific to the
     neighbor context of the OpenConfig BGP module.";
 
-  oc-ext:openconfig-version "9.9.1";
+  oc-ext:openconfig-version "9.10.0";
+
+  revision "2026-06-16" {
+    description
+      "Deprecation of ../config/local-as leaf and replacement with
+      local-as-options container. Extending with RFC7705 no-prepend
+      and replace-as explicit flags and dual-as option.";
+    reference "9.10.0";
+  }
 
   revision "2025-04-18" {
     description
@@ -877,6 +885,27 @@ submodule openconfig-bgp-neighbor {
         the neighbor";
       uses bgp-neighbor-afi-safi-list;
     }
+
+    container local-as-options {
+      description
+        "Local-AS options.
+        Local-AS is a migration tool described in RFC7705.";
+
+      container config {
+        description
+          "Local-AS options configuration.
+          Local-AS is a migration tool described in RFC7705.";
+        uses bgp-local-as-group-config;
+      }
+
+      container state {
+        config false;
+        description
+          "Local-AS options state.
+          Local-AS is a migration tool described in RFC7705.";
+        uses bgp-local-as-group-config;
+      }
+    }
   }
 
   grouping bgp-neighbor-list {
diff --git a/release/models/bgp/openconfig-bgp-peer-group.yang b/release/models/bgp/openconfig-bgp-peer-group.yang
index cb336f998..6bf7a64b3 100644
--- a/release/models/bgp/openconfig-bgp-peer-group.yang
+++ b/release/models/bgp/openconfig-bgp-peer-group.yang
@@ -25,7 +25,15 @@ submodule openconfig-bgp-peer-group {
     "This sub-module contains groupings that are specific to the
     peer-group context of the OpenConfig BGP module.";
 
-  oc-ext:openconfig-version "9.9.1";
+  oc-ext:openconfig-version "9.10.0";
+
+  revision "2026-06-16" {
+    description
+      "Deprecation of ../config/local-as leaf and replacement with
+      local-as-options container. Extending with RFC7705 no-prepend
+      and replace-as explicit flags and dual-as option.";
+    reference "9.10.0";
+  }
 
   revision "2025-04-18" {
     description
@@ -385,6 +393,27 @@ submodule openconfig-bgp-peer-group {
         thegroup";
       uses bgp-peer-group-afi-safi-list;
     }
+
+    container local-as-options {
+      description
+        "Local-AS options.
+        Local-AS is a migration tool described in RFC7705.";
+
+      container config {
+        description
+          "Local-AS options configuration.
+          Local-AS is a migration tool described in RFC7705.";
+        uses bgp-local-as-group-config;
+      }
+
+      container state {
+        config false;
+        description
+          "Local-AS options state.
+          Local-AS is a migration tool described in RFC7705.";
+        uses bgp-local-as-group-config;
+      }
+    }
   }
 
   grouping bgp-peer-group-list {
diff --git a/release/models/bgp/openconfig-bgp.yang b/release/models/bgp/openconfig-bgp.yang
index a5cc41f91..62674597a 100644
--- a/release/models/bgp/openconfig-bgp.yang
+++ b/release/models/bgp/openconfig-bgp.yang
@@ -68,7 +68,15 @@ module openconfig-bgp {
     whereas leaf not present inherits its value from the leaf present
     at the next higher level in the hierarchy.";
 
-  oc-ext:openconfig-version "9.9.1";
+  oc-ext:openconfig-version "9.10.0";
+
+  revision "2026-06-16" {
+    description
+      "Deprecation of ../config/local-as leaf and replacement with
+      local-as-options container. Extending with RFC7705 no-prepend
+      and replace-as explicit flags and dual-as option.";
+    reference "9.10.0";
+  }
 
   revision "2025-04-18" {
     description