diff --git a/dependency-check-core/src/main/resources/schema/suppression.xsd b/dependency-check-core/src/main/resources/schema/suppression.xsd
index 1ed2f32bb..14ae67a1a 100644
--- a/dependency-check-core/src/main/resources/schema/suppression.xsd
+++ b/dependency-check-core/src/main/resources/schema/suppression.xsd
@@ -1,5 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema id="suppressions" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression">
+<xs:schema id="suppressions"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="qualified"
+           targetNamespace="https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression"
+           xmlns:dc="https://www.owasp.org/index.php/OWASP_Dependency_Check_Suppression">
+
+    <xs:complexType name="regexStringType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute name="regex" use="optional" type="xs:boolean" default="false"/>
+                <xs:attribute name="caseSensitive" use="optional" type="xs:boolean" default="false"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:simpleType name="cvssScoreType">
+        <xs:restriction base="xs:decimal">
+            <xs:minInclusive value="0"/>
+            <xs:maxInclusive value="10"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="cveType">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="CVE\-\d\d\d\d\-\d+"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="sha1Type">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[a-fA-F0-9]{40}"/>
+        </xs:restriction>
+    </xs:simpleType>
     <xs:element name="suppressions">
         <xs:complexType>
             <xs:sequence minOccurs="0" maxOccurs="unbounded">
@@ -10,35 +39,15 @@
                                 <xs:element name="notes" type="xs:string"/>
                             </xs:sequence>
                             <xs:choice minOccurs="0" maxOccurs="1">
-                                <xs:element name="filePath">
-                                    <xs:complexType>
-                                        <xs:simpleContent>
-                                            <xs:extension base="xs:string">
-                                                <xs:attribute name="regex" use="optional" type="xs:boolean" default="false"/>
-                                                <xs:attribute name="caseSensitive" use="optional" type="xs:boolean" default="false"/>
-                                            </xs:extension>
-                                        </xs:simpleContent>
-                                    </xs:complexType>
-                                </xs:element>
-                                <xs:element name="sha1" type="xs:string"/>
+                                <xs:element name="filePath" type="dc:regexStringType"/>
+                                <xs:element name="sha1" type="dc:sha1Type"/>
+                            </xs:choice>
+                            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                                <xs:element name="cpe" type="dc:regexStringType"/>
+                                <xs:element name="cve" type="dc:cveType"/>
+                                <xs:element name="cwe" type="xs:positiveInteger"/>
+                                <xs:element name="cvssBelow" type="dc:cvssScoreType"/>
                             </xs:choice>
-                            <xs:sequence minOccurs="1" maxOccurs="unbounded">
-                                <xs:choice>
-                                    <xs:element name="cpe">
-                                        <xs:complexType>
-                                            <xs:simpleContent>
-                                                <xs:extension base="xs:string">
-                                                    <xs:attribute name="regex" use="optional" type="xs:boolean" default="false"/>
-                                                    <xs:attribute name="caseSensitive" use="optional" type="xs:boolean" default="false"/>
-                                                </xs:extension>
-                                            </xs:simpleContent>
-                                        </xs:complexType>
-                                    </xs:element>
-                                    <xs:element name="cve" type="xs:string"/>
-                                    <xs:element name="cwe" type="xs:string"/>
-                                    <xs:element name="cvssBelow" type="xs:decimal"/>
-                                </xs:choice>
-                            </xs:sequence>
                         </xs:sequence>
                     </xs:complexType>
                 </xs:element>