diff --git a/data/profiles/CERT_TS_02_01_BO_AT.xml b/data/profiles/CERT_TS_02_01_BO_AT.xml
index 33c5553f0ddbb6e606c2a813054cbf19e5409a82..7219544778795f286ad8c81ec2677bda678842d5 100644
--- a/data/profiles/CERT_TS_02_01_BO_AT.xml
+++ b/data/profiles/CERT_TS_02_01_BO_AT.xml
@@ -1,7 +1,7 @@
 <!-- AT certificate signed by EA cert -->
 <certificate name="CERT_TS_02_01_BO_AT">
 	<version>2</version>
-	<signer type="digest" name="CERT_TS_A_EA"/>
+	<signer type="digest" name="CERT_TS_A_EC"/>
 	<subject type="AT" name="">
 		<!-- verification_key -->
 		<attribute type="verification_key">
diff --git a/data/profiles/CERT_TS_02_02_BO_AA.xml b/data/profiles/CERT_TS_02_02_BO_AA.xml
index 592b42709af36caf2758525523ddcbbe15f981a0..4f17bbd8c7bb8bba42fedc005f982a9491fae4c6 100644
--- a/data/profiles/CERT_TS_02_02_BO_AA.xml
+++ b/data/profiles/CERT_TS_02_02_BO_AA.xml
@@ -1,7 +1,7 @@
 <!-- AA certificate signed by EA cert -->
 <certificate name="CERT_TS_02_02_BO_AA">
 	<version>2</version>
-	<signer type="digest" name="CERT_TS_A_EA"/>
+	<signer type="digest" name="CERT_TS_A_EC"/>
 	<subject type="AA" name="">
 		<!-- verification_key -->
 		<attribute type="verification_key">
diff --git a/data/profiles/CERT_TS_03_01_BO_AA.xml b/data/profiles/CERT_TS_02_03_BO_AT.xml
similarity index 81%
rename from data/profiles/CERT_TS_03_01_BO_AA.xml
rename to data/profiles/CERT_TS_02_03_BO_AT.xml
index aa1cfa5e19978927c111d38fbccd66b81e14492a..33c5553f0ddbb6e606c2a813054cbf19e5409a82 100644
--- a/data/profiles/CERT_TS_03_01_BO_AA.xml
+++ b/data/profiles/CERT_TS_02_03_BO_AT.xml
@@ -1,7 +1,7 @@
-<!-- AT certificate used to sign other AT cert -->
-<certificate name="CERT_TS_03_01_BO_AA">
+<!-- AT certificate signed by EA cert -->
+<certificate name="CERT_TS_02_01_BO_AT">
 	<version>2</version>
-	<signer type="digest" name="CERT_TS_A_AA"/>
+	<signer type="digest" name="CERT_TS_A_EA"/>
 	<subject type="AT" name="">
 		<!-- verification_key -->
 		<attribute type="verification_key">
diff --git a/data/profiles/CERT_TS_02_04_BO_AA.xml b/data/profiles/CERT_TS_02_04_BO_AA.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a5f38df8b7b0c6b9bc2656a6e3cee66e76e35ec8
--- /dev/null
+++ b/data/profiles/CERT_TS_02_04_BO_AA.xml
@@ -0,0 +1,29 @@
+<!-- AA certificate signed by EA cert -->
+<certificate name="CERT_TS_02_04_BO_AA">
+	<version>2</version>
+	<signer type="digest" name="CERT_TS_A_EA"/>
+	<subject type="AA" name="">
+		<!-- verification_key -->
+		<attribute type="verification_key">
+			<public_key algorythm="ecdsa_nistp256_with_sha256">
+				<ecc_point type="uncompressed"/>
+			</public_key>
+		</attribute>
+		<!-- assurance_level -->
+		<attribute type="assurance_level">
+			<assurance level="4" confidence="0"/>
+		</attribute>
+		<!-- its_aid_list -->
+		<attribute type="its_aid_list">
+			<aid value="36"/> <!-- CAM -->
+			<aid value="37"/> <!-- DENM -->
+		</attribute>
+	</subject>
+	<validity>
+		<restriction type="time" start="2015-01-01" end="2015-04-30"/>
+		<restriction type="region">
+			<none/>
+		</restriction>
+	</validity>
+	<signature algorithm="0"/>
+</certificate>
diff --git a/data/profiles/CERT_TS_02_04_BO_AT.xml b/data/profiles/CERT_TS_02_04_BO_AT.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7926e4ee0f08a9673b2edd50935787955f9d30eb
--- /dev/null
+++ b/data/profiles/CERT_TS_02_04_BO_AT.xml
@@ -0,0 +1,29 @@
+<!-- AT certificate signed by AA which is signed by EA -->
+<certificate name="CERT_TS_02_04_BO_AT">
+	<version>2</version>
+	<signer type="digest" name="CERT_TS_02_04_BO_AA"/>
+	<subject type="AT" name="">
+		<!-- verification_key -->
+		<attribute type="verification_key">
+			<public_key algorythm="ecdsa_nistp256_with_sha256">
+				<ecc_point type="uncompressed"/>
+			</public_key>
+		</attribute>
+		<!-- assurance_level -->
+		<attribute type="assurance_level">
+			<assurance level="3"/>
+		</attribute>
+		<!-- its_aid_ssp_list -->
+		<attribute type="its_aid_ssp_list">
+			<ssp aid="36">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
+			<ssp aid="37">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
+		</attribute>
+	</subject>
+	<validity>
+		<restriction type="time" start="2015-01-01" end="2015-04-30"/>
+		<restriction type="region">
+			<none/>
+		</restriction>
+	</validity>
+	<signature algorithm="0"/>
+</certificate>
diff --git a/data/profiles/CERT_TS_03_01_BO_AT.xml b/data/profiles/CERT_TS_03_01_BO_AT.xml
index 3506132bd85019e41704e6b47621a28d6cafbfa6..9dce8f34960a58e9cf9be1ebc86b8e8c5cf7fe91 100644
--- a/data/profiles/CERT_TS_03_01_BO_AT.xml
+++ b/data/profiles/CERT_TS_03_01_BO_AT.xml
@@ -1,7 +1,7 @@
 <!-- AT certificate signed by other AT certificate -->
 <certificate name="CERT_TS_03_01_BO_AT">
 	<version>2</version>
-	<signer type="digest" name="CERT_TS_03_01_BO_AA"/>
+	<signer type="digest" name="CERT_TS_03_BO_CA"/>
 	<subject type="AT" name="">
 		<!-- verification_key -->
 		<attribute type="verification_key">
diff --git a/data/profiles/CERT_TS_03_02_BO_AA.xml b/data/profiles/CERT_TS_03_02_BO_AA.xml
index 4992c149bb71c26d78e2f9e50f43649f7959d6b5..67bc328e499d1c4d2553886dd01012ef6851fedb 100644
--- a/data/profiles/CERT_TS_03_02_BO_AA.xml
+++ b/data/profiles/CERT_TS_03_02_BO_AA.xml
@@ -1,7 +1,7 @@
 <!-- AA certificate signed by AT cert -->
 <certificate name="CERT_TS_03_02_BO_AA">
 	<version>2</version>
-	<signer type="digest" name="CERT_TS_03_02_BO_CA"/>
+	<signer type="digest" name="CERT_TS_03_BO_CA"/>
 	<subject type="AA" name="">
 		<!-- verification_key -->
 		<attribute type="verification_key">
diff --git a/data/profiles/CERT_TS_03_02_BO_CA.xml b/data/profiles/CERT_TS_03_BO_CA.xml
similarity index 92%
rename from data/profiles/CERT_TS_03_02_BO_CA.xml
rename to data/profiles/CERT_TS_03_BO_CA.xml
index 59b8a9a34b65b0fd59dea4f43d4fc24284a992c0..97a6ed20f15665326067cc99949f1138b9339809 100644
--- a/data/profiles/CERT_TS_03_02_BO_CA.xml
+++ b/data/profiles/CERT_TS_03_BO_CA.xml
@@ -1,5 +1,5 @@
 <!-- AT certificate used to sign AA cert -->
-<certificate name="CERT_TS_03_02_BO_CA">
+<certificate name="CERT_TS_03_BO_CA">
 	<version>2</version>
 	<signer type="digest" name="CERT_TS_A_AA"/>
 	<subject type="AT" name="">