diff --git a/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd b/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
index a6c18b8cae1..3e5b808d0be 100644
--- a/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
+++ b/bundles/org.openhab.core.thing/schema/thing/thing-description-1.0.0.xsd
@@ -2,7 +2,9 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:thing-description="https://openhab.org/schemas/thing-description/v1.0.0"
 	xmlns:config-description="https://openhab.org/schemas/config-description/v1.0.0"
-	targetNamespace="https://openhab.org/schemas/thing-description/v1.0.0">
+	targetNamespace="https://openhab.org/schemas/thing-description/v1.0.0"
+	xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
+	vc:minVersion="1.1">
 
 	<xs:import namespace="https://openhab.org/schemas/config-description/v1.0.0"
 		schemaLocation="https://openhab.org/schemas/config-description-1.0.0.xsd"/>
@@ -216,7 +218,14 @@
 
 	<xs:complexType name="tags">
 		<xs:sequence>
-			<xs:element name="tag" type="thing-description:semanticPropertyOrPointTag" minOccurs="1" maxOccurs="2"/>
+			<xs:element name="tag">
+				<xs:alternative test="position() = 1" type="thing-description:semanticPointTag"/>
+				<xs:alternative type="xs:error"/>
+			</xs:element>
+			<xs:element name="tag" minOccurs="0">
+				<xs:alternative test="position() = 2" type="thing-description:semanticPropertyTag"/>
+				<xs:alternative type="xs:error"/>
+			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
 
@@ -271,7 +280,7 @@
 		</xs:simpleContent>
 	</xs:complexType>
 
-	<xs:simpleType name="semanticPropertyOrPointTag">
+	<xs:simpleType name="semanticPropertyTag">
 		<xs:restriction base="xs:string">
 			<!-- Begin Allowed Semantic Property Tag Values -->
 			<!-- DO NOT EDIT THIS LIST - Generated by generateTagClasses.groovy -->
@@ -339,7 +348,11 @@
 			<xs:enumeration value="Water"/>
 			<xs:enumeration value="Wind"/>
 			<!-- End Allowed Semantic Property Tag Values -->
+		</xs:restriction>
+	</xs:simpleType>
 
+	<xs:simpleType name="semanticPointTag">
+		<xs:restriction base="xs:string">
 			<!-- Begin Allowed Semantic Point Tag Values -->
 			<!-- DO NOT EDIT THIS LIST - Generated by generateTagClasses.groovy -->
 			<xs:enumeration value="Alarm"/>