diff --git a/script/lava-templates/n1sdp-boot.yaml b/script/lava-templates/n1sdp-boot.yaml
new file mode 100644
index 0000000..cb5fb71
--- /dev/null
+++ b/script/lava-templates/n1sdp-boot.yaml
@@ -0,0 +1,51 @@
+device_type: n1sdp
+job_name: tf-n1sdp TF-A boot test
+timeouts:
+  job:
+    minutes: 15
+  action:
+    minutes: 10
+  connection:
+    minutes: 5
+
+priority: ${LAVA_PRIORITY:-medium}
+visibility: public
+actions:
+#
+# Any firmware bundle deployed must be configured to boot automatically without
+# intervention. This means "PMIC_FORCE" must be set "TRUE" in the config file
+# to be deployed.
+#
+
+#
+# Deploy the primary board firmware bundle
+#
+- deploy:
+    namespace: recovery
+    to: flasher
+    images:
+      recovery_image:
+        url: $recovery_img_url
+        compression: zip
+
+- boot:
+    namespace: recovery
+    timeout:
+        minutes: 2
+    method: minimal
+
+- boot:
+    namespace: uart_one
+    method: new_connection
+    connection: uart1
+
+- test:
+    namespace: uart_one
+    connection-namespace: uart_one
+    timeout:
+      minutes: 5
+    interactive:
+    - name: int_1
+      prompts: ["Press ESCAPE for boot options"]
+      script:
+      - command:
diff --git a/script/lava-templates/n1sdp-linux.yaml b/script/lava-templates/n1sdp-linux.yaml
index dab89c5..639bd71 100644
--- a/script/lava-templates/n1sdp-linux.yaml
+++ b/script/lava-templates/n1sdp-linux.yaml
@@ -24,7 +24,7 @@
     to: flasher
     images:
       recovery_image:
-        url: http://files.oss.arm.com/downloads/lava/health-checks/n1sdp/4/n1sdp-board-firmware-force-netboot.zip
+        url: "$tfa_downloads/n1sdp/n1sdp-board-firmware-force-netboot.zip"
         compression: zip
 
 - deploy:
@@ -32,12 +32,12 @@
     to: tftp
     os: debian
     kernel:
-      url: http://files.oss.arm.com/downloads/lava/health-checks/n1sdp/4/debian/linux
+      url: "$tfa_downloads/n1sdp/boot/linux"
       type: image
     ramdisk:
-      url: http://files.oss.arm.com/downloads/lava/health-checks/n1sdp/4/debian/ramdisk.img
+      url: "$tfa_downloads/n1sdp/boot/ramdisk.img"
     nfsrootfs:
-      url: http://files.oss.arm.com/downloads/lava/health-checks/n1sdp/4/debian/debian-buster-arm64-rootfs.tar.xz
+      url: "$tfa_downloads/n1sdp/boot/debian-buster-arm64-rootfs.tar.xz"
       compression: xz
 
 - boot: