diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts b/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
index 1c01a9f..0f6c23d 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus-secondary.dts
@@ -24,7 +24,7 @@
 	exception-level = <2>; /* S-EL1 */
 	execution-state = <0>; /* AARCH64 */
 	load-address = <0x7100000>;
-	entrypoint-offset = <0x00004000>;
+	entrypoint-offset = <0x00002000>;
 	xlat-granule = <0>; /* 4KiB */
 	boot-order = <1>;
 	messaging-method = <3>; /* Direct messaging only */
diff --git a/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts b/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
index 946301d..d1ffa2f 100644
--- a/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
+++ b/spm/cactus/plat/arm/fvp/fdts/cactus-tertiary.dts
@@ -24,7 +24,7 @@
 	exception-level = <2>; /* S-EL1 */
 	execution-state = <0>; /* AARCH64 */
 	load-address = <0x7200000>;
-	entrypoint-offset = <0x00004000>;
+	entrypoint-offset = <0x00002000>;
 	xlat-granule = <0>; /* 4KiB */
 	boot-order = <2>;
 	notification-support;
diff --git a/spm/cactus/plat/arm/tc/fdts/cactus-secondary.dts b/spm/cactus/plat/arm/tc/fdts/cactus-secondary.dts
index 839fb82..aa48e29 100644
--- a/spm/cactus/plat/arm/tc/fdts/cactus-secondary.dts
+++ b/spm/cactus/plat/arm/tc/fdts/cactus-secondary.dts
@@ -22,7 +22,7 @@
 	exception-level = <2>; /* S-EL1 */
 	execution-state = <0>; /* AARCH64 */
 	load-address = <0xfe100000>;
-	entrypoint-offset = <0x00004000>;
+	entrypoint-offset = <0x00002000>;
 	xlat-granule = <0>; /* 4KiB */
 	boot-order = <1>;
 	messaging-method = <3>; /* Direct messaging only */
diff --git a/spm/cactus/plat/arm/tc/fdts/cactus-tertiary.dts b/spm/cactus/plat/arm/tc/fdts/cactus-tertiary.dts
index 1db2c1e..145be36 100644
--- a/spm/cactus/plat/arm/tc/fdts/cactus-tertiary.dts
+++ b/spm/cactus/plat/arm/tc/fdts/cactus-tertiary.dts
@@ -22,7 +22,7 @@
 	exception-level = <2>; /* S-EL1 */
 	execution-state = <0>; /* AARCH64 */
 	load-address = <0xfe200000>;
-	entrypoint-offset = <0x00004000>;
+	entrypoint-offset = <0x00002000>;
 	xlat-granule = <0>; /* 4KiB */
 	boot-order = <2>;
 	messaging-method = <3>; /* Direct messaging only */
diff --git a/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel0.dts b/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel0.dts
index 7bf7d91..f885c5f 100644
--- a/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel0.dts
+++ b/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel0.dts
@@ -21,7 +21,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AARCH64 */
 	load-address = <0x7600000>;
-	entrypoint-offset = <0x00004000>;
+	entrypoint-offset = <0x00002000>;
 	boot-order = <3>;
 	messaging-method = <3>; /* Direct messaging only */
 
diff --git a/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel1.dts b/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel1.dts
index a4d26ef..1dfca01 100644
--- a/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel1.dts
+++ b/spm/ivy/app/plat/arm/fvp/fdts/ivy-sel1.dts
@@ -22,7 +22,7 @@
 	exception-level = <2>; /* S-EL1 */
 	execution-state = <0>; /* AARCH64 */
 	load-address = <0x7600000>;
-	entrypoint-offset = <0x00004000>;
+	entrypoint-offset = <0x00002000>;
 	boot-order = <3>;
 	messaging-method = <3>; /* Direct messaging only */
 	/* Non-secure interrupts are signaled by default. */
diff --git a/spm/ivy/app/plat/arm/tc/fdts/ivy-sel0.dts b/spm/ivy/app/plat/arm/tc/fdts/ivy-sel0.dts
index 7d333a6..1dd3b61 100644
--- a/spm/ivy/app/plat/arm/tc/fdts/ivy-sel0.dts
+++ b/spm/ivy/app/plat/arm/tc/fdts/ivy-sel0.dts
@@ -20,7 +20,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AARCH64 */
 	load-address = <0xfe280000>;
-	entrypoint-offset = <0x00004000>;
+	entrypoint-offset = <0x00002000>;
 	boot-order = <3>;
 	messaging-method = <3>; /* Direct messaging only */
 
diff --git a/spm/ivy/app/plat/arm/tc/fdts/ivy-sel1.dts b/spm/ivy/app/plat/arm/tc/fdts/ivy-sel1.dts
index 6503e15..bcb3162 100644
--- a/spm/ivy/app/plat/arm/tc/fdts/ivy-sel1.dts
+++ b/spm/ivy/app/plat/arm/tc/fdts/ivy-sel1.dts
@@ -21,7 +21,7 @@
 	exception-level = <2>; /* S-EL1 */
 	execution-state = <0>; /* AARCH64 */
 	load-address = <0xfe280000>;
-	entrypoint-offset = <0x00004000>;
+	entrypoint-offset = <0x00002000>;
 	boot-order = <3>;
 	messaging-method = <3>; /* Direct messaging only */
 
diff --git a/tools/generate_json/generate_json.sh b/tools/generate_json/generate_json.sh
index 5867700..9d51ba5 100755
--- a/tools/generate_json/generate_json.sh
+++ b/tools/generate_json/generate_json.sh
@@ -59,14 +59,16 @@
 	"image": "cactus.bin",
 	"pm": "cactus-secondary.dts",
 	"physical-load-address": "0x7100000",
-	"owner": "Plat"
+	"owner": "Plat",
+	"package": "tl_pkg"
 },
 
 "cactus-tertiary" : {
 	"image": "cactus.bin",
 	"pm": "cactus-tertiary.dts",
 	"physical-load-address": "0x7200000",
-	"owner": "Plat"
+	"owner": "Plat",
+	"package": "tl_pkg"
 EOF
 	PARTITION_ALREADY_PRESENT=true
 fi
@@ -81,7 +83,8 @@
 	"image": "ivy.bin",
 	"pm": "ivy-sel0.dts",
 	"physical-load-address": "0x7600000",
-	"owner": "Plat"
+	"owner": "Plat",
+	"package": "tl_pkg"
 }
 EOF
 
@@ -95,7 +98,8 @@
 	"image": "ivy.bin",
 	"pm": "ivy-sel1.dts",
 	"physical-load-address": "0x7600000",
-	"owner": "Plat"
+	"owner": "Plat",
+	"package":"tl_pkg"
 }
 EOF