diff --git a/BUILD.gn b/BUILD.gn
index b3ef9d7..2ccd771 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -100,7 +100,7 @@
   max_cpus = 16
   max_vms = 16
   toolchain_args = {
-    plat_ffa = "//src/arch/aarch64/plat/ffa:spmc"
+    ffa_role = "//src/ffa:spmc"
     plat_psci = "//src/arch/aarch64/plat/psci:spmc"
     plat_interrupts = "//src/arch/aarch64/plat/interrupts:gicv3"
     secure_world = "1"
@@ -126,7 +126,7 @@
   max_cpus = 8
   max_vms = 8
   toolchain_args = {
-    plat_ffa = "//src/arch/aarch64/plat/ffa:spmc"
+    ffa_role = "//src/ffa:spmc"
     plat_psci = "//src/arch/aarch64/plat/psci:spmc"
     plat_interrupts = "//src/arch/aarch64/plat/interrupts:gicv3"
     secure_world = "1"
@@ -154,7 +154,7 @@
   max_vms = 16
   branch_protection = "standard"
   toolchain_args = {
-    plat_ffa = "//src/arch/aarch64/plat/ffa:spmc"
+    ffa_role = "//src/ffa:spmc"
     plat_psci = "//src/arch/aarch64/plat/psci:spmc"
     plat_interrupts = "//src/arch/aarch64/plat/interrupts:gicv3"
     secure_world = "1"
@@ -184,7 +184,7 @@
   max_vms = 16
   branch_protection = "standard"
   toolchain_args = {
-    plat_ffa = "//src/arch/aarch64/plat/ffa:hypervisor"
+    ffa_role = "//src/ffa:hypervisor"
     pl011_base_address = "0x1c090000"
     smmu_base_address = "0x2b400000"
     smmu_memory_size = "0x100000"
@@ -207,7 +207,7 @@
   max_cpus = 8
   max_vms = 16
   toolchain_args = {
-    plat_ffa = "//src/arch/aarch64/plat/ffa:hypervisor"
+    ffa_role = "//src/ffa:hypervisor"
     pl011_base_address = "0x09000000"
     plat_log_level = "LOG_LEVEL_INFO"
   }
@@ -229,7 +229,7 @@
   max_vms = 16
   branch_protection = "standard"
   toolchain_args = {
-    plat_ffa = "//src/arch/aarch64/plat/ffa:spmc"
+    ffa_role = "//src/ffa:spmc"
     plat_psci = "//src/arch/aarch64/plat/psci:spmc"
     plat_interrupts = "//src/arch/aarch64/plat/interrupts:gicv3"
     secure_world = "1"
@@ -253,7 +253,7 @@
   max_cpus = 4
   max_vms = 16
   toolchain_args = {
-    plat_ffa = "//src/arch/aarch64/plat/ffa:hypervisor"
+    ffa_role = "//src/ffa:hypervisor"
     gpio_base_address = "0xfe200000"
     aux_base_address = "0xfe215000"
     core_freq_mhz = 500
@@ -282,7 +282,7 @@
   max_vms = 16
   branch_protection = "standard"
   toolchain_args = {
-    plat_ffa = "//src/arch/aarch64/plat/ffa:spmc"
+    ffa_role = "//src/ffa:spmc"
     plat_psci = "//src/arch/aarch64/plat/psci:spmc"
     plat_interrupts = "//src/arch/aarch64/plat/interrupts:gicv3"
     secure_world = "1"