diff --git a/deployments/attestation/opteesp/default_attestation.dts.in b/deployments/attestation/opteesp/default_attestation.dts.in
index 4f147c7..97e0006 100644
--- a/deployments/attestation/opteesp/default_attestation.dts.in
+++ b/deployments/attestation/opteesp/default_attestation.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 	legacy-elf-format = <1>;
 
 	boot-params {
diff --git a/deployments/attestation/sp/default_attestation.dts.in b/deployments/attestation/sp/default_attestation.dts.in
index e32e2e4..ef26e0e 100644
--- a/deployments/attestation/sp/default_attestation.dts.in
+++ b/deployments/attestation/sp/default_attestation.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 
 	boot-params {
 		compatible = "arm,ffa-manifest-boot-params";
diff --git a/deployments/crypto/opteesp/default_crypto.dts.in b/deployments/crypto/opteesp/default_crypto.dts.in
index 26aa41b..5190ee7 100644
--- a/deployments/crypto/opteesp/default_crypto.dts.in
+++ b/deployments/crypto/opteesp/default_crypto.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 	legacy-elf-format = <1>;
 
 	device-regions {
diff --git a/deployments/crypto/sp/default_crypto.dts.in b/deployments/crypto/sp/default_crypto.dts.in
index b486150..089b867 100644
--- a/deployments/crypto/sp/default_crypto.dts.in
+++ b/deployments/crypto/sp/default_crypto.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 
 	device-regions {
 		compatible = "arm,ffa-manifest-device-regions";
diff --git a/deployments/env-test/opteesp/default_env-test.dts.in b/deployments/env-test/opteesp/default_env-test.dts.in
index edc6073..d2685d7 100644
--- a/deployments/env-test/opteesp/default_env-test.dts.in
+++ b/deployments/env-test/opteesp/default_env-test.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 
 	memory-regions {
 		compatible = "arm,ffa-manifest-memory-regions";
diff --git a/deployments/env-test/sp/default_env-test.dts.in b/deployments/env-test/sp/default_env-test.dts.in
index 78beade..44a2dac 100644
--- a/deployments/env-test/sp/default_env-test.dts.in
+++ b/deployments/env-test/sp/default_env-test.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 
 	memory-regions {
 		compatible = "arm,ffa-manifest-memory-regions";
diff --git a/deployments/internal-trusted-storage/opteesp/default_internal-trusted-storage.dts.in b/deployments/internal-trusted-storage/opteesp/default_internal-trusted-storage.dts.in
index 76f9109..9046fcb 100644
--- a/deployments/internal-trusted-storage/opteesp/default_internal-trusted-storage.dts.in
+++ b/deployments/internal-trusted-storage/opteesp/default_internal-trusted-storage.dts.in
@@ -15,6 +15,6 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 	legacy-elf-format = <1>;
 };
diff --git a/deployments/internal-trusted-storage/sp/default_internal-trusted-storage.dts.in b/deployments/internal-trusted-storage/sp/default_internal-trusted-storage.dts.in
index 65b4e30..3257dbf 100644
--- a/deployments/internal-trusted-storage/sp/default_internal-trusted-storage.dts.in
+++ b/deployments/internal-trusted-storage/sp/default_internal-trusted-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 
 	memory-regions {
 		compatible = "arm,ffa-manifest-memory-regions";
diff --git a/deployments/protected-storage/opteesp/default_protected-storage.dts.in b/deployments/protected-storage/opteesp/default_protected-storage.dts.in
index 9ea1f80..3285835 100644
--- a/deployments/protected-storage/opteesp/default_protected-storage.dts.in
+++ b/deployments/protected-storage/opteesp/default_protected-storage.dts.in
@@ -15,6 +15,6 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 	legacy-elf-format = <1>;
 };
diff --git a/deployments/protected-storage/sp/default_protected-storage.dts.in b/deployments/protected-storage/sp/default_protected-storage.dts.in
index 14353d4..2f36ee0 100644
--- a/deployments/protected-storage/sp/default_protected-storage.dts.in
+++ b/deployments/protected-storage/sp/default_protected-storage.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 
 	memory-regions {
 		compatible = "arm,ffa-manifest-memory-regions";
diff --git a/deployments/se-proxy/opteesp/default_se-proxy.dts.in b/deployments/se-proxy/opteesp/default_se-proxy.dts.in
index cdaba29..5748d2f 100644
--- a/deployments/se-proxy/opteesp/default_se-proxy.dts.in
+++ b/deployments/se-proxy/opteesp/default_se-proxy.dts.in
@@ -15,6 +15,6 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 	legacy-elf-format = <1>;
 };
diff --git a/deployments/se-proxy/sp/default_se-proxy.dts.in b/deployments/se-proxy/sp/default_se-proxy.dts.in
index 4fbd1ae..3c6b965 100644
--- a/deployments/se-proxy/sp/default_se-proxy.dts.in
+++ b/deployments/se-proxy/sp/default_se-proxy.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 
 	memory-regions {
 		compatible = "arm,ffa-manifest-memory-regions";
diff --git a/deployments/sfs-demo/opteesp/default_sfs-demo.dts.in b/deployments/sfs-demo/opteesp/default_sfs-demo.dts.in
index 7fbaa39..e8e6614 100644
--- a/deployments/sfs-demo/opteesp/default_sfs-demo.dts.in
+++ b/deployments/sfs-demo/opteesp/default_sfs-demo.dts.in
@@ -15,6 +15,6 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 	legacy-elf-format = <1>;
 };
diff --git a/deployments/sfs-demo/sp/default_sfs-demo.dts.in b/deployments/sfs-demo/sp/default_sfs-demo.dts.in
index 3777100..6919eab 100644
--- a/deployments/sfs-demo/sp/default_sfs-demo.dts.in
+++ b/deployments/sfs-demo/sp/default_sfs-demo.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 
 	memory-regions {
 		compatible = "arm,ffa-manifest-memory-regions";
diff --git a/deployments/smm-gateway/opteesp/default_smm-gateway.dts.in b/deployments/smm-gateway/opteesp/default_smm-gateway.dts.in
index bc75d50..6b5c6aa 100644
--- a/deployments/smm-gateway/opteesp/default_smm-gateway.dts.in
+++ b/deployments/smm-gateway/opteesp/default_smm-gateway.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 	legacy-elf-format = <1>;
 
 	memory-regions {
diff --git a/deployments/smm-gateway/sp/default_smm-gateway.dts.in b/deployments/smm-gateway/sp/default_smm-gateway.dts.in
index 6e91ef2..c7aff9f 100644
--- a/deployments/smm-gateway/sp/default_smm-gateway.dts.in
+++ b/deployments/smm-gateway/sp/default_smm-gateway.dts.in
@@ -15,7 +15,7 @@
 	exception-level = <1>; /* S-EL0 */
 	execution-state = <0>; /* AArch64 */
 	xlat-granule = <0>; /* 4KiB */
-	messaging-method = <0>; /* Direct messaging only */
+	messaging-method = <3>; /* Direct messaging only */
 
 	memory-regions {
 		compatible = "arm,ffa-manifest-memory-regions";