diff --git a/.github/workflows/archive-raw.yml b/.github/workflows/archive-raw.yml
index 011a4163..456ab0fb 100644
--- a/.github/workflows/archive-raw.yml
+++ b/.github/workflows/archive-raw.yml
@@ -63,6 +63,7 @@ jobs:
           - "exploit-trickest"
           - "fedora-api"
           - "fedora-updateinfo"
+          - "fortinet"
           - "fortinet-csaf"
           - "fortinet-cvrf"
           - "freebsd"
diff --git a/.github/workflows/backup-daily.yml b/.github/workflows/backup-daily.yml
index 705fb445..b9515de2 100644
--- a/.github/workflows/backup-daily.yml
+++ b/.github/workflows/backup-daily.yml
@@ -33,6 +33,8 @@ jobs:
           - vuls-data-extracted-exploit-inthewild
           - vuls-data-extracted-exploit-trickest
           - vuls-data-extracted-fedora-api
+          - vuls-data-extracted-fortinet-csaf
+          - vuls-data-extracted-fortinet-cvrf
           - vuls-data-extracted-freebsd
           - vuls-data-extracted-jvn-feed-detail
           - vuls-data-extracted-jvn-feed-rss
diff --git a/.github/workflows/backup-monthly.yml b/.github/workflows/backup-monthly.yml
index 355c4aed..cdcb43c6 100644
--- a/.github/workflows/backup-monthly.yml
+++ b/.github/workflows/backup-monthly.yml
@@ -33,6 +33,8 @@ jobs:
           - vuls-data-extracted-exploit-inthewild
           - vuls-data-extracted-exploit-trickest
           - vuls-data-extracted-fedora-api
+          - vuls-data-extracted-fortinet-csaf
+          - vuls-data-extracted-fortinet-cvrf
           - vuls-data-extracted-freebsd
           - vuls-data-extracted-jvn-feed-detail
           - vuls-data-extracted-jvn-feed-rss
diff --git a/.github/workflows/backup-weekly.yml b/.github/workflows/backup-weekly.yml
index 86f3bd11..d43bfe52 100644
--- a/.github/workflows/backup-weekly.yml
+++ b/.github/workflows/backup-weekly.yml
@@ -33,6 +33,8 @@ jobs:
           - vuls-data-extracted-exploit-inthewild
           - vuls-data-extracted-exploit-trickest
           - vuls-data-extracted-fedora-api
+          - vuls-data-extracted-fortinet-csaf
+          - vuls-data-extracted-fortinet-cvrf
           - vuls-data-extracted-freebsd
           - vuls-data-extracted-jvn-feed-detail
           - vuls-data-extracted-jvn-feed-rss
diff --git a/.github/workflows/extract-all.yml b/.github/workflows/extract-all.yml
index e8e2b2fa..397491c1 100644
--- a/.github/workflows/extract-all.yml
+++ b/.github/workflows/extract-all.yml
@@ -58,8 +58,8 @@ jobs:
           - "fedora-api"
           # - "fedora-updateinfo"
           # - "fortinet-handmade"
-          # - "fortinet-csaf"
-          # - "fortinet-cvrf"
+          - "fortinet-csaf"
+          - "fortinet-cvrf"
           - "freebsd"
           # - "gentoo"
           # - "ghactions-osv"
@@ -194,8 +194,8 @@ jobs:
           - "fedora-api"
           # - "fedora-updateinfo"
           # - "fortinet-handmade"
-          # - "fortinet-csaf"
-          # - "fortinet-cvrf"
+          - "fortinet-csaf"
+          - "fortinet-cvrf"
           - "freebsd"
           # - "gentoo"
           # - "ghactions-osv"
diff --git a/.github/workflows/extract-main.yml b/.github/workflows/extract-main.yml
index 76507897..e26b41d4 100644
--- a/.github/workflows/extract-main.yml
+++ b/.github/workflows/extract-main.yml
@@ -51,8 +51,8 @@ on:
           - fedora-api
           # - fedora-updateinfo
           # - fortinet-handmade
-          # - fortinet-csaf
-          # - fortinet-cvrf
+          - fortinet-csaf
+          - fortinet-cvrf
           - freebsd
           # - gentoo
           # - ghactions-osv
diff --git a/.github/workflows/gc-extracted.yml b/.github/workflows/gc-extracted.yml
index b017b4f9..fe7a22c8 100644
--- a/.github/workflows/gc-extracted.yml
+++ b/.github/workflows/gc-extracted.yml
@@ -70,6 +70,12 @@ jobs:
           - tag: vuls-data-extracted-fedora-api
             pack-threads: 2
             pack-windowMemory: 4g
+          - tag: vuls-data-extracted-fortinet-csaf
+            pack-threads: 2
+            pack-windowMemory: 4g
+          - tag: vuls-data-extracted-fortinet-cvrf
+            pack-threads: 2
+            pack-windowMemory: 4g
           - tag: vuls-data-extracted-freebsd
             pack-threads: 2
             pack-windowMemory: 4g
diff --git a/.github/workflows/gc.yml b/.github/workflows/gc.yml
index eabd1d05..44a6b15b 100644
--- a/.github/workflows/gc.yml
+++ b/.github/workflows/gc.yml
@@ -45,6 +45,8 @@ on:
           - vuls-data-extracted-enisa-kev
           - vuls-data-extracted-epss
           - vuls-data-extracted-fedora-api
+          - vuls-data-extracted-fortinet-csaf
+          - vuls-data-extracted-fortinet-cvrf
           - vuls-data-extracted-freebsd
           - vuls-data-extracted-jvn-feed-detail
           - vuls-data-extracted-jvn-feed-rss
diff --git a/.github/workflows/restore-all.yml b/.github/workflows/restore-all.yml
index 6f6e76e0..3cad890c 100644
--- a/.github/workflows/restore-all.yml
+++ b/.github/workflows/restore-all.yml
@@ -41,6 +41,8 @@ jobs:
           - vuls-data-extracted-exploit-inthewild
           - vuls-data-extracted-exploit-trickest
           - vuls-data-extracted-fedora-api
+          - vuls-data-extracted-fortinet-csaf
+          - vuls-data-extracted-fortinet-cvrf
           - vuls-data-extracted-freebsd
           - vuls-data-extracted-jvn-feed-detail
           - vuls-data-extracted-jvn-feed-rss
diff --git a/.github/workflows/truncate-extracted.yml b/.github/workflows/truncate-extracted.yml
index b0bbe75f..18b00b2a 100644
--- a/.github/workflows/truncate-extracted.yml
+++ b/.github/workflows/truncate-extracted.yml
@@ -34,6 +34,8 @@ jobs:
           - exploit-inthewild
           - exploit-trickest
           - fedora-api
+          - fortinet-csaf
+          - fortinet-cvrf
           - freebsd
           - jvn-feed-detail
           - jvn-feed-rss
diff --git a/.github/workflows/truncate.yml b/.github/workflows/truncate.yml
index 151dc221..4918196c 100644
--- a/.github/workflows/truncate.yml
+++ b/.github/workflows/truncate.yml
@@ -33,6 +33,8 @@ on:
           - vuls-data-extracted-enisa-kev
           - vuls-data-extracted-epss
           - vuls-data-extracted-fedora-api
+          - vuls-data-extracted-fortinet-csaf
+          - vuls-data-extracted-fortinet-cvrf
           - vuls-data-extracted-freebsd
           - vuls-data-extracted-jvn-feed-detail
           - vuls-data-extracted-jvn-feed-rss
diff --git a/db-main.mk b/db-main.mk
index ed75c3d9..b39ebf98 100644
--- a/db-main.mk
+++ b/db-main.mk
@@ -23,6 +23,8 @@ db-build:
 	$(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-exploit-inthewild BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
 	$(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-exploit-trickest BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
 	$(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-fedora-api BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
+	# $(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-fortinet-csaf BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
+	# $(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-fortinet-cvrf BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
 	# $(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-jvn-feed-rss BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
 	$(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-microsoft-bulletin BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
 	$(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-microsoft-cvrf BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
diff --git a/db-nightly.mk b/db-nightly.mk
index b6402cc6..123f8f5b 100644
--- a/db-nightly.mk
+++ b/db-nightly.mk
@@ -23,6 +23,8 @@ db-build:
 	$(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-exploit-inthewild BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
 	$(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-exploit-trickest BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
 	$(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-fedora-api BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
+	$(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-fortinet-csaf BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
+	$(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-fortinet-cvrf BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
 	$(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-jvn-feed-rss BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
 	$(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-microsoft-bulletin BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}
 	$(MAKE) -f ${MAKEFILE} db-add REPO=vuls-data-extracted-microsoft-cvrf BRANCH=${BRANCH} DBTYPE=${DBTYPE} DBPATH=${DBPATH}