diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 737bdf5..293ae57 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -31,9 +31,32 @@ jobs:
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-maven
 
+    - name: Restore CVD Database from Cache
+      uses: actions/cache/restore@v3
+      with:
+        path: |
+          ~/.m2/repository/org/owasp/dependency-check-data
+        key: ${{ runner.os }}-maven-owasp-cvedb
+
+    - name: Update CVD Database
+      env:
+        OWASP_OSS_INDEX_USERNAME: ${{ secrets.OWASP_OSS_INDEX_USERNAME }}
+        OWASP_OSS_INDEX_APIKEY: ${{ secrets.OWASP_OSS_INDEX_APIKEY }}
+        NIST_NVD_API_KEY: ${{ secrets.NIST_NVD_API_KEY }}
+      run: |
+        mvn -B -DnvdApiDelay=6000 --settings maven-ci-settings.xml org.owasp:dependency-check-maven:update-only
+
+    - name: Save CVD Database to Cache
+      uses: actions/cache/save@v3
+      with:
+        path: |
+          ~/.m2/repository/org/owasp/dependency-check-data
+        key: ${{ runner.os }}-maven-owasp-cvedb
+
     - name: Build with Maven
       env:
         OWASP_OSS_INDEX_USERNAME: ${{ secrets.OWASP_OSS_INDEX_USERNAME }}
         OWASP_OSS_INDEX_APIKEY: ${{ secrets.OWASP_OSS_INDEX_APIKEY }}
+        NIST_NVD_API_KEY: ${{ secrets.NIST_NVD_API_KEY }}
       run: mvn -B install --file pom.xml --settings maven-ci-settings.xml
 
diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
index 66c58a6..e4bef08 100644
--- a/.github/workflows/maven-deploy.yml
+++ b/.github/workflows/maven-deploy.yml
@@ -42,6 +42,28 @@ jobs:
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-maven
 
+    - name: Restore CVD Database from Cache
+      uses: actions/cache/restore@v3
+      with:
+        path: |
+          ~/.m2/repository/org/owasp/dependency-check-data
+        key: ${{ runner.os }}-maven-owasp-cvedb
+
+    - name: Update CVD Database
+      env:
+        OWASP_OSS_INDEX_USERNAME: ${{ secrets.OWASP_OSS_INDEX_USERNAME }}
+        OWASP_OSS_INDEX_APIKEY: ${{ secrets.OWASP_OSS_INDEX_APIKEY }}
+        NIST_NVD_API_KEY: ${{ secrets.NIST_NVD_API_KEY }}
+      run: |
+        mvn -B -DnvdApiDelay=6000 --settings maven-ci-settings.xml org.owasp:dependency-check-maven:update-only
+
+    - name: Save CVD Database to Cache
+      uses: actions/cache/save@v3
+      with:
+        path: |
+          ~/.m2/repository/org/owasp/dependency-check-data
+        key: ${{ runner.os }}-maven-owasp-cvedb
+
     - name: Build with Maven
       env:
         GPG_EXECUTABLE: gpg
@@ -50,5 +72,6 @@ jobs:
         SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
         OWASP_OSS_INDEX_USERNAME: ${{ secrets.OWASP_OSS_INDEX_USERNAME }}
         OWASP_OSS_INDEX_APIKEY: ${{ secrets.OWASP_OSS_INDEX_APIKEY }}
+        NIST_NVD_API_KEY: ${{ secrets.NIST_NVD_API_KEY }}
       run: mvn -B deploy -P release --settings maven-ci-settings.xml
 
diff --git a/maven-ci-settings.xml b/maven-ci-settings.xml
index 83de07a..d109122 100644
--- a/maven-ci-settings.xml
+++ b/maven-ci-settings.xml
@@ -12,6 +12,10 @@
 			<username>${env.OWASP_OSS_INDEX_USERNAME}</username>
 			<password>${env.OWASP_OSS_INDEX_APIKEY}</password>
 		</server>
+		<server>
+			<id>NIST_NVD_API</id>
+			<password>${env.NIST_NVD_API_KEY}</password>
+		</server>
 	</servers>
 	<profiles>
 		<profile>
diff --git a/pom.xml b/pom.xml
index 181fec1..e4ff1e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,6 +122,7 @@
 				<configuration>
 					<failBuildOnCVSS>8</failBuildOnCVSS>
 					<ossIndexServerId>OWASP_OSS_INDEX</ossIndexServerId>
+                    <nvdApiServerId>NIST_NVD_API</nvdApiServerId>
 				</configuration>
 				<executions>
 					<execution>