diff --git a/docker-compose.yml b/docker-compose.yml
index 9670156..a3c1499 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,8 +17,8 @@ services:
         source: $HOME/logs
         target: /logs
       - type: bind
-        source: /mnt/bulkImport
-        target: /mnt/bulkImport
+        source: /mnt/bulk_import
+        target: /mnt/bulk_import
       - type: bind
         source: $HOME/bulkImportReports
         target: /bulkImportReports
diff --git a/src/main/java/eu/openaire/urls_controller/Application.java b/src/main/java/eu/openaire/urls_controller/Application.java
index 59a029f..5fc82bd 100644
--- a/src/main/java/eu/openaire/urls_controller/Application.java
+++ b/src/main/java/eu/openaire/urls_controller/Application.java
@@ -63,7 +63,7 @@ public class Application {
     {
         executorService.shutdown();	// Define that no new tasks will be scheduled.
         try {
-            if ( ! executorService.awaitTermination(1, TimeUnit.MINUTES) ) {
+            if ( ! executorService.awaitTermination(2, TimeUnit.MINUTES) ) {
                 logger.warn("The working threads did not finish on time! Stopping them immediately..");
                 executorService.shutdownNow();
             }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bfb66e3..6920bfa 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -31,7 +31,7 @@ services:
 
 
 bulkImport:
-    baseBulkImportLocation: /mnt/bulkImport/
+    baseBulkImportLocation: /mnt/bulk_import/
     bulkImportReportLocation: /bulkImportReports/
     bulkImportSources:  # These sources are accepted for bulk-import requests and are excluded from crawling.
         arxivImport: