diff --git a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
index f365b1792..e3e6e5ce6 100644
--- a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
+++ b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
@@ -132,7 +132,7 @@ class tripleo::profile::base::neutron::plugins::ovs::opendaylight (
   }
 
   if $step >= 5 {
-    $odl_of_mgr = regsubst($odl_ovsdb_str , ':6640', ':6653')
+    $odl_of_mgr = regsubst($odl_ovsdb_str , ':6640', ':6653', 'G')
     # Workaround until OpenDayight is capable of synchronizing flows
     if ! synchronize_odl_ovs_flows($odl_of_mgr) {
       fail('Failed to validate OVS OpenFlow pipeline')
diff --git a/releasenotes/notes/fix-odl-ovs-openflow-port-resync-79b5f69b71740a6c.yaml b/releasenotes/notes/fix-odl-ovs-openflow-port-resync-79b5f69b71740a6c.yaml
new file mode 100644
index 000000000..dd427fc43
--- /dev/null
+++ b/releasenotes/notes/fix-odl-ovs-openflow-port-resync-79b5f69b71740a6c.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes issue where OpenFlow port for an ODL deployment would be set
+    incorrectly to 6640 instead of 6653 in OVS. For more information see
+    https://bugs.launchpad.net/tripleo/+bug/1786037