diff --git a/script/lava-templates/fvp-linux.yaml b/script/lava-templates/fvp-linux.yaml
index 597354b..1bbda15 100644
--- a/script/lava-templates/fvp-linux.yaml
+++ b/script/lava-templates/fvp-linux.yaml
@@ -60,7 +60,9 @@
 
 - boot:
     method: fvp
-    license_variable: ARMLMD_LICENSE_FILE=${armlmd_license_file}
+# license_variable is required only for FlexNet licensing. As we're switching
+# to UBL-only config, comment it, to be removed as the next stage.
+#    license_variable: ARMLMD_LICENSE_FILE=${armlmd_license_file}
     docker:
       name: ${docker_name}
       local: true
diff --git a/script/lava-templates/fvp-tftf.yaml b/script/lava-templates/fvp-tftf.yaml
index 82287f6..dc98a28 100644
--- a/script/lava-templates/fvp-tftf.yaml
+++ b/script/lava-templates/fvp-tftf.yaml
@@ -73,7 +73,9 @@
 
 - boot:
     method: fvp
-    license_variable: ARMLMD_LICENSE_FILE=${armlmd_license_file}
+# license_variable is required only for FlexNet licensing. As we're switching
+# to UBL-only config, comment it, to be removed as the next stage.
+#    license_variable: ARMLMD_LICENSE_FILE=${armlmd_license_file}
     docker:
       name: ${docker_name}
       local: true