diff --git a/group/scp-boot-tests/n1sdp,n1sdp-tbb:n1sdp-linux-fip-firmware b/group/scp-boot-tests/n1sdp,n1sdp-tbb:n1sdp-linux-fip-firmware
new file mode 100644
index 0000000..35f8713
--- /dev/null
+++ b/group/scp-boot-tests/n1sdp,n1sdp-tbb:n1sdp-linux-fip-firmware
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2022 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/group/tf-l3-boot-tests-n1sdp/n1sdp-tbb:n1sdp-linux-fip-firmware-debug b/group/tf-l3-boot-tests-n1sdp/n1sdp-tbb:n1sdp-linux-fip-firmware-debug
new file mode 100644
index 0000000..35f8713
--- /dev/null
+++ b/group/tf-l3-boot-tests-n1sdp/n1sdp-tbb:n1sdp-linux-fip-firmware-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2022 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/n1sdp_utils.sh b/n1sdp_utils.sh
index 179a86a..0f88c21 100644
--- a/n1sdp_utils.sh
+++ b/n1sdp_utils.sh
@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2021 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
 source "$ci_root/fvp_utils.sh"
 
-n1sdp_prebuilts=${n1sdp_prebuilts:="$tfa_downloads/css/n1sdp"}
-scp_mcp_prebuilts=${scp_mcp_prebuilts:="$scp_mcp_downloads/n1sdp/release"}
+n1sdp_release="N1SDP-2022.06.22"
+n1sdp_prebuilts=${n1sdp_prebuilts:="$tfa_downloads/css/n1sdp/$n1sdp_release"}
+scp_mcp_prebuilts=${scp_mcp_prebuilts:="$n1sdp_prebuilts"}
 
 get_n1sdp_firmware() {
         url=$n1sdp_firmware_bin_url saveas="n1sdp-board-firmware.zip" fetch_file
@@ -27,6 +28,7 @@
         cp -Rp --no-preserve=ownership "$archive/mcp_rom.bin" "$zip_dir/SOFTWARE"
         cp -Rp --no-preserve=ownership "$archive/scp_fw.bin" "$zip_dir/SOFTWARE"
         cp -Rp --no-preserve=ownership "$archive/scp_rom.bin" "$zip_dir/SOFTWARE"
+        cp -Rp --no-preserve=ownership "$archive/fip.bin" "$zip_dir/SOFTWARE"
 
         (cd "$zip_dir" && zip -rq "$zip_file" -- *)
 
diff --git a/run_config/n1sdp-fip b/run_config/n1sdp-fip
index a91b740..724f3c4 100644
--- a/run_config/n1sdp-fip
+++ b/run_config/n1sdp-fip
@@ -8,27 +8,34 @@
 post_tf_build() {
         #Fetch pre-built SCP/MCP binaries if they haven't been built
         if [ ! -f "$archive/mcp_rom.bin" ]; then
-                url="$scp_mcp_prebuilts/n1sdp-mcp-bl1.bin" saveas="mcp_rom.bin" fetch_file
+                url="$scp_mcp_prebuilts/mcp_romfw.bin" saveas="mcp_rom.bin" fetch_file
                 archive_file "mcp_rom.bin"
         fi
         if [ ! -f "$archive/scp_rom.bin" ]; then
-                url="$scp_mcp_prebuilts/n1sdp-bl1.bin" saveas="scp_rom.bin" fetch_file
+                url="$scp_mcp_prebuilts/scp_romfw.bin" saveas="scp_rom.bin" fetch_file
                 archive_file "scp_rom.bin"
         fi
         if [ ! -f "$archive/scp_ram.bin" ]; then
-                url="$scp_mcp_prebuilts/n1sdp-bl2.bin" saveas="scp_ram.bin" fetch_file
+                url="$scp_mcp_prebuilts/scp_ramfw.bin" saveas="scp_ram.bin" fetch_file
                 archive_file "scp_ram.bin"
         fi
         if [ ! -f "$archive/mcp_ram.bin" ]; then
-                url="$scp_mcp_prebuilts/n1sdp-mcp-bl2.bin" saveas="mcp_ram.bin" fetch_file
+                url="$scp_mcp_prebuilts/mcp_ramfw.bin" saveas="mcp_ram.bin" fetch_file
                 archive_file "mcp_ram.bin"
         fi
 
         # Create FIP for SCP
-        "$fiptool" create --soc-fw "$tf_root/build/n1sdp/$bin_mode/bl31.bin" --scp-fw "$archive/scp_ram.bin" "scp_fw.bin"
+        "$fiptool" create --blob uuid=cfacc2c4-15e8-4668-82be-430a38fad705,file="$tf_root/build/n1sdp/$bin_mode/bl1.bin" --scp-fw "$archive/scp_ram.bin" "scp_fw.bin"
         archive_file "scp_fw.bin"
 
         # Create FIP for MCP, this needs fixed uuid for now
         "$fiptool" create --blob uuid=54464222-a4cf-4bf8-b1b6-cee7dade539e,file="$archive/mcp_ram.bin" "mcp_fw.bin"
         archive_file "mcp_fw.bin"
+
+        # Fetch BL33 [uefi.bin] for N1SDP
+        uefi_ci_bin_url="$n1sdp_prebuilts/uefi.bin" get_uefi_bin
+
+        # Create FIP for BL2, BL31, and BL33
+        build_fip BL31="$bl31" BL2="$bl2" BL33="$archive/uefi.bin"
+
 }
diff --git a/script/gen_n1sdp_linux_yaml.sh b/script/gen_n1sdp_linux_yaml.sh
index e5d8602..36c7f0d 100755
--- a/script/gen_n1sdp_linux_yaml.sh
+++ b/script/gen_n1sdp_linux_yaml.sh
@@ -112,7 +112,7 @@
             steps:
               - apt -q update
               - apt -q install -y iputils-ping
-              - ping -c 5 10.6.43.131 || lava-test-raise "Device failed to reach a remote host"
+              - ping -c 5 www.arm.com || lava-test-raise "Device failed to reach a remote host"
               - hostname -I
         from: inline
         name: device-network
@@ -149,7 +149,7 @@
     os: busybox
     images:
       image:
-        url: http://files.oss.arm.com/downloads/tf-a/css/n1sdp/busybox.img
+        url: "$n1sdp_prebuilts/busybox.img"
     uniquify: false
     device: usb_storage_device
     download:
diff --git a/script/trusted-firmware.nomination.py b/script/trusted-firmware.nomination.py
index 399c174..d0ec37e 100644
--- a/script/trusted-firmware.nomination.py
+++ b/script/trusted-firmware.nomination.py
@@ -34,7 +34,8 @@
 
          # Run Coverity MISRA checks and boot test for n1sdp platform changes
         "path:plat/arm/board/n1sdp":
-            ["tf-l2-coverity-misra-nominated/n1sdp-tbb:coverity-tf-misra.diff"],
+            ["tf-l2-coverity-misra-nominated/n1sdp-tbb:coverity-tf-misra.diff",
+             "tf-l3-boot-tests-n1sdp/n1sdp-tbb:n1sdp-linux-fip-firmware-debug"],
 
         # Run Coverity MISRA checks for arm_fpga platform changes
         "path:plat/arm/board/arm_fpga":