diff --git a/script/gen_fvp_linux_yaml.sh b/script/gen_fvp_linux_yaml.sh
index 7d4c1cf..f7cf188 100755
--- a/script/gen_fvp_linux_yaml.sh
+++ b/script/gen_fvp_linux_yaml.sh
@@ -48,6 +48,7 @@
 
 - boot:
     method: fvp
+    license_variable: ARMLMD_LICENSE_FILE=\${ARMLMD_LICENSE_FILE}
     docker:
       name: \${BOOT_DOCKER_NAME}
       local: true
diff --git a/script/gen_fvp_tftf_yaml.sh b/script/gen_fvp_tftf_yaml.sh
index 0c5693e..46563f9 100755
--- a/script/gen_fvp_tftf_yaml.sh
+++ b/script/gen_fvp_tftf_yaml.sh
@@ -46,6 +46,7 @@
 
 - boot:
     method: fvp
+    license_variable: ARMLMD_LICENSE_FILE=\${ARMLMD_LICENSE_FILE}
     docker:
       name: \${BOOT_DOCKER_NAME}
       local: true
diff --git a/script/gen_juno_linux_reboot_yaml.sh b/script/gen_juno_linux_reboot_yaml.sh
index 9690406..324f7f1 100755
--- a/script/gen_juno_linux_reboot_yaml.sh
+++ b/script/gen_juno_linux_reboot_yaml.sh
@@ -29,7 +29,7 @@
 
 bootloader_prompt="${bootloader_prompt:-juno#}"
 recovery_img_url="${recovery_img_url:-$(get_recovery_image_url)}"
-nfs_rootfs="${nfs_rootfs:-$juno_rootfs_url}"
+nfs_rootfs="${juno_rootfs_url:-$nfs_rootfs}"
 linux_prompt="${linux_prompt:-root@(.*):~#}"
 os="${os:-debian}"