diff --git a/docker-compose.yml b/docker-compose.yml
index 65ce09d..0a1c83d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,173 +1,188 @@
 version: '2'
 
 services:
 
   amqp:
     image: rabbitmq:3.6-management
     ports:
       - 5018:15672
 
 # Scheduler
 
   swh-scheduler-db:
     image: postgres:10
     environment:
       POSTGRES_PASSWORD: testpassword
       POSTGRES_DB: swh-scheduler
 
   swh-scheduler-api:
     image: swh/scheduler-api
     build: ./dockerfiles/swh-scheduler-api
     env_file: ./scheduler.env
     depends_on:
       - swh-scheduler-db
     ports:
       - 5008:5008
 
   swh-scheduler-listener:
     image: swh/scheduler-worker
     build: ./dockerfiles/swh-scheduler-worker
     env_file: ./scheduler.env
     command: listener
     depends_on:
       - swh-scheduler-api
       - amqp
 
   swh-scheduler-runner:
     image: swh/scheduler-worker
     build: ./dockerfiles/swh-scheduler-worker
     env_file: ./scheduler.env
     command: runner
     depends_on:
       - swh-scheduler-api
       - amqp
 
 # Graph storage
 
   swh-storage-db:
     image: postgres:10
     environment:
       POSTGRES_PASSWORD: testpassword
       POSTGRES_DB: swh-storage
 
   swh-storage:
     build: ./dockerfiles/swh-storage
     image: swh/storage
     ports:
       - 5002:5002
     depends_on:
       - swh-storage-db
       - swh-objstorage
     environment:
       POSTGRES_PASSWORD: testpassword
       POSTGRES_DB: swh-storage
       PGHOST: swh-storage-db
       PGUSER: postgres
 
 # Object storage
 
   swh-objstorage:
     build: ./dockerfiles/swh-objstorage
     image: swh/objstorage
     ports:
       - 5003:5003
 
 # Indexer storage
 
   swh-idx-storage-db:
     image: postgres:10
     environment:
       POSTGRES_PASSWORD: testpassword
       POSTGRES_DB: swh-idx-storage
 
   swh-idx-storage:
     build: ./dockerfiles/swh-indexer-storage
     image: swh/indexer-storage
     ports:
     - 5007:5007
     depends_on:
       - swh-idx-storage-db
     environment:
       POSTGRES_PASSWORD: testpassword
       POSTGRES_DB: swh-idx-storage
       PGHOST: swh-idx-storage-db
       PGUSER: postgres
 
 # Web interface
 
   swh-web:
     build: ./dockerfiles/swh-web
     image: swh/web
     ports:
       - 5004:5004
     depends_on:
       - swh-objstorage
       - swh-storage
       - swh-idx-storage
 
 # Lister Celery workers
 
   swh-listers-db:
     image: postgres:10
     environment:
       POSTGRES_PASSWORD: testpassword
 
   swh-lister-debian:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
     env_file: ./listers.env
     environment:
       SWH_WORKER_INSTANCE: debian
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-storage
       - amqp
 
   swh-lister-github:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
     env_file: ./listers.env
     environment:
       SWH_WORKER_INSTANCE: github
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-storage
       - amqp
 
   swh-lister-gitlab:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
     env_file: ./listers.env
     environment:
       SWH_WORKER_INSTANCE: gitlab
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-storage
       - amqp
 
   swh-lister-npm:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
     env_file: ./listers.env
     environment:
       SWH_WORKER_INSTANCE: npm
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-storage
       - amqp
 
   swh-lister-pypi:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
     env_file: ./listers.env
     environment:
       SWH_WORKER_INSTANCE: pypi
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-storage
       - amqp
+
+# Indexer Celery workers
+
+  swh-indexer-mimetype:
+    image: swh/indexer-worker
+    build: ./dockerfiles/swh-indexer-worker
+    env_file: ./indexers.env
+    environment:
+      SWH_WORKER_INSTANCE: mimetype
+    depends_on:
+      - swh-scheduler-api
+      - swh-idx-storage
+      - swh-storage
+      - swh-objstorage
+      - amqp
diff --git a/dockerfiles/swh-indexer-worker/entrypoint.sh b/dockerfiles/swh-indexer-worker/entrypoint.sh
new file mode 100755
index 0000000..2ebe8b8
--- /dev/null
+++ b/dockerfiles/swh-indexer-worker/entrypoint.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+
+if [[ -d /src ]] ; then
+    for srcrepo in /src/swh-* ; do
+        pushd $srcrepo
+        pip install -e .
+        popd
+    done
+fi
+
+mkdir -p ~/.config/swh/worker
+
+cat > ~/.config/swh/worker/${SWH_WORKER_INSTANCE}.ini <<EOF
+[main]
+task_broker = amqp://guest@amqp//
+task_modules = swh.indexer.tasks
+task_queues = swh_indexer_${SWH_WORKER_INSTANCE}
+task_soft_time_limit = 0
+EOF
+
+case "$1" in
+    "shell")
+        exec bash -i
+        ;;
+    *)
+
+        echo Starting swh-indexer worker
+        exec python -m celery worker --app=swh.scheduler.celery_backend.config.app --pool=prefork --events --concurrency=${CONCURRENCY} --maxtasksperchild=${MAX_TASKS_PER_CHILD} -Ofair --loglevel=${LOGLEVEL} --without-gossip --without-mingle --without-heartbeat -n ${SWH_WORKER_INSTANCE}.${HOSTNAME}
+    ;;
+esac
diff --git a/dockerfiles/swh-indexer-worker/indexer.yml b/dockerfiles/swh-indexer-worker/indexer.yml
new file mode 100644
index 0000000..55ab356
--- /dev/null
+++ b/dockerfiles/swh-indexer-worker/indexer.yml
@@ -0,0 +1,12 @@
+storage:
+  cls: remote
+  args:
+    url: http://swh-storage:5002/
+objstorage:
+  cls: remote
+  args:
+    url: http://swh-objstorage:5003/
+indexer_storage:
+  cls: remote
+  args:
+    url: http://swh-idx-storage:5007/
diff --git a/indexers.env b/indexers.env
new file mode 100644
index 0000000..0f02e61
--- /dev/null
+++ b/indexers.env
@@ -0,0 +1,3 @@
+CONCURRENCY=1
+MAX_TASKS_PER_CHILD=10
+LOGLEVEL=DEBUG