diff --git a/fvp_utils.sh b/fvp_utils.sh
index 9fc4e68..5365d3d 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -243,6 +243,8 @@
 	popd
 }
 
+fvp_romlib_jmptbl_backup="$(mktempdir)/jmptbl.i"
+
 fvp_romlib_runtime() {
 	local tmpdir="$(mktempdir)"
 
@@ -251,32 +253,24 @@
 	mv "${tf_build_root:?}/${plat:?}/${mode:?}/bl1.bin" "$tmpdir/bl1.bin"
 
 	# Patch index file
-	(
-		fvp_romlib_jmptbl="${tf_root:?}/plat/arm/board/fvp/jmptbl.i"
-		fvp_romlib_jmptbl_backup="$(mktempdir)/jmptbl.i"
+	cp "${tf_root:?}/plat/arm/board/fvp/jmptbl.i" "$fvp_romlib_jmptbl_backup"
+	sed -i '/fdt/ s/.$/&\ patch/' ${tf_root:?}/plat/arm/board/fvp/jmptbl.i
 
-		function __restore() {
-			mv "$fvp_romlib_jmptbl_backup" "$fvp_romlib_jmptbl";
-		}
-
-		# Make sure the original index file is restored.
-		# This will be done either when the current sub-shell exits or
-		# when one of the sub-shell's commands fails.
-		trap __restore EXIT HUP QUIT INT TERM
-
-		cp "$fvp_romlib_jmptbl" "$fvp_romlib_jmptbl_backup"
-		sed -i '/fdt/ s/.$/&\ patch/' "$fvp_romlib_jmptbl"
-
-		# Rebuild with patched file
-		echo "Building patched romlib:"
-		build_tf
-	)
+	# Rebuild with patched file
+	echo "Building patched romlib:"
+	build_tf
 
 	# Retrieve original BL1 and romlib binaries
 	mv "$tmpdir/romlib.bin" "${tf_build_root:?}/${plat:?}/${mode:?}/romlib/romlib.bin"
 	mv "$tmpdir/bl1.bin" "${tf_build_root:?}/${plat:?}/${mode:?}/bl1.bin"
 }
 
+fvp_romlib_cleanup() {
+	# Restore original index
+	mv "$fvp_romlib_jmptbl_backup" "${tf_root:?}/plat/arm/board/fvp/jmptbl.i"
+}
+
+
 fvp_gen_bin_url() {
     local bin_mode="${bin_mode:?}"
     local bin="${1:?}"
diff --git a/run_config/fvp-romlib b/run_config/fvp-romlib
index b58a512..6ae4bd4 100644
--- a/run_config/fvp-romlib
+++ b/run_config/fvp-romlib
@@ -8,3 +8,7 @@
 post_tf_build() {
 	fvp_romlib_runtime
 }
+
+post_tf_archive() {
+	fvp_romlib_cleanup
+}
diff --git a/run_config/fvp-spm+romlib b/run_config/fvp-spm+romlib
index c6a8394..22a62f6 100644
--- a/run_config/fvp-spm+romlib
+++ b/run_config/fvp-spm+romlib
@@ -36,3 +36,7 @@
 
 	model="$model" gen_fvp_yaml
 }
+
+post_tf_archive() {
+	fvp_romlib_cleanup
+}