diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index e110673..66e44f5 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -65,9 +65,27 @@ index 2caf36b85c..79271ff147 100644
    configure_script:
      - ./boot.sh
 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
-index c4487226be..c96666b305 100644
+index c4487226be..d9a4d4320f 100644
 --- a/.github/workflows/build-and-test.yml
 +++ b/.github/workflows/build-and-test.yml
+@@ -6,7 +6,7 @@ jobs:
+   build-linux:
+     env:
+       dependencies: |
+-        automake libtool gcc bc libjemalloc1 libjemalloc-dev    \
++        automake libtool gcc bc libjemalloc2 libjemalloc-dev    \
+         libssl-dev llvm-dev libelf-dev libnuma-dev libpcap-dev  \
+         ninja-build python3-openssl python3-pip                 \
+         python3-setuptools python3-sphinx python3-wheel         \
+@@ -26,7 +26,7 @@ jobs:
+       TESTSUITE:   ${{ matrix.testsuite }}
+ 
+     name: linux ${{ join(matrix.*, ' ') }}
+-    runs-on: ubuntu-18.04
++    runs-on: ubuntu-20.04
+     timeout-minutes: 30
+ 
+     strategy:
 @@ -113,6 +113,12 @@ jobs:
      - name: checkout
        uses: actions/checkout@v2
@@ -1396,6 +1414,18 @@ index 1f2b7a3668..8ffbbd3114 100644
  openvswitch (2.15.0-1) unstable; urgency=low
  
     * New upstream version
+diff --git a/debian/control b/debian/control
+index 6420b9d3e2..27359a297d 100644
+--- a/debian/control
++++ b/debian/control
+@@ -9,6 +9,7 @@ Build-Depends: graphviz,
+                bzip2,
+                debhelper (>= 8),
+                dh-autoreconf,
++               dh-python,
+                libssl-dev,
+                libtool,
+                openssl,
 diff --git a/dpdk/VERSION b/dpdk/VERSION
 index 8b0beab16a..2dbbe00e67 100644
 --- a/dpdk/VERSION
@@ -22020,10 +22050,24 @@ index 6be23dbeed..1a75969e42 100644
          } else {
              a = nl_attr_find(reply, 0, IFLA_STATS);
 diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c
-index f2413f5be6..0e4119c0a6 100644
+index f2413f5be6..0a4bf0d250 100644
 --- a/lib/netdev-offload-dpdk.c
 +++ b/lib/netdev-offload-dpdk.c
-@@ -503,8 +503,11 @@ dump_flow_action(struct ds *s, struct ds *s_extra,
+@@ -362,8 +362,11 @@ dump_vxlan_encap(struct ds *s, const struct rte_flow_item *items)
+     ds_put_format(s, "set vxlan ip-version %s ",
+                   ipv4 ? "ipv4" : ipv6 ? "ipv6" : "ERR");
+     if (vxlan) {
+-        ds_put_format(s, "vni %"PRIu32" ",
+-                      ntohl(*(ovs_be32 *) vxlan->vni) >> 8);
++        ovs_be32 vni;
++
++        vni = get_unaligned_be32(ALIGNED_CAST(ovs_be32 *,
++                                              vxlan->vni));
++        ds_put_format(s, "vni %"PRIu32" ", ntohl(vni) >> 8);
+     }
+     if (udp) {
+         ds_put_format(s, "udp-src %"PRIu16" udp-dst %"PRIu16" ",
+@@ -503,8 +506,11 @@ dump_flow_action(struct ds *s, struct ds *s_extra,
  
          ds_put_format(s, "set_ipv6_%s ", dirstr);
          if (set_ipv6) {
diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index 0aed6bb..2d72cb3 100644
--- a/SPECS/openvswitch2.15.spec
+++ b/SPECS/openvswitch2.15.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.15.0
-Release: 116%{?dist}
+Release: 117%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -702,6 +702,13 @@ exit 0
 %endif
 
 %changelog
+* Tue Aug 09 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-117
+- Merging upstream branch-2.15 [RH git: 671f431f8e]
+    Commit list:
+    f1a14e9600 github: Move CI to ubuntu 20.04 base image.
+    176298d066 netdev-offload-dpdk: Fix vxlan vni cast-align warnings.
+
+
 * Mon Aug 08 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-116
 - Merging upstream branch-2.15 [RH git: 12c6518299]
     Commit list: