diff --git a/Dockerfile b/Dockerfile
index 81cdc9e..be49e38 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:trusty
 
 MAINTAINER Alexandre Viau <alexandre.viau@savoirfairelinux.com>
 
-RUN apt-get update && apt-get install -y vim supervisor python-pip python3-pip python-dev libffi-dev libssl-dev git python-pycurl
+RUN apt-get update && apt-get install -y vim python-pip python3-pip python-dev libffi-dev libssl-dev git python-pycurl
 
 # Surveil needs shinken (as a lib)
 RUN useradd shinken && pip install https://github.com/naparuba/shinken/archive/2.2-RC1.zip
@@ -27,13 +27,11 @@ ADD etc/surveil /etc/surveil
 # Install
 RUN pip install -r /surveil/requirements.txt
 
-# Supervisor
-ADD tools/docker/surveil_container/etc/supervisor /etc/supervisor
-
 # Surveil API
 EXPOSE 8080
 
-CMD sleep 20 && \
-    cd /surveil/ && \
+CMD cd /surveil/ && \
     python setup.py develop && \
-    /usr/bin/supervisord
+    ((sleep 40 && surveil-init) &) && \
+    sleep 20 && \
+    surveil-api --reload
diff --git a/docker-compose.yml b/docker-compose.yml
index 9e1f3dc..9918534 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ shinken:
     - "7767:7767"
 
 mongo:
-  image: mongo
+  image: mongo:2.6
   ports:
    - "27017:27017"
 
diff --git a/tools/docker/surveil_container/etc/supervisor/conf.d/supervisor.conf b/tools/docker/surveil_container/etc/supervisor/conf.d/supervisor.conf
deleted file mode 100644
index c28a1b8..0000000
--- a/tools/docker/surveil_container/etc/supervisor/conf.d/supervisor.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:surveil]
-command=/bin/sh -c "surveil-api --reload"
-
-[program:surveil-init]
-command=/bin/sh -c "sleep 10 && surveil-init"