diff --git a/.gitignore b/.gitignore
index 58d5bab4002f88e59d9ffc3a291ab63b5bc5d676..a2a9259789749a1acfb54c37fe8b9ea4a8a6d1a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ junit.xml
 /app/static/files/*
 !/app/static/files/.empty
 .vscode
+.mypy_cache
diff --git a/Makefile b/Makefile
index 3daf9a4e38ad2c9fabc16ebdedbff91e7743dff1..9ed6d662d009c44315b57dc4bab90f2d8d7db65b 100644
--- a/Makefile
+++ b/Makefile
@@ -50,9 +50,9 @@ upgrade_db: ## upgrade the dev database
 test:  ## run the tests (on current directory)
 	docker-compose run --rm web pytest --cov=app -v
 
-db_image: ## start postgres and redis to test the latest image
-# Pass docker-compose.yml to skip docker-compose.override.yml
-	docker-compose -f docker-compose.yml up -d postgres redis
+db_test: ## start required containers for test
+# Pass docker-compose.yml to skip docker-compose.override.yml (db not mounted as volume for speed)
+	docker-compose -f docker-compose.yml up -d postgres redis elasticsearch worker
 
 test_image:  ## run the tests (on the latest image)
 # Pass docker-compose.yml to skip docker-compose.override.yml
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 7e98c78bb0f6d59ab0ed74ab9eea92e63dcfc54d..477c1c366c812cc53f9098d108225876e3e8fda7 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -12,8 +12,6 @@ services:
     command: flask run --host 0.0.0.0 --port 8000
     ports:
       - "8000:8000"
-    volumes:
-      - .:/app
   worker:
     environment:
       LOCAL_SETTINGS: /app/settings.cfg
diff --git a/docker-compose.yml b/docker-compose.yml
index c0fe71f94f6a6408aa53dfb664d7fe660bbb1998..302c81a44e5c4aeeae4d00a9b0dfd57966eab0dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,6 +8,8 @@ services:
       - postgres
       - redis
       - elasticsearch
+    volumes:
+      - .:/app
   worker:
     image: registry.esss.lu.se/ics-infrastructure/csentry:master
     container_name: csentry_worker