diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1
index 68cfe54e9a3e75ef0565bd50cd1c0d4bdbc8793f..c7b31a63158c6023395cf62e69e52651c8c63d5b 100644
--- a/103280/TS_103_280.asn1
+++ b/103280/TS_103_280.asn1
@@ -91,4 +91,4 @@ GPSINAI ::= NAI
 
 NAI ::= UTF8String
 
-END
+END
\ No newline at end of file
diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd
index e5c0bdea3682e1962175e2c84bd36a09a20ae821..ce66ea6e07a51b9b1870ce32eb95d2c09eba3720 100644
--- a/103280/TS_103_280.xsd
+++ b/103280/TS_103_280.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.4.1" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.6.1" elementFormDefault="qualified">
     <xs:simpleType name="ShortString">
         <xs:restriction base="xs:string">
             <xs:maxLength value="255"/>
@@ -236,4 +236,9 @@
             <xs:pattern value="([A-Z]{2}-.+-.+)"/>
         </xs:restriction>
     </xs:simpleType>
-</xs:schema>
+    <xs:simpleType name="InternationalizedEmailAddress">
+        <xs:restriction base="ShortString">
+            <xs:pattern value=".+@.+"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
\ No newline at end of file
diff --git a/103280/portal/TS_103_280_v020401.xsd b/103280/portal/TS_103_280_v020601.xsd
similarity index 97%
rename from 103280/portal/TS_103_280_v020401.xsd
rename to 103280/portal/TS_103_280_v020601.xsd
index e5c0bdea3682e1962175e2c84bd36a09a20ae821..e78066065c09c8910e83fcd0f9ea3f137bfa7b96 100644
--- a/103280/portal/TS_103_280_v020401.xsd
+++ b/103280/portal/TS_103_280_v020601.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.4.1" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.6.1" elementFormDefault="qualified">
     <xs:simpleType name="ShortString">
         <xs:restriction base="xs:string">
             <xs:maxLength value="255"/>
@@ -236,4 +236,9 @@
             <xs:pattern value="([A-Z]{2}-.+-.+)"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="InternationalizedEmailAddress">
+        <xs:restriction base="ShortString">
+            <xs:pattern value=".+@.+"/>
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>