diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml
index 70bccad3b1..bad879e08d 100644
--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ b/playbooks/defaults/repo_packages/openstack_services.yml
@@ -50,61 +50,51 @@ aodh_git_repo: https://opendev.org/openstack/aodh
 aodh_git_install_branch: 3a6480434e8ee4b6fa0af3fcf60c4b34ef7b09b1
 aodh_git_track_branch: master
 
-
 ## Barbican service
 barbican_git_repo: https://opendev.org/openstack/barbican
 barbican_git_install_branch: aba0bd074ed9098ed2518dca28487a98f5e3711a
 barbican_git_track_branch: master
 
-
 ## Barbican dashboard plugin
 barbican_dashboard_git_repo: https://opendev.org/openstack/barbican-ui
 barbican_dashboard_git_install_branch: 3a78a743426376250f43508d4281e86c75067271
 barbican_dashboard_git_track_branch: master
 
-
 ## Ceilometer service
 ceilometer_git_repo: https://opendev.org/openstack/ceilometer
 ceilometer_git_install_branch: 8810c4bc9aa46314752ca92abcbb36d8a81d74d6
 ceilometer_git_track_branch: master
 
-
 ## Cinder service
 cinder_git_repo: https://opendev.org/openstack/cinder
 cinder_git_install_branch: 24a783408879abd479e77dd88b43bf2a1be048fe
 cinder_git_track_branch: master
 
-
 ## Cloudkitty service
 cloudkitty_git_repo: https://opendev.org/openstack/cloudkitty
 cloudkitty_git_install_branch: 3a90e20130917d3af0171e35cc9f7154c5b1706e
 cloudkitty_git_track_branch: master
 
-
 ## Cloudkitty dashboard plugin
 cloudkitty_dashboard_git_repo: https://opendev.org/openstack/cloudkitty-dashboard
 cloudkitty_dashboard_git_install_branch: 7cdee86bac20a38d191677eaefe94914cc5207f7
 cloudkitty_dashboard_git_track_branch: master
 
-
 ## Designate service
 designate_git_repo: https://opendev.org/openstack/designate
 designate_git_install_branch: e6bf93a80af9d167c286382fa34a68706a5b2376
 designate_git_track_branch: master
 
-
 ## Horizon Designate dashboard plugin
 designate_dashboard_git_repo: https://opendev.org/openstack/designate-dashboard
 designate_dashboard_git_install_branch: eea24178501ea06ae6b5042bbbedb8e0011bc674
 designate_dashboard_git_track_branch: master
 
-
 ## Glance service
 glance_git_repo: https://opendev.org/openstack/glance
 glance_git_install_branch: bc9856ea9ce2ced219e9b294d8db3b5645d69796
 glance_git_track_branch: master
 
-
 ## Heat service
 heat_git_repo: https://opendev.org/openstack/heat
 heat_git_install_branch: b5caa1847cd6b96ea8f68dd52e67e00ba6602aca
@@ -135,25 +125,21 @@ masakari_dashboard_git_repo: https://opendev.org/openstack/masakari-dashboard
 masakari_dashboard_git_install_branch: c5c78cbe36a574eceabbd8d4a915a495e16eec38
 masakari_dashboard_git_track_branch: master
 
-
 ## Horizon Sahara dashboard plugin
 sahara_dashboard_git_repo: https://opendev.org/openstack/sahara-dashboard
 sahara_dashboard_git_install_branch: bdc39bbb0456d672cdfc16a7d1ace1c0f722490c
 sahara_dashboard_git_track_branch: master
 
-
 ## Keystone service
 keystone_git_repo: https://opendev.org/openstack/keystone
 keystone_git_install_branch: 7d4047cb69139c22f4e321e9ba8b287a47168df2
 keystone_git_track_branch: master
 
-
 ## Manila service
 manila_git_repo: https://opendev.org/openstack/manila
 manila_git_install_branch: 4408ec4f7cfac834c454537388fa23a13915e3f9
 manila_git_track_branch: master
 
-
 ## Neutron service
 neutron_git_repo: https://opendev.org/openstack/neutron
 neutron_git_install_branch: 7c449f1833a94a544cf0b9cfcf63f3e7e46fae26
@@ -163,7 +149,6 @@ neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas
 neutron_vpnaas_git_install_branch: d1b1f94b1b7aaa559b43e222974e0e92d811aff7
 neutron_vpnaas_git_track_branch: master
 
-
 neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing
 neutron_dynamic_routing_git_install_branch: 8bee5cc07ef9b8eda02e4aec2dcca9bd5e8f5af5
 neutron_dynamic_routing_git_track_branch: master
@@ -206,37 +191,31 @@ nova_git_repo: https://opendev.org/openstack/nova
 nova_git_install_branch: 8a476061c5e034016668cd9e5a20c4430ef6b68d
 nova_git_track_branch: master
 
-
 ## Sahara service
 sahara_git_repo: https://opendev.org/openstack/sahara
 sahara_git_install_branch: ebc6d74bf822fabae2ba8feab2ca561f83b239c0
 sahara_git_track_branch: master
 
-
 ## Senlin service
 senlin_git_repo: https://opendev.org/openstack/senlin
 senlin_git_install_branch: 0743b6ec7b31831430422bc5513e05820a326a0c
 senlin_git_track_branch: master
 
-
 ## Swift service
 swift_git_repo: https://opendev.org/openstack/swift
 swift_git_install_branch: 9dc12a89029526f0ac8cd4aa30e121e4fdac1641
 swift_git_track_branch: master
 
-
 ## Ironic service
 ironic_git_repo: https://opendev.org/openstack/ironic
 ironic_git_install_branch: ef772c2c1e84769a982c54ec8832e2a06b8f1911
 ironic_git_track_branch: master
 
-
 ## Ironic inspector service
 ironic_inspector_git_repo: https://opendev.org/openstack/ironic-inspector
 ironic_inspector_git_install_branch: 664aa3fb4ce778a142a0497a7035ce5499c6be03
 ironic_inspector_git_track_branch: master
 
-
 ## Magnum service
 magnum_git_repo: https://opendev.org/openstack/magnum
 magnum_git_install_branch: e8522168da1e908c1a695ecd0f7d6ab9a880f5d8
@@ -280,31 +259,31 @@ trove_dashboard_git_repo: https://opendev.org/openstack/trove-dashboard
 trove_dashboard_git_install_branch: 4c67c6db21e7537cffc29638f011bde14535000a
 trove_dashboard_git_track_branch: master
 
-
 ## Octavia service
 octavia_git_repo: https://opendev.org/openstack/octavia
 octavia_git_install_branch: 8d27bdb5462474dafc934d164f3a299bfca8dd89
 octavia_git_track_branch: master
 
+## Octavia OVN provider
+octavia_ovn_octavia_provider_git_repo: https://opendev.org/openstack/ovn-octavia-provider
+octavia_ovn_octavia_provider_git_install_branch: ef019ed63b7be9b2ff2eff5a1530d0870529da72
+octavia_ovn_octavia_provider_git_track_branch: master
 
 ## Placement service
 placement_git_repo: https://opendev.org/openstack/placement
 placement_git_install_branch: bacd2c039345dd12f22b0474b8a0f6a691a8ed98
 placement_git_track_branch: master
 
-
 ## Tacker service
 tacker_git_repo: https://opendev.org/openstack/tacker
 tacker_git_install_branch: 990e6a73f34bc98cdd03a54f6f726467af3bd8da
 tacker_git_track_branch: master
 
-
 ## Horizon Octavia dashboard plugin
 octavia_dashboard_git_repo: https://opendev.org/openstack/octavia-dashboard
 octavia_dashboard_git_install_branch: 774972c44741ec78b36fa45fbf8c356850f55541
 octavia_dashboard_git_track_branch: master
 
-
 ## Blazar service
 blazar_git_repo: https://opendev.org/openstack/blazar
 blazar_git_install_branch: 68c6487465d15bf9db4559e36eaf2b50ab2a0a9c