diff --git a/elements/overcloud-compute/install.d/package-installs-overcloud-compute b/elements/overcloud-compute/install.d/package-installs-overcloud-compute
index 2d150e04..1c55b7c6 100644
--- a/elements/overcloud-compute/install.d/package-installs-overcloud-compute
+++ b/elements/overcloud-compute/install.d/package-installs-overcloud-compute
@@ -9,6 +9,7 @@ neutron_sriov_agent_package
 nfs_package
 nova_compute_package
 ntp_package
+openvswitch_ovn_compute_package
 pacemaker_remote_package
 rubygem_fluent_package
 sensu_package
diff --git a/elements/overcloud-compute/pkg-map b/elements/overcloud-compute/pkg-map
index 098d8153..dbb21302 100644
--- a/elements/overcloud-compute/pkg-map
+++ b/elements/overcloud-compute/pkg-map
@@ -12,6 +12,7 @@
     "nfs_package": "nfs-utils",
     "nova_compute_package": "openstack-nova-compute",
     "ntp_package": "ntp",
+    "openvswitch_ovn_compute_package": "openvswitch-ovn-host",
     "pacemaker_remote_package": "pacemaker-remote",
     "rubygem_fluent_package": "rubygem-fluent-plugin-add",
     "sensu_package": "sensu"
diff --git a/elements/overcloud-controller/install.d/package-installs-overcloud-controller b/elements/overcloud-controller/install.d/package-installs-overcloud-controller
index 1ed164de..d56fa42a 100644
--- a/elements/overcloud-controller/install.d/package-installs-overcloud-controller
+++ b/elements/overcloud-controller/install.d/package-installs-overcloud-controller
@@ -43,6 +43,7 @@ neutron_ml2_package
 neutron_openvswitch_package
 neutron_package
 networking_odl_package
+networking_ovn_package
 nfs_package
 nova_api_package
 nova_cert_package
@@ -51,6 +52,7 @@ nova_console_package
 nova_novncproxy_package
 nova_scheduler_package
 ntp_package
+openvswitch_ovn_controller_package
 pacemaker_package
 pcs_package
 python_cradox_package
diff --git a/elements/overcloud-controller/pkg-map b/elements/overcloud-controller/pkg-map
index 4104cde7..1062148e 100644
--- a/elements/overcloud-controller/pkg-map
+++ b/elements/overcloud-controller/pkg-map
@@ -51,6 +51,7 @@
     "neutron_openvswitch_package": "openstack-neutron-openvswitch",
     "neutron_package": "openstack-neutron",
     "networking_odl_package": "python-networking-odl",
+    "networking_ovn_package": "python-networking-ovn",
     "nfs_package": "nfs-utils",
     "nova_api_package": "openstack-nova-api",
     "nova_cert_package": "openstack-nova-cert",
@@ -59,6 +60,7 @@
     "nova_novncproxy_package": "openstack-nova-novncproxy",
     "nova_scheduler_package": "openstack-nova-scheduler",
     "ntp_package": "ntp",
+    "openvswitch_ovn_controller_package": "openvswitch-ovn-central",
     "python_cradox_package": "python-cradox",
     "python_openstackclient_package": "python-openstackclient",
     "python_memcached_package": "python-memcached",
diff --git a/elements/puppet-modules/environment.d/02-puppet-modules-install-types.sh b/elements/puppet-modules/environment.d/02-puppet-modules-install-types.sh
index 1fc68e13..2991e847 100644
--- a/elements/puppet-modules/environment.d/02-puppet-modules-install-types.sh
+++ b/elements/puppet-modules/environment.d/02-puppet-modules-install-types.sh
@@ -39,6 +39,7 @@ if [ "$DIB_INSTALLTYPE_puppet_modules" = "source" ]; then
     puppet-nova \
     puppet-oslo \
     puppet-nssdb \
+    puppet-ovn \
     puppet-puppet \
     puppetlabs-rabbitmq \
     puppet-redis \
diff --git a/elements/puppet-modules/source-repository-puppet-modules b/elements/puppet-modules/source-repository-puppet-modules
index a0270444..d173f86e 100644
--- a/elements/puppet-modules/source-repository-puppet-modules
+++ b/elements/puppet-modules/source-repository-puppet-modules
@@ -31,6 +31,7 @@ puppet-neutron git /opt/stack/puppet-modules/neutron https://git.openstack.org/o
 puppet-nova git /opt/stack/puppet-modules/nova https://git.openstack.org/openstack/puppet-nova.git
 puppet-oslo git /opt/stack/puppet-modules/oslo https://git.openstack.org/openstack/puppet-oslo.git
 puppet-nssdb git /opt/stack/puppet-modules/nssdb https://github.com/rcritten/puppet-nssdb.git
+puppet-ovn git /opt/stack/puppet-modules/ovn https://git.openstack.org/openstack/puppet-ovn.git
 puppet-puppet git /opt/stack/puppet-modules/puppet https://github.com/purpleidea/puppet-puppet.git
 puppetlabs-rabbitmq git /opt/stack/puppet-modules/rabbitmq https://github.com/puppetlabs/puppetlabs-rabbitmq.git
 puppet-redis git /opt/stack/puppet-modules/redis https://github.com/arioch/puppet-redis.git