diff --git a/CHANGELOG.md b/CHANGELOG.md
index 595243b..1e05686 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [2.2.0](https://github.com/rdkcentral/open-virtual-switch-agent/compare/2.1.0...2.2.0)
+
+- LTE-2824 : Avoid adding eth0 port to brlan0 bridge in warehouse mode [`#16`](https://github.com/rdkcentral/open-virtual-switch-agent/pull/16)
+- Merge tag '2.1.0' into develop [`5548bf9`](https://github.com/rdkcentral/open-virtual-switch-agent/commit/5548bf97b82fdb01823ad49f265845e591c2ad09)
+
 #### [2.1.0](https://github.com/rdkcentral/open-virtual-switch-agent/compare/2.0.0...2.1.0)
 
+> 4 February 2026
+
+- Add changelog for release 2.1.0 [`248535d`](https://github.com/rdkcentral/open-virtual-switch-agent/commit/248535dd8268182f3af1e79074e63fa2abecdc95)
 - Merge tag '2.0.0' into develop [`9f37e13`](https://github.com/rdkcentral/open-virtual-switch-agent/commit/9f37e13b0a4afcfee7b83a5be6085694d6cf19e1)
 
 ### [2.0.0](https://github.com/rdkcentral/open-virtual-switch-agent/compare/1.1.0...2.0.0)
diff --git a/source/OvsAction/ovs_action.c b/source/OvsAction/ovs_action.c
index edd48c0..0ae8616 100644
--- a/source/OvsAction/ovs_action.c
+++ b/source/OvsAction/ovs_action.c
@@ -1081,28 +1081,38 @@ static OVS_STATUS configureParentBridge(Gateway_Config * req, bool ovs_enabled,
         v_secure_system("ifconfig %s %s", req->parent_bridge,(req->if_cmd==OVS_IF_UP_CMD ? "up" : "down"));
 #endif
     }
-
-    if (ovs_enabled)
+    if (strcmp(req->if_name, "eth0") == 0 &&
+        strcmp(req->parent_bridge, BRLAN0_ETH_NAME) == 0 &&
+        access("/tmp/warehouse_mode", F_OK) == 0)
     {
-    	v_secure_system( "ovs-vsctl add-port %s %s", req->parent_bridge,req->if_name);
-    	OvsActionDebug("%s Cmd: ovs-vsctl add-port %s %s\n", __func__, req->parent_bridge,req->if_name);
+        OvsActionInfo("%s: In warehouse mode, skipping port %s addition to bridge %s\n",
+                        __func__, req->if_name, req->parent_bridge);
     }
     else
     {
-#ifdef CORE_NET_LIB
-        sts = interface_add_to_bridge(req->parent_bridge, req->if_name);
-        if (sts == CNL_STATUS_SUCCESS) {
-           OvsActionDebug("%s: Added interface %s to bridge %s\n", __func__, req->if_name, req->parent_bridge);
-        }
-        else {
-            OvsActionError("%s: Failed to add interface %s to bridge %s\n", __func__, req->if_name, req->parent_bridge);
+        if (ovs_enabled)
+        {
+            v_secure_system( "ovs-vsctl add-port %s %s", req->parent_bridge,req->if_name);
+            OvsActionDebug("%s Cmd: ovs-vsctl add-port %s %s\n", __func__, req->parent_bridge,req->if_name);
         }
+        else
+        {
+#ifdef CORE_NET_LIB
+            sts = interface_add_to_bridge(req->parent_bridge, req->if_name);
+            if (sts == CNL_STATUS_SUCCESS)
+            {
+                OvsActionDebug("%s: Added interface %s to bridge %s\n", __func__, req->if_name, req->parent_bridge);
+            }
+            else
+            {
+                OvsActionError("%s: Failed to add interface %s to bridge %s\n", __func__, req->if_name, req->parent_bridge);
+            }
 #else
-	v_secure_system("brctl addif %s %s", req->parent_bridge, req->if_name);
-    	 OvsActionDebug("%s Cmd: brctl addif %s %s\n", __func__,  req->parent_bridge, req->if_name);
+            v_secure_system("brctl addif %s %s", req->parent_bridge, req->if_name);
+            OvsActionDebug("%s Cmd: brctl addif %s %s\n", __func__,  req->parent_bridge, req->if_name);
 #endif
+        }
     }
-
     if (ovs_enabled)
     {
     	OvsActionDebug("%s Cmd: ovs-vsctl list-ports %s\n", __func__, req->parent_bridge);