diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.3.4.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.3.4.bb
deleted file mode 100644
index 6ed7cbb..0000000
--- a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.3.4.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-SRCREV = "3c8eb05241ea16199d861f8cfbf2d2eca1bb48b2"
-
-require npcm8xx-bootblock.inc
diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.3.5.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.3.5.bb
new file mode 100644
index 0000000..30c12c0
--- /dev/null
+++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-bootblock_0.3.5.bb
@@ -0,0 +1,3 @@
+SRCREV = "bc1b9c304490e54553f2d449fa2e9950a6f9e4ae"
+
+require npcm8xx-bootblock.inc
diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_03.09.01.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_03.09.01.bb
deleted file mode 100644
index 84a49d8..0000000
--- a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_03.09.01.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-# tag IGPS_03.09.01
-SRCREV = "2053299fad5ab24e6df054c304d13f877bee67b6"
-
-require npcm8xx-igps.inc
diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_03.09.02.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_03.09.02.bb
new file mode 100644
index 0000000..1edeec7
--- /dev/null
+++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_03.09.02.bb
@@ -0,0 +1,4 @@
+# tag IGPS_03.09.02
+SRCREV = "c087fcc14a67ae912a51d6fd90c3daa27560d8bc"
+
+require npcm8xx-igps.inc
diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.6.0.0.4.9.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.6.1.0.5.0.bb
similarity index 63%
rename from meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.6.0.0.4.9.bb
rename to meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.6.1.0.5.0.bb
index e7fadfd..dc2299e 100644
--- a/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.6.0.0.4.9.bb
+++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-tip-fw_0.6.1.0.5.0.bb
@@ -1,4 +1,4 @@
-SRCREV = "26d7677ddf1068f697e570f45bae7f51041cb2f1"
+SRCREV = "49c4ddb7feed3653dde1c77e235e41e42c3e73e5"
 
 OUTPUT_BIN = "output_binaries_${DEVICE_GEN}_${IGPS_MACHINE}"