diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_03.06.04.bb b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_03.06.04.bb
index 498275e..9c9d6c8 100644
--- a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_03.06.04.bb
+++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps-native_03.06.04.bb
@@ -1,27 +1,4 @@
-SUMMARY = "Image Generation and Programming Scripts for NPCM8XX (Arbel) devices"
-DESCRIPTION = "Image Generation and Programming Scripts for NPCM8XX (Arbel) devices"
-HOMEPAGE = "https://github.com/Nuvoton-Israel/igps-npcm8xx"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRC_URI = " \
-    git://github.com/Nuvoton-Israel/igps-npcm8xx;branch=main;protocol=https \
-    file://0001-Adjust-paths-for-use-with-Bitbake.patch \
-"
-
 # tag IGPS_03.06.04
 SRCREV = "6b056bb97a8f0e677d196afb6704372cae8bdd5b"
 
-S = "${WORKDIR}/git"
-
-DEST = "${D}${datadir}/${BPN}"
-
-do_install() {
-	install -d ${DEST}
-	install py_scripts/ImageGeneration/references/BootBlockAndHeader_${DEVICE_GEN}_${IGPS_MACHINE}.xml ${DEST}
-	install py_scripts/ImageGeneration/references/UbootHeader_${DEVICE_GEN}.xml ${DEST}
-	install py_scripts/ImageGeneration/inputs/BL31_AndHeader.xml ${DEST}
-	install py_scripts/ImageGeneration/inputs/OpTeeAndHeader.xml ${DEST}
-}
-
-inherit native
+require npcm8xx-igps.inc
diff --git a/meta-nuvoton/recipes-bsp/images/npcm8xx-igps.inc b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps.inc
new file mode 100644
index 0000000..c4202e4
--- /dev/null
+++ b/meta-nuvoton/recipes-bsp/images/npcm8xx-igps.inc
@@ -0,0 +1,25 @@
+SUMMARY = "Image Generation and Programming Scripts for NPCM8XX (Arbel) devices"
+DESCRIPTION = "Image Generation and Programming Scripts for NPCM8XX (Arbel) devices"
+HOMEPAGE = "https://github.com/Nuvoton-Israel/igps-npcm8xx"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+IGPS_BRANCH ?= "main"
+SRC_URI = " \
+    git://github.com/Nuvoton-Israel/igps-npcm8xx;branch=${IGPS_BRANCH};protocol=https \
+    file://0001-Adjust-paths-for-use-with-Bitbake.patch \
+"
+
+S = "${WORKDIR}/git"
+
+DEST = "${D}${datadir}/${BPN}"
+
+do_install() {
+	install -d ${DEST}
+	install py_scripts/ImageGeneration/references/BootBlockAndHeader_${DEVICE_GEN}_${IGPS_MACHINE}.xml ${DEST}
+	install py_scripts/ImageGeneration/references/UbootHeader_${DEVICE_GEN}.xml ${DEST}
+	install py_scripts/ImageGeneration/inputs/BL31_AndHeader.xml ${DEST}
+	install py_scripts/ImageGeneration/inputs/OpTeeAndHeader.xml ${DEST}
+}
+
+inherit native