diff --git a/.gitignore b/.gitignore
index cc68e1e..273def5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@
 /ovn-21.12.0.tar.gz
 /ovn-22.03.0.tar.gz
 /openvswitch-2.17.1.tar.gz
+/ovn-22.06.0.tar.gz
+/openvswitch-d94cd0d.tar.gz
diff --git a/0001-fedora-Use-PROFILE-SYSTEM-in-SSL_CTX_set_cipher_list.patch b/0001-fedora-Use-PROFILE-SYSTEM-in-SSL_CTX_set_cipher_list.patch
index e5a89da..abb2818 100644
--- a/0001-fedora-Use-PROFILE-SYSTEM-in-SSL_CTX_set_cipher_list.patch
+++ b/0001-fedora-Use-PROFILE-SYSTEM-in-SSL_CTX_set_cipher_list.patch
@@ -11,10 +11,10 @@ Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
  lib/stream-ssl.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/openvswitch-2.17.1/lib/stream-ssl.c b/openvswitch-2.17.1/lib/stream-ssl.c
+diff --git a/ovs-d94cd0d3eec33e4290d7ca81918f5ac61444886e/lib/stream-ssl.c b/ovs-d94cd0d3eec33e4290d7ca81918f5ac61444886e/lib/stream-ssl.c
 index fed71801b..78e54c39e 100644
---- a/openvswitch-2.17.1/lib/stream-ssl.c
-+++ b/openvswitch-2.17.1/lib/stream-ssl.c
+--- a/ovs-d94cd0d3eec33e4290d7ca81918f5ac61444886e/lib/stream-ssl.c
++++ b/ovs-d94cd0d3eec33e4290d7ca81918f5ac61444886e/lib/stream-ssl.c
 @@ -1014,7 +1014,7 @@ do_ssl_init(void)
      SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
                         NULL);
diff --git a/ovn.spec b/ovn.spec
index db3f1af..af6208b 100644
--- a/ovn.spec
+++ b/ovn.spec
@@ -42,7 +42,7 @@
 Name: ovn
 Summary: Open Virtual Network support
 URL: http://www.openvswitch.org/
-Version: 22.03.0
+Version: 22.06.0
 Release: 1%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
 Obsoletes: openvswitch-ovn-common < %{?epoch_ovs:%{epoch_ovs}:}2.11.0-8
 Provides: openvswitch-ovn-common = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -60,18 +60,14 @@ Source: https://www.openvswitch.org/releases/ovn-%{version}.tar.gz
 # The OVN commit used for 2.12.0-4 is 0a51bb04f8d6194b2c706558d434b09a89196e26.
 # Update the above commit whenever the sources is updated.
 
-# Set the ovsversion to 2.14.90 which is the latest master. We always compile
-# OVN with the latest OVS master. Otherwise we will see compilation issues.
-# OVS is used only for compilation. The actual OVS binaries - ovs-vswitchd, ovsdb-server etc
-# comes from openvswitch package.
-# The ovs commit used is 5601e86c4ec("Set release date for 2.14.0.").
-# The ovs tarball is generated manually by running - "make dist" in the ovs repository.
-%define ovsver 2.17.1
-%define ovsdir openvswitch-%{ovsver}
+%define ovscommit d94cd0d3eec33e4290d7ca81918f5ac61444886e
+%define ovsshortcommit d94cd0d
 
-Source10: https://openvswitch.org/releases/openvswitch-%{ovsver}.tar.gz
+Source10: https://github.com/openvswitch/ovs/archive/%{ovscommit}.tar.gz#/openvswitch-%{ovsshortcommit}.tar.gz
+%define ovsdir ovs-%{ovscommit}
 
 # ovn-patches
+Patch:     ovn.patch
 
 # OpenvSwitch backports (400-) if required.
 # Address crpto policy for fedora
@@ -179,7 +175,7 @@ sed -i.old -e "s/^AC_INIT(openvswitch,.*,/AC_INIT(openvswitch, %{version},/" con
 # OVN source code is now separate.
 # Build openvswitch first.
 # Build openvswitch first
-cd openvswitch-%{ovsver}
+pushd %{ovsdir}
 ./boot.sh
 %configure \
 %if %{with libcapng}
@@ -197,11 +193,11 @@ cd openvswitch-%{ovsver}
 %endif
 
 make %{?_smp_mflags}
-cd -
+popd
 
 # Build OVN.
 %configure \
-        --with-ovs-source=$PWD/openvswitch-%{ovsver} \
+        --with-ovs-source=$PWD/%{ovsdir} \
 %if %{with libcapng}
         --enable-libcapng \
 %else
diff --git a/sources b/sources
index d436577..69d9e05 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ovn-22.03.0.tar.gz) = b47ad17ada4bbaadd4a7baf194512f327c9838aa779a811c4ba1859e6ebcf380e56cb3bf4786d32ef1cdef4fe285351996dccf740b74982f195c6b19feb75ccb
-SHA512 (openvswitch-2.17.1.tar.gz) = cd2a98a01b80b0f88c7a32fc916575d0b6228ec89924943f752910ead7f4ab7b00e3ef4df21da1cd985a90d32f033b804e14f961c37027988898e7e4583b1339
+SHA512 (ovn-22.06.0.tar.gz) = b6f63d9bb819006c326b8ba491c99eae1a096e0315c7aaeda3b8b732b22c4152ab095173c3094b2269d8e3bf57eb08c744f26ee9ad63ab1a16afa37dcc8db47b
+SHA512 (openvswitch-d94cd0d.tar.gz) = c68ba228946c81341fa1d66fc421f3c2d44ec0bd1cee786b36272012d5a4bf7a9bafd6ac0385ee89139c8c9acac22a39d8cd6159a48b523aba64b835c9041e94