diff --git a/dependency-check-gradle/src/main/groovy/com/tools/security/tasks/DependencyCheckTask.groovy b/dependency-check-gradle/src/main/groovy/com/tools/security/tasks/DependencyCheckTask.groovy
index 9eb32791a..c76f1ab92 100644
--- a/dependency-check-gradle/src/main/groovy/com/tools/security/tasks/DependencyCheckTask.groovy
+++ b/dependency-check-gradle/src/main/groovy/com/tools/security/tasks/DependencyCheckTask.groovy
@@ -61,6 +61,8 @@ class DependencyCheckTask extends DefaultTask {
         analyzeDependencies(engine)
         retrieveVulnerabilities(engine)
         generateReport(engine)
+
+        cleanup(engine)
     }
 
     private Engine initializeEngine() {
@@ -73,6 +75,11 @@ class DependencyCheckTask extends DefaultTask {
         overrideCveUrlSetting()
     }
 
+    def cleanup(engine) {
+        Settings.cleanup(true)
+        engine.cleanup();
+    }
+
     def verifyDependencies(engine) {
         logger.lifecycle("Verifying dependencies for project ${currentProjectName}")
         getAllDependencies(project).each { engine.scan(it) }
@@ -94,7 +101,7 @@ class DependencyCheckTask extends DefaultTask {
     def generateReport(Engine engine) {
         logger.lifecycle("Generating report for project ${currentProjectName}")
         def reportGenerator = new ReportGenerator(currentProjectName, engine.dependencies, engine.analyzers,
-                new CveDB().databaseProperties)
+            new CveDB().databaseProperties)
 
         reportGenerator.generateReports(generateReportDirectory(currentProjectName), ReportGenerator.Format.ALL)
     }