diff --git a/common/src/main/java/org/jboss/metadata/parser/util/XMLResourceResolver.java b/common/src/main/java/org/jboss/metadata/parser/util/XMLResourceResolver.java
index 0093f83e6..b9234be59 100644
--- a/common/src/main/java/org/jboss/metadata/parser/util/XMLResourceResolver.java
+++ b/common/src/main/java/org/jboss/metadata/parser/util/XMLResourceResolver.java
@@ -190,6 +190,7 @@ public Object run() {
         registerEntity("http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_4.xsd", "javaee_web_services_1_4.xsd");
         registerEntity("https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_client_2_0.xsd", "jakartaee_web_services_client_2_0.xsd");
         registerEntity("https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_2_0.xsd", "jakartaee_web_services_2_0.xsd");
+        registerEntity("https://jakarta.ee/xml/ns/jakartaee/akartaee_web_services_metadata_handler_3_0.xsd", "jakartaee_web_services_metadata_handler_3_0.xsd");
 
         // jsp
         registerEntity("http://java.sun.com/xml/ns/javaee/jsp_2_2.xsd", "jsp_2_2.xsd");
diff --git a/common/src/main/resources/schema/jakartaee_web_services_2_0.xsd b/common/src/main/resources/schema/jakartaee_web_services_2_0.xsd
index 5bc531555..846a80549 100644
--- a/common/src/main/resources/schema/jakartaee_web_services_2_0.xsd
+++ b/common/src/main/resources/schema/jakartaee_web_services_2_0.xsd
@@ -9,7 +9,7 @@
   <xsd:annotation>
     <xsd:documentation>
 
-      Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+      Copyright (c) 2009, 2021 Oracle and/or its affiliates. All rights reserved.
       
       This program and the accompanying materials are made available under the
       terms of the Eclipse Public License v. 2.0, which is available at
@@ -90,7 +90,7 @@
     </xsd:documentation>
   </xsd:annotation>
 
-  <xsd:include schemaLocation="jakartaee_9.xsd"/>
+  <xsd:include schemaLocation="jakartaee_10.xsd"/>
 
 
 <!-- **************************************************** -->
diff --git a/common/src/main/resources/schema/jakartaee_web_services_client_2_0.xsd b/common/src/main/resources/schema/jakartaee_web_services_client_2_0.xsd
index 72e043543..4e3fd5e4c 100644
--- a/common/src/main/resources/schema/jakartaee_web_services_client_2_0.xsd
+++ b/common/src/main/resources/schema/jakartaee_web_services_client_2_0.xsd
@@ -9,7 +9,7 @@
   <xsd:annotation>
     <xsd:documentation>
 
-      Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+      Copyright (c) 2009, 2021 Oracle and/or its affiliates. All rights reserved.
       
       This program and the accompanying materials are made available under the
       terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/common/src/main/resources/schema/jakartaee_web_services_metadata_handler_3_0.xsd b/common/src/main/resources/schema/jakartaee_web_services_metadata_handler_3_0.xsd
new file mode 100644
index 000000000..5154222f5
--- /dev/null
+++ b/common/src/main/resources/schema/jakartaee_web_services_metadata_handler_3_0.xsd
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Distribution License v. 1.0, which is available at
+    http://www.eclipse.org/org/documents/edl-v10.php.
+
+    SPDX-License-Identifier: BSD-3-Clause
+
+-->
+
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+            targetNamespace="https://jakarta.ee/xml/ns/jakartaee"
+            xmlns:jakartaee="https://jakarta.ee/xml/ns/jakartaee"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified"
+            version="3.0">
+
+  <xsd:annotation>
+    <xsd:documentation>
+      This is the XML Schema for the Handler chain configuration descriptor.
+      The configuration file must be in the classpath within the JAR/WAR file.
+
+      All Handler chain configuration descriptors
+      should indicate the descriptor schema by using the Jakarta EE
+      namespace:
+
+      https://jakarta.ee/xml/ns/jakartaee
+
+      and by indicating the version of the schema by
+      using the version element as shown below:
+
+        <handler-chains xmlns="https://jakarta.ee/xml/ns/jakartaee"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+              https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_metadata_handler_3_0.xsd"
+          version="3.0">
+          ...
+        </handler-chains>
+
+      The instance documents may indicate the published version of
+      the schema using the xsi:schemaLocation attribute for Jakarta EE
+      namespace with the following location:
+
+      https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_metadata_handler_3_0.xsd
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:include schemaLocation="jakartaee_9.xsds"/>
+
+  <xsd:element name="handler-chains"
+               type="jakartaee:service-ref_handler-chainsType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        The handler-chains element is the root element for defining
+        handlerchains.
+
+        The Jakarta Web Services Metadata
+        specification defines the @jakarta.jws.HandlerChain annotation
+        that refers to an XML descriptor conforming to this schema.
+
+      </xsd:documentation>
+    </xsd:annotation>
+  </xsd:element>
+
+</xsd:schema>