diff --git a/component.xml b/component.xml
index 662fa1b..8b4e8ca 100644
--- a/component.xml
+++ b/component.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-1.6.xsd"
+<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.0.xsd"
         name="mantle-edi" version="1.0.1">
     <depends-on name="mantle-udm"/>
     <depends-on name="mantle-usl"/>
diff --git a/service/mantle/edi/EdiServices.xml b/service/mantle/edi/EdiServices.xml
index 622fb8b..daf6877 100644
--- a/service/mantle/edi/EdiServices.xml
+++ b/service/mantle/edi/EdiServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-1.6.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-2.0.xsd">
 
     <!-- ========== General EDI Services, delegate to specific services based on message type ========== -->
 
diff --git a/service/mantle/edi/account/X12InvoiceServices.xml b/service/mantle/edi/account/X12InvoiceServices.xml
index cf35264..e2a3262 100644
--- a/service/mantle/edi/account/X12InvoiceServices.xml
+++ b/service/mantle/edi/account/X12InvoiceServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-1.6.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-2.0.xsd">
 
     <!-- EDI X12 V4010 Invoice Message Services -->
 
diff --git a/service/mantle/edi/order/X12OrderServices.xml b/service/mantle/edi/order/X12OrderServices.xml
index febeec6..ee754f7 100644
--- a/service/mantle/edi/order/X12OrderServices.xml
+++ b/service/mantle/edi/order/X12OrderServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-1.6.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-2.0.xsd">
 
     <!-- EDI X12 V4010 Order Message Services -->
 
diff --git a/service/mantle/edi/shipment/X12ShipmentServices.xml b/service/mantle/edi/shipment/X12ShipmentServices.xml
index 4faa366..6f9ce25 100644
--- a/service/mantle/edi/shipment/X12ShipmentServices.xml
+++ b/service/mantle/edi/shipment/X12ShipmentServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-1.6.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-2.0.xsd">
 
     <!-- EDI X12 V4010 Shipment Message Services -->