diff --git a/environment_config.yaml b/environment_config.yaml
index 3e9ef5e..8029fae 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -25,7 +25,7 @@ attributes:
     description:
       >
        Classifier determines what traffic needs to be chained based on policy based on yang model.
-       The OpenDayLight actually supports the OVSDB NetVirt and the GBP classifier in case of SFC.
+       The OpenDaylight actually supports the OVSDB NetVirt and the GBP classifier in case of SFC.
     restrictions:
       - condition: "settings:opendaylight.enable_sfc.value == false"
         action: "hide"
@@ -52,7 +52,10 @@ attributes:
         message: "Openvswitch with NSH/DPDK (fuel-plugin-ovs) must be installed and it needs to be installed on the controller as well."
       - condition: "settings:opendaylight.enable_l3_odl.value == false"
         strict: false
-        message: "OpenDayLight must be acting as the L3 controller for the bgpvpn features to be enabled."
+        message: "OpenDaylight must be acting as the L3 controller for the bgpvpn features to be enabled."
+      - condition: "settings:opendaylight.deb_version.value != '5.2.0-1'"
+        strict: false
+        message: "The BGPVPN features only support OpenDaylight 5.2.0-1. The OpenDaylight package version field must be set to that value."
   odl_v2:
     weight: 60
     type: "checkbox"
@@ -89,7 +92,7 @@ attributes:
   deb_version:
     value: '5.0.0-1'
     label: 'OpenDaylight package version'
-    description: 'Plugin can be build with more than one version of ODL.'
+    description: 'Plugin can be built with more than one version of ODL.'
     weight: 90
     type: "text"
   metadata:
diff --git a/pre_build_hook b/pre_build_hook
index 617b25a..0d00137 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -7,7 +7,7 @@ ODL_INTEGRATION_PACKAGING=${ODL_INTEGRATION_PACKAGING:-https://github.com/openda
 # Taken from https://github.com/opendaylight/integration-packaging/blob/master/deb/build_vars.yaml
 # If more than one version of ODL are included make sure that local
 # fpb contain this commit https://review.openstack.org/#/c/311031/
-ODL_VERSIONS=${ODL_VERSIONS:-5.0.0.1}
+ODL_VERSIONS=${ODL_VERSIONS:-5.0.0.1 5.2.0.1}
 
 #Networking odl
 NETWORKING_ODL_REPO=${NETWORKING_ODL_REPO:-http://ubuntu-cloud.archive.canonical.com/ubuntu/pool/main/n/networking-odl/}