diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch
index 85ea2ab..cf6fbb5 100644
--- a/SOURCES/openvswitch-3.3.0.patch
+++ b/SOURCES/openvswitch-3.3.0.patch
@@ -5015,7 +5015,7 @@ index b5cbeed878..ff1d4b0028 100644
                      /* Clears 'recircs' if filled by revalidate_ukey(). */
                      reval_op_init(&ops[n_ops++], result, udpif, ukey, &recircs,
 diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
-index 1cf4d5f7c9..19efe8b9f3 100644
+index 1cf4d5f7c9..818ef3a011 100644
 --- a/ofproto/ofproto-dpif-xlate.c
 +++ b/ofproto/ofproto-dpif-xlate.c
 @@ -677,6 +677,7 @@ static size_t count_skb_priorities(const struct xport *);
@@ -5056,6 +5056,19 @@ index 1cf4d5f7c9..19efe8b9f3 100644
      }
  
      err = tnl_route_lookup_flow(ctx, flow, &d_ip6, &s_ip6, &out_dev);
+@@ -3849,9 +3857,9 @@ native_tunnel_output(struct xlate_ctx *ctx, const struct xport *xport,
+                      "sending %s request",
+                      buf_dip6, out_dev->xbridge->name, d_ip ? "ARP" : "ND");
+ 
+-        err = ovs_router_get_netdev_source_address(&d_ip6,
+-                                                   out_dev->xbridge->name,
+-                                                   &nh_s_ip6);
++        err = ovs_router_get_netdev_source_address(
++            &d_ip6, netdev_get_name(out_dev->netdev), &nh_s_ip6);
++
+         if (err) {
+             nh_s_ip6 = s_ip6;
+         }
 @@ -5078,10 +5086,37 @@ put_controller_user_action(struct xlate_ctx *ctx,
                             bool dont_send, bool continuation,
                             uint32_t recirc_id, int len,
diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec
index fb2b15b..250d133 100644
--- a/SPECS/openvswitch3.3.spec
+++ b/SPECS/openvswitch3.3.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.3.3
-Release: 96%{?dist}
+Release: 97%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -786,6 +786,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Feb 26 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-97
+- Merging upstream branch-3.3 [RH git: a678b830a7]
+    Commit list:
+    8d772a25ab ofproto-dpif-xlate: Fix source IP lookup for non-bridge ports.
+
+
 * Tue Feb 25 2025 Timothy Redaelli <tredaelli@redhat.com> - 3.3.0-96
 - Add include.mk [RH git: 091356baca]