diff --git a/manila/share/drivers/container/container_helper.py b/manila/share/drivers/container/container_helper.py
index 81bd3daeb7..7938431820 100644
--- a/manila/share/drivers/container/container_helper.py
+++ b/manila/share/drivers/container/container_helper.py
@@ -149,7 +149,7 @@ class DockerExecHelper(driver.ExecuteMixin):
         interfaces = self._execute("ovs-vsctl", "list", "interface",
                                    run_as_root=True)[0]
         veths = set(re.findall("veth[0-9a-zA-Z]{7}", interfaces))
-        manila_re = "manila-container=\".*\""
+        manila_re = "manila-container=\"?.{%s}\"?" % len(name)
         for veth in veths:
             try:
                 iface_data = self._execute("ovs-vsctl", "list", "interface",
diff --git a/releasenotes/notes/bug-1896322-container-fix-search-veth-regex-7f2156a6fd411bdb.yaml b/releasenotes/notes/bug-1896322-container-fix-search-veth-regex-7f2156a6fd411bdb.yaml
new file mode 100644
index 0000000000..ce16468b59
--- /dev/null
+++ b/releasenotes/notes/bug-1896322-container-fix-search-veth-regex-7f2156a6fd411bdb.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Fixed an issue on Container driver when managing share servers. The regex
+    used to search for container-name in the available network interfaces
+    was updated to support newer versions of Open vSwitch. Refer to the
+    `Bug #1896322 <https://bugs.launchpad.net/manila/+bug/1896322>`_ for more
+    details.