diff --git a/Dockerfile b/Dockerfile
index 8083aa4..d76aa1b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,52 +2,23 @@ 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
-RUN apt-get install -y vim supervisor
-
-### Shinken
-RUN apt-get install -y python-pip
+# Surveil needs shinken (as a lib)
 RUN useradd shinken && pip install https://github.com/naparuba/shinken/archive/2.2-RC1.zip
-RUN apt-get install -y python-pycurl
-RUN shinken --init
 
-## modules
-#RUN mkdir /var/lib/shinken/share
-RUN shinken install webui
-RUN shinken install auth-cfg-password
-RUN pip install influxdb && shinken install mod-influxdb
-RUN shinken install ws-arbiter
-RUN pip install pymongo && shinken install mod-mongodb
+# python-surveilclient (used by surveil-init)
+RUN pip install python-surveilclient
 
-## plugins
-RUN apt-get install -y nagios-plugins
-# run permissions for user `shinken`
-RUN chmod u+s /usr/lib/nagios/plugins/check_icmp
-RUN chmod u+s /bin/ping
-RUN chmod u+s /bin/ping6
-
-## Packs
-ADD shinken-tools/packs /packs
-
-## Plugins
-ADD shinken-tools/plugins/*/check_* /usr/lib/shinken/plugins/
-
-# Download packs from savoirfairelinux/monitoring-tools
+# Download packs
 RUN apt-get install -y subversion && \
+    ## Packs
     svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/packs/generic-host /packs/generic-host && \
+    svn checkout https://github.com/stackforge/surveil/trunk/shinken-tools/packs/linux-glance /packs/linux-glance && \
+    svn checkout https://github.com/stackforge/surveil/trunk/shinken-tools/packs/linux-keystone /packs/linux-keystone && \
     apt-get remove -y subversion
 
-## configuration
-RUN rm -rf /etc/shinken
-ADD tools/docker/etc/shinken /etc/shinken
-RUN chown -R root:shinken /etc/shinken
-
-### Surveil
-## Package deps
-RUN apt-get install -y python3-pip python-dev libffi-dev libssl-dev
-
-## Copy files
+# Copy files
 ADD surveil /surveil/surveil
 ADD setup.cfg /surveil/setup.cfg
 ADD requirements.txt surveil/requirements.txt
@@ -55,22 +26,15 @@ ADD setup.py /surveil/setup.py
 ADD .git /surveil/.git
 ADD README.rst surveil/README.rst
 
-## Install
+# Install
 RUN pip install -r /surveil/requirements.txt
-RUN apt-get install -y git
 RUN cd surveil && python setup.py install
 
-### Supervisor
-ADD tools/docker/etc/supervisor /etc/supervisor
+# Supervisor
+ADD tools/docker/surveil_container/etc/supervisor /etc/supervisor
 
-# Shinken WEBUI
-EXPOSE 7767
-
-# Surveil
+# Surveil API
 EXPOSE 8080
 
-CMD surveil-init && \
-    surveil-pack-upload --mongo-url=mongo --mongo-port=27017 /packs/linux-keystone/ && \
-    surveil-pack-upload --mongo-url=mongo --mongo-port=27017 /packs/linux-glance/ && \
-    surveil-pack-upload --mongo-url=mongo --mongo-port=27017 /packs/generic-host/ && \
+CMD sleep 20 && \
     /usr/bin/supervisord
diff --git a/fig.yml b/fig.yml
index 17d1eac..b0affc4 100644
--- a/fig.yml
+++ b/fig.yml
@@ -3,9 +3,17 @@ surveil:
   links:
    - mongo
    - influxdb
+   - shinken
   ports:
    - "8080:8080"
-   - "7767:7767"
+
+shinken:
+  build: tools/docker/shinken_container/
+  links:
+    - mongo
+    - influxdb
+  ports:
+    - "7767:7767"
 
 mongo:
   image: mongo
diff --git a/requirements.txt b/requirements.txt
index 66ea43d..1aa4098 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,8 +2,3 @@ pecan>=0.5.0
 pymongo>=2.7.2
 wsme
 requests
-
-# Plugins dependencies
-shinkenplugins
-python-keystoneclient
-python-glanceclient
diff --git a/surveil/api/config.py b/surveil/api/config.py
index 851b44a..6f4ce9d 100644
--- a/surveil/api/config.py
+++ b/surveil/api/config.py
@@ -25,7 +25,7 @@ server = {
 app_hooks = [
     hooks.DBHook(
         pymongo.MongoClient('mongo', 27017),
-        "http://127.0.0.1:7760"
+        "http://shinken:7760"
     )
 ]
 
diff --git a/surveil/cmd/init.py b/surveil/cmd/init.py
index e0ee3a4..7682ed4 100644
--- a/surveil/cmd/init.py
+++ b/surveil/cmd/init.py
@@ -14,6 +14,10 @@
 
 """Script to reinitialize surveil."""
 
+import subprocess
+
+import surveilclient.client as sc
+
 from surveil.api import config
 
 
@@ -28,16 +32,48 @@ def main():
     mongo_hosts = mongo_shinken.hosts
     mongo_services = mongo_shinken.services
 
+    # Load the shinken packs
+    subprocess.call(
+        [
+            "surveil-pack-upload",
+            "--mongo-url=mongo",
+            "--mongo-port=27017",
+            "/packs/linux-keystone/",
+        ]
+    )
+
+    subprocess.call(
+        [
+            "surveil-pack-upload",
+            "--mongo-url=mongo",
+            "--mongo-port=27017",
+            "/packs/linux-glance/",
+        ]
+    )
+
+    subprocess.call(
+        [
+            "surveil-pack-upload",
+            "--mongo-url=mongo",
+            "--mongo-port=27017",
+            "/packs/generic-host/",
+        ]
+    )
+
     mongo_hosts.insert(
         {"use": "generic-host", "contact_groups": "admins",
-         "host_name": "surveil", "address": "localhost"}
+         "host_name": "ws-arbiter", "address": "localhost"}
     )
 
     mongo_services.insert(
-        {"check_command": "check_tcp!8080", "check_interval": "5",
+        {"check_command": "check_tcp!7760", "check_interval": "5",
          "check_period": "24x7", "contact_groups": "admins",
-         "contacts": "admin", "host_name": "surveil",
+         "contacts": "admin", "host_name": "ws-arbiter",
          "max_check_attempts": "5", "notification_interval": "30",
          "notification_period": "24x7", "retry_interval": "3",
-         "service_description": "check-surveil-api"}
+         "service_description": "check-ws-arbiter"}
     )
+
+    # Reload the surveil config
+    cli_surveil = sc.Client('http://localhost:8080/v1')
+    cli_surveil.reload_config()
diff --git a/tools/docker/shinken_container/Dockerfile b/tools/docker/shinken_container/Dockerfile
new file mode 100644
index 0000000..bed0b90
--- /dev/null
+++ b/tools/docker/shinken_container/Dockerfile
@@ -0,0 +1,58 @@
+FROM ubuntu:trusty
+
+MAINTAINER Alexandre Viau <alexandre.viau@savoirfairelinux.com>
+
+
+RUN apt-get update
+RUN apt-get install -y vim supervisor python-dev libffi-dev libssl-dev
+# libffi-devand libssl-dev are for python-cryptography
+
+### Shinken
+RUN apt-get install -y python-pip
+RUN useradd shinken && pip install https://github.com/naparuba/shinken/archive/2.2-RC1.zip
+RUN apt-get install -y python-pycurl
+RUN shinken --init
+
+## modules
+#RUN mkdir /var/lib/shinken/share
+RUN shinken install webui
+RUN shinken install auth-cfg-password
+RUN pip install influxdb && shinken install mod-influxdb
+RUN shinken install ws-arbiter
+RUN pip install pymongo && shinken install mod-mongodb
+
+## plugins
+RUN apt-get install -y nagios-plugins
+# run permissions for user `shinken`
+RUN chmod u+s /usr/lib/nagios/plugins/check_icmp
+RUN chmod u+s /bin/ping
+RUN chmod u+s /bin/ping6
+
+# Download plugins
+RUN apt-get install -y subversion && \
+    svn checkout https://github.com/stackforge/surveil/trunk/shinken-tools/plugins/plugin-check-glance /plugins/check_glance && \
+    svn checkout https://github.com/stackforge/surveil/trunk/shinken-tools/plugins/plugin-check-keystone /plugins/check_keystone && \
+    apt-get remove -y subversion
+
+## Install plugins dependencies
+RUN pip install shinkenplugins python-keystoneclient python-glanceclient
+
+## Install Plugins
+RUN mkdir -p /usr/lib/shinken/plugins && \
+    cp /plugins/*/check_* /usr/lib/shinken/plugins/
+
+## configuration
+RUN rm -rf /etc/shinken
+ADD etc/shinken /etc/shinken
+RUN chown -R root:shinken /etc/shinken
+
+### Supervisor
+ADD etc/supervisor /etc/supervisor
+
+# Shinken WEBUI
+EXPOSE 7767
+
+# ws-arbiter
+EXPOSE 7760
+
+CMD /usr/bin/supervisord
diff --git a/tools/docker/etc/shinken/arbiters/arbiter-master.cfg b/tools/docker/shinken_container/etc/shinken/arbiters/arbiter-master.cfg
similarity index 100%
rename from tools/docker/etc/shinken/arbiters/arbiter-master.cfg
rename to tools/docker/shinken_container/etc/shinken/arbiters/arbiter-master.cfg
diff --git a/tools/docker/etc/shinken/brokers/broker-master.cfg b/tools/docker/shinken_container/etc/shinken/brokers/broker-master.cfg
similarity index 100%
rename from tools/docker/etc/shinken/brokers/broker-master.cfg
rename to tools/docker/shinken_container/etc/shinken/brokers/broker-master.cfg
diff --git a/tools/docker/etc/shinken/certs/02.pem b/tools/docker/shinken_container/etc/shinken/certs/02.pem
similarity index 100%
rename from tools/docker/etc/shinken/certs/02.pem
rename to tools/docker/shinken_container/etc/shinken/certs/02.pem
diff --git a/tools/docker/etc/shinken/certs/README b/tools/docker/shinken_container/etc/shinken/certs/README
similarity index 100%
rename from tools/docker/etc/shinken/certs/README
rename to tools/docker/shinken_container/etc/shinken/certs/README
diff --git a/tools/docker/etc/shinken/certs/ca.pem b/tools/docker/shinken_container/etc/shinken/certs/ca.pem
similarity index 100%
rename from tools/docker/etc/shinken/certs/ca.pem
rename to tools/docker/shinken_container/etc/shinken/certs/ca.pem
diff --git a/tools/docker/etc/shinken/certs/certindex.txt b/tools/docker/shinken_container/etc/shinken/certs/certindex.txt
similarity index 100%
rename from tools/docker/etc/shinken/certs/certindex.txt
rename to tools/docker/shinken_container/etc/shinken/certs/certindex.txt
diff --git a/tools/docker/etc/shinken/certs/certindex.txt.attr b/tools/docker/shinken_container/etc/shinken/certs/certindex.txt.attr
similarity index 100%
rename from tools/docker/etc/shinken/certs/certindex.txt.attr
rename to tools/docker/shinken_container/etc/shinken/certs/certindex.txt.attr
diff --git a/tools/docker/etc/shinken/certs/certindex.txt.old b/tools/docker/shinken_container/etc/shinken/certs/certindex.txt.old
similarity index 100%
rename from tools/docker/etc/shinken/certs/certindex.txt.old
rename to tools/docker/shinken_container/etc/shinken/certs/certindex.txt.old
diff --git a/tools/docker/etc/shinken/certs/client.pem b/tools/docker/shinken_container/etc/shinken/certs/client.pem
similarity index 100%
rename from tools/docker/etc/shinken/certs/client.pem
rename to tools/docker/shinken_container/etc/shinken/certs/client.pem
diff --git a/tools/docker/etc/shinken/certs/demoCA/cacert.pem b/tools/docker/shinken_container/etc/shinken/certs/demoCA/cacert.pem
similarity index 100%
rename from tools/docker/etc/shinken/certs/demoCA/cacert.pem
rename to tools/docker/shinken_container/etc/shinken/certs/demoCA/cacert.pem
diff --git a/tools/docker/etc/shinken/certs/demoCA/careq.pem b/tools/docker/shinken_container/etc/shinken/certs/demoCA/careq.pem
similarity index 100%
rename from tools/docker/etc/shinken/certs/demoCA/careq.pem
rename to tools/docker/shinken_container/etc/shinken/certs/demoCA/careq.pem
diff --git a/tools/docker/etc/shinken/certs/demoCA/crlnumber b/tools/docker/shinken_container/etc/shinken/certs/demoCA/crlnumber
similarity index 100%
rename from tools/docker/etc/shinken/certs/demoCA/crlnumber
rename to tools/docker/shinken_container/etc/shinken/certs/demoCA/crlnumber
diff --git a/tools/docker/etc/shinken/certs/demoCA/index.txt b/tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt
similarity index 100%
rename from tools/docker/etc/shinken/certs/demoCA/index.txt
rename to tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt
diff --git a/tools/docker/etc/shinken/certs/demoCA/index.txt.attr b/tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt.attr
similarity index 100%
rename from tools/docker/etc/shinken/certs/demoCA/index.txt.attr
rename to tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt.attr
diff --git a/tools/docker/etc/shinken/certs/demoCA/index.txt.attr.old b/tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt.attr.old
similarity index 100%
rename from tools/docker/etc/shinken/certs/demoCA/index.txt.attr.old
rename to tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt.attr.old
diff --git a/tools/docker/etc/shinken/certs/demoCA/index.txt.old b/tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt.old
similarity index 100%
rename from tools/docker/etc/shinken/certs/demoCA/index.txt.old
rename to tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt.old
diff --git a/tools/docker/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem b/tools/docker/shinken_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem
similarity index 100%
rename from tools/docker/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem
rename to tools/docker/shinken_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem
diff --git a/tools/docker/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem b/tools/docker/shinken_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem
similarity index 100%
rename from tools/docker/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem
rename to tools/docker/shinken_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem
diff --git a/tools/docker/etc/shinken/certs/demoCA/private/cakey.pem b/tools/docker/shinken_container/etc/shinken/certs/demoCA/private/cakey.pem
similarity index 100%
rename from tools/docker/etc/shinken/certs/demoCA/private/cakey.pem
rename to tools/docker/shinken_container/etc/shinken/certs/demoCA/private/cakey.pem
diff --git a/tools/docker/etc/shinken/certs/demoCA/serial b/tools/docker/shinken_container/etc/shinken/certs/demoCA/serial
similarity index 100%
rename from tools/docker/etc/shinken/certs/demoCA/serial
rename to tools/docker/shinken_container/etc/shinken/certs/demoCA/serial
diff --git a/tools/docker/etc/shinken/certs/demoCA/serial.old b/tools/docker/shinken_container/etc/shinken/certs/demoCA/serial.old
similarity index 100%
rename from tools/docker/etc/shinken/certs/demoCA/serial.old
rename to tools/docker/shinken_container/etc/shinken/certs/demoCA/serial.old
diff --git a/tools/docker/etc/shinken/certs/serial b/tools/docker/shinken_container/etc/shinken/certs/serial
similarity index 100%
rename from tools/docker/etc/shinken/certs/serial
rename to tools/docker/shinken_container/etc/shinken/certs/serial
diff --git a/tools/docker/etc/shinken/certs/serial.old b/tools/docker/shinken_container/etc/shinken/certs/serial.old
similarity index 100%
rename from tools/docker/etc/shinken/certs/serial.old
rename to tools/docker/shinken_container/etc/shinken/certs/serial.old
diff --git a/tools/docker/etc/shinken/certs/server.cert b/tools/docker/shinken_container/etc/shinken/certs/server.cert
similarity index 100%
rename from tools/docker/etc/shinken/certs/server.cert
rename to tools/docker/shinken_container/etc/shinken/certs/server.cert
diff --git a/tools/docker/etc/shinken/certs/server.key b/tools/docker/shinken_container/etc/shinken/certs/server.key
similarity index 100%
rename from tools/docker/etc/shinken/certs/server.key
rename to tools/docker/shinken_container/etc/shinken/certs/server.key
diff --git a/tools/docker/etc/shinken/certs/server.pem b/tools/docker/shinken_container/etc/shinken/certs/server.pem
similarity index 100%
rename from tools/docker/etc/shinken/certs/server.pem
rename to tools/docker/shinken_container/etc/shinken/certs/server.pem
diff --git a/tools/docker/etc/shinken/certs/server.req b/tools/docker/shinken_container/etc/shinken/certs/server.req
similarity index 100%
rename from tools/docker/etc/shinken/certs/server.req
rename to tools/docker/shinken_container/etc/shinken/certs/server.req
diff --git a/tools/docker/etc/shinken/certs/shinken_openssl_cnf b/tools/docker/shinken_container/etc/shinken/certs/shinken_openssl_cnf
similarity index 100%
rename from tools/docker/etc/shinken/certs/shinken_openssl_cnf
rename to tools/docker/shinken_container/etc/shinken/certs/shinken_openssl_cnf
diff --git a/tools/docker/etc/shinken/commands/check_dig.cfg b/tools/docker/shinken_container/etc/shinken/commands/check_dig.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/check_dig.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/check_dig.cfg
diff --git a/tools/docker/etc/shinken/commands/check_host_alive.cfg b/tools/docker/shinken_container/etc/shinken/commands/check_host_alive.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/check_host_alive.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/check_host_alive.cfg
diff --git a/tools/docker/etc/shinken/commands/check_http_url.cfg b/tools/docker/shinken_container/etc/shinken/commands/check_http_url.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/check_http_url.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/check_http_url.cfg
diff --git a/tools/docker/etc/shinken/commands/check_nrpe.cfg b/tools/docker/shinken_container/etc/shinken/commands/check_nrpe.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/check_nrpe.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/check_nrpe.cfg
diff --git a/tools/docker/etc/shinken/commands/check_nrpe_args.cfg b/tools/docker/shinken_container/etc/shinken/commands/check_nrpe_args.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/check_nrpe_args.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/check_nrpe_args.cfg
diff --git a/tools/docker/etc/shinken/commands/check_ping.cfg b/tools/docker/shinken_container/etc/shinken/commands/check_ping.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/check_ping.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/check_ping.cfg
diff --git a/tools/docker/etc/shinken/commands/check_snmp_service.cfg b/tools/docker/shinken_container/etc/shinken/commands/check_snmp_service.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/check_snmp_service.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/check_snmp_service.cfg
diff --git a/tools/docker/etc/shinken/commands/check_snmp_storage.cfg b/tools/docker/shinken_container/etc/shinken/commands/check_snmp_storage.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/check_snmp_storage.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/check_snmp_storage.cfg
diff --git a/tools/docker/etc/shinken/commands/check_snmp_time.cfg b/tools/docker/shinken_container/etc/shinken/commands/check_snmp_time.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/check_snmp_time.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/check_snmp_time.cfg
diff --git a/tools/docker/etc/shinken/commands/check_tcp.cfg b/tools/docker/shinken_container/etc/shinken/commands/check_tcp.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/check_tcp.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/check_tcp.cfg
diff --git a/tools/docker/etc/shinken/commands/configuration-check.cfg b/tools/docker/shinken_container/etc/shinken/commands/configuration-check.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/configuration-check.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/configuration-check.cfg
diff --git a/tools/docker/etc/shinken/commands/detailled-host-by-email.cfg b/tools/docker/shinken_container/etc/shinken/commands/detailled-host-by-email.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/detailled-host-by-email.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/detailled-host-by-email.cfg
diff --git a/tools/docker/etc/shinken/commands/detailled-service-by-email.cfg b/tools/docker/shinken_container/etc/shinken/commands/detailled-service-by-email.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/detailled-service-by-email.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/detailled-service-by-email.cfg
diff --git a/tools/docker/etc/shinken/commands/notify-host-by-android-sms.cfg b/tools/docker/shinken_container/etc/shinken/commands/notify-host-by-android-sms.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/notify-host-by-android-sms.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/notify-host-by-android-sms.cfg
diff --git a/tools/docker/etc/shinken/commands/notify-host-by-email.cfg b/tools/docker/shinken_container/etc/shinken/commands/notify-host-by-email.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/notify-host-by-email.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/notify-host-by-email.cfg
diff --git a/tools/docker/etc/shinken/commands/notify-host-by-xmpp.cfg b/tools/docker/shinken_container/etc/shinken/commands/notify-host-by-xmpp.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/notify-host-by-xmpp.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/notify-host-by-xmpp.cfg
diff --git a/tools/docker/etc/shinken/commands/notify-service-by-android-sms.cfg b/tools/docker/shinken_container/etc/shinken/commands/notify-service-by-android-sms.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/notify-service-by-android-sms.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/notify-service-by-android-sms.cfg
diff --git a/tools/docker/etc/shinken/commands/notify-service-by-email.cfg b/tools/docker/shinken_container/etc/shinken/commands/notify-service-by-email.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/notify-service-by-email.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/notify-service-by-email.cfg
diff --git a/tools/docker/etc/shinken/commands/notify-service-by-xmpp.cfg b/tools/docker/shinken_container/etc/shinken/commands/notify-service-by-xmpp.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/notify-service-by-xmpp.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/notify-service-by-xmpp.cfg
diff --git a/tools/docker/etc/shinken/commands/reload-shinken.cfg b/tools/docker/shinken_container/etc/shinken/commands/reload-shinken.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/reload-shinken.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/reload-shinken.cfg
diff --git a/tools/docker/etc/shinken/commands/restart-shinken.cfg b/tools/docker/shinken_container/etc/shinken/commands/restart-shinken.cfg
similarity index 100%
rename from tools/docker/etc/shinken/commands/restart-shinken.cfg
rename to tools/docker/shinken_container/etc/shinken/commands/restart-shinken.cfg
diff --git a/tools/docker/etc/shinken/contactgroups/admins.cfg b/tools/docker/shinken_container/etc/shinken/contactgroups/admins.cfg
similarity index 100%
rename from tools/docker/etc/shinken/contactgroups/admins.cfg
rename to tools/docker/shinken_container/etc/shinken/contactgroups/admins.cfg
diff --git a/tools/docker/etc/shinken/contactgroups/users.cfg b/tools/docker/shinken_container/etc/shinken/contactgroups/users.cfg
similarity index 100%
rename from tools/docker/etc/shinken/contactgroups/users.cfg
rename to tools/docker/shinken_container/etc/shinken/contactgroups/users.cfg
diff --git a/tools/docker/etc/shinken/contacts/admin.cfg b/tools/docker/shinken_container/etc/shinken/contacts/admin.cfg
similarity index 100%
rename from tools/docker/etc/shinken/contacts/admin.cfg
rename to tools/docker/shinken_container/etc/shinken/contacts/admin.cfg
diff --git a/tools/docker/etc/shinken/daemons/brokerd.ini b/tools/docker/shinken_container/etc/shinken/daemons/brokerd.ini
similarity index 100%
rename from tools/docker/etc/shinken/daemons/brokerd.ini
rename to tools/docker/shinken_container/etc/shinken/daemons/brokerd.ini
diff --git a/tools/docker/etc/shinken/daemons/pollerd.ini b/tools/docker/shinken_container/etc/shinken/daemons/pollerd.ini
similarity index 100%
rename from tools/docker/etc/shinken/daemons/pollerd.ini
rename to tools/docker/shinken_container/etc/shinken/daemons/pollerd.ini
diff --git a/tools/docker/etc/shinken/daemons/reactionnerd.ini b/tools/docker/shinken_container/etc/shinken/daemons/reactionnerd.ini
similarity index 100%
rename from tools/docker/etc/shinken/daemons/reactionnerd.ini
rename to tools/docker/shinken_container/etc/shinken/daemons/reactionnerd.ini
diff --git a/tools/docker/etc/shinken/daemons/receiverd.ini b/tools/docker/shinken_container/etc/shinken/daemons/receiverd.ini
similarity index 100%
rename from tools/docker/etc/shinken/daemons/receiverd.ini
rename to tools/docker/shinken_container/etc/shinken/daemons/receiverd.ini
diff --git a/tools/docker/etc/shinken/daemons/schedulerd.ini b/tools/docker/shinken_container/etc/shinken/daemons/schedulerd.ini
similarity index 100%
rename from tools/docker/etc/shinken/daemons/schedulerd.ini
rename to tools/docker/shinken_container/etc/shinken/daemons/schedulerd.ini
diff --git a/tools/docker/etc/shinken/dependencies/sample.cfg b/tools/docker/shinken_container/etc/shinken/dependencies/sample.cfg
similarity index 100%
rename from tools/docker/etc/shinken/dependencies/sample.cfg
rename to tools/docker/shinken_container/etc/shinken/dependencies/sample.cfg
diff --git a/tools/docker/etc/shinken/discovery/discovery.cfg b/tools/docker/shinken_container/etc/shinken/discovery/discovery.cfg
similarity index 100%
rename from tools/docker/etc/shinken/discovery/discovery.cfg
rename to tools/docker/shinken_container/etc/shinken/discovery/discovery.cfg
diff --git a/tools/docker/etc/shinken/discovery/discovery_rules.cfg b/tools/docker/shinken_container/etc/shinken/discovery/discovery_rules.cfg
similarity index 100%
rename from tools/docker/etc/shinken/discovery/discovery_rules.cfg
rename to tools/docker/shinken_container/etc/shinken/discovery/discovery_rules.cfg
diff --git a/tools/docker/etc/shinken/discovery/discovery_runs.cfg b/tools/docker/shinken_container/etc/shinken/discovery/discovery_runs.cfg
similarity index 100%
rename from tools/docker/etc/shinken/discovery/discovery_runs.cfg
rename to tools/docker/shinken_container/etc/shinken/discovery/discovery_runs.cfg
diff --git a/tools/docker/etc/shinken/escalations/sample.cfg b/tools/docker/shinken_container/etc/shinken/escalations/sample.cfg
similarity index 100%
rename from tools/docker/etc/shinken/escalations/sample.cfg
rename to tools/docker/shinken_container/etc/shinken/escalations/sample.cfg
diff --git a/tools/docker/etc/shinken/hostgroups/linux.cfg b/tools/docker/shinken_container/etc/shinken/hostgroups/linux.cfg
similarity index 100%
rename from tools/docker/etc/shinken/hostgroups/linux.cfg
rename to tools/docker/shinken_container/etc/shinken/hostgroups/linux.cfg
diff --git a/tools/docker/etc/shinken/hosts/localhost.cfg b/tools/docker/shinken_container/etc/shinken/hosts/localhost.cfg
similarity index 100%
rename from tools/docker/etc/shinken/hosts/localhost.cfg
rename to tools/docker/shinken_container/etc/shinken/hosts/localhost.cfg
diff --git a/tools/docker/etc/shinken/modules/auth_cfg_password.cfg b/tools/docker/shinken_container/etc/shinken/modules/auth_cfg_password.cfg
similarity index 100%
rename from tools/docker/etc/shinken/modules/auth_cfg_password.cfg
rename to tools/docker/shinken_container/etc/shinken/modules/auth_cfg_password.cfg
diff --git a/tools/docker/etc/shinken/modules/influxdb.cfg b/tools/docker/shinken_container/etc/shinken/modules/influxdb.cfg
similarity index 100%
rename from tools/docker/etc/shinken/modules/influxdb.cfg
rename to tools/docker/shinken_container/etc/shinken/modules/influxdb.cfg
diff --git a/tools/docker/etc/shinken/modules/mongodb.cfg b/tools/docker/shinken_container/etc/shinken/modules/mongodb.cfg
similarity index 100%
rename from tools/docker/etc/shinken/modules/mongodb.cfg
rename to tools/docker/shinken_container/etc/shinken/modules/mongodb.cfg
diff --git a/tools/docker/etc/shinken/modules/webui.cfg b/tools/docker/shinken_container/etc/shinken/modules/webui.cfg
similarity index 100%
rename from tools/docker/etc/shinken/modules/webui.cfg
rename to tools/docker/shinken_container/etc/shinken/modules/webui.cfg
diff --git a/tools/docker/etc/shinken/modules/ws_arbiter.cfg b/tools/docker/shinken_container/etc/shinken/modules/ws_arbiter.cfg
similarity index 100%
rename from tools/docker/etc/shinken/modules/ws_arbiter.cfg
rename to tools/docker/shinken_container/etc/shinken/modules/ws_arbiter.cfg
diff --git a/tools/docker/etc/shinken/notificationways/detailled-email.cfg b/tools/docker/shinken_container/etc/shinken/notificationways/detailled-email.cfg
similarity index 100%
rename from tools/docker/etc/shinken/notificationways/detailled-email.cfg
rename to tools/docker/shinken_container/etc/shinken/notificationways/detailled-email.cfg
diff --git a/tools/docker/etc/shinken/notificationways/email.cfg b/tools/docker/shinken_container/etc/shinken/notificationways/email.cfg
similarity index 100%
rename from tools/docker/etc/shinken/notificationways/email.cfg
rename to tools/docker/shinken_container/etc/shinken/notificationways/email.cfg
diff --git a/tools/docker/etc/shinken/notificationways/sms-android.cfg b/tools/docker/shinken_container/etc/shinken/notificationways/sms-android.cfg
similarity index 100%
rename from tools/docker/etc/shinken/notificationways/sms-android.cfg
rename to tools/docker/shinken_container/etc/shinken/notificationways/sms-android.cfg
diff --git a/tools/docker/etc/shinken/packs/readme.cfg b/tools/docker/shinken_container/etc/shinken/packs/readme.cfg
similarity index 100%
rename from tools/docker/etc/shinken/packs/readme.cfg
rename to tools/docker/shinken_container/etc/shinken/packs/readme.cfg
diff --git a/tools/docker/etc/shinken/pollers/poller-master.cfg b/tools/docker/shinken_container/etc/shinken/pollers/poller-master.cfg
similarity index 100%
rename from tools/docker/etc/shinken/pollers/poller-master.cfg
rename to tools/docker/shinken_container/etc/shinken/pollers/poller-master.cfg
diff --git a/tools/docker/etc/shinken/reactionners/reactionner-android-sms.cfg b/tools/docker/shinken_container/etc/shinken/reactionners/reactionner-android-sms.cfg
similarity index 100%
rename from tools/docker/etc/shinken/reactionners/reactionner-android-sms.cfg
rename to tools/docker/shinken_container/etc/shinken/reactionners/reactionner-android-sms.cfg
diff --git a/tools/docker/etc/shinken/reactionners/reactionner-master.cfg b/tools/docker/shinken_container/etc/shinken/reactionners/reactionner-master.cfg
similarity index 100%
rename from tools/docker/etc/shinken/reactionners/reactionner-master.cfg
rename to tools/docker/shinken_container/etc/shinken/reactionners/reactionner-master.cfg
diff --git a/tools/docker/etc/shinken/realms/all.cfg b/tools/docker/shinken_container/etc/shinken/realms/all.cfg
similarity index 100%
rename from tools/docker/etc/shinken/realms/all.cfg
rename to tools/docker/shinken_container/etc/shinken/realms/all.cfg
diff --git a/tools/docker/etc/shinken/receivers/receiver-master.cfg b/tools/docker/shinken_container/etc/shinken/receivers/receiver-master.cfg
similarity index 100%
rename from tools/docker/etc/shinken/receivers/receiver-master.cfg
rename to tools/docker/shinken_container/etc/shinken/receivers/receiver-master.cfg
diff --git a/tools/docker/etc/shinken/resource.d/active-directory.cfg b/tools/docker/shinken_container/etc/shinken/resource.d/active-directory.cfg
similarity index 100%
rename from tools/docker/etc/shinken/resource.d/active-directory.cfg
rename to tools/docker/shinken_container/etc/shinken/resource.d/active-directory.cfg
diff --git a/tools/docker/etc/shinken/resource.d/nmap.cfg b/tools/docker/shinken_container/etc/shinken/resource.d/nmap.cfg
similarity index 100%
rename from tools/docker/etc/shinken/resource.d/nmap.cfg
rename to tools/docker/shinken_container/etc/shinken/resource.d/nmap.cfg
diff --git a/tools/docker/etc/shinken/resource.d/paths.cfg b/tools/docker/shinken_container/etc/shinken/resource.d/paths.cfg
similarity index 100%
rename from tools/docker/etc/shinken/resource.d/paths.cfg
rename to tools/docker/shinken_container/etc/shinken/resource.d/paths.cfg
diff --git a/tools/docker/etc/shinken/resource.d/snmp.cfg b/tools/docker/shinken_container/etc/shinken/resource.d/snmp.cfg
similarity index 100%
rename from tools/docker/etc/shinken/resource.d/snmp.cfg
rename to tools/docker/shinken_container/etc/shinken/resource.d/snmp.cfg
diff --git a/tools/docker/etc/shinken/schedulers/scheduler-master.cfg b/tools/docker/shinken_container/etc/shinken/schedulers/scheduler-master.cfg
similarity index 100%
rename from tools/docker/etc/shinken/schedulers/scheduler-master.cfg
rename to tools/docker/shinken_container/etc/shinken/schedulers/scheduler-master.cfg
diff --git a/tools/docker/etc/shinken/servicegroups/sample.cfg b/tools/docker/shinken_container/etc/shinken/servicegroups/sample.cfg
similarity index 100%
rename from tools/docker/etc/shinken/servicegroups/sample.cfg
rename to tools/docker/shinken_container/etc/shinken/servicegroups/sample.cfg
diff --git a/tools/docker/etc/shinken/services/services.cfg b/tools/docker/shinken_container/etc/shinken/services/services.cfg
similarity index 100%
rename from tools/docker/etc/shinken/services/services.cfg
rename to tools/docker/shinken_container/etc/shinken/services/services.cfg
diff --git a/tools/docker/etc/shinken/shinken.cfg b/tools/docker/shinken_container/etc/shinken/shinken.cfg
similarity index 100%
rename from tools/docker/etc/shinken/shinken.cfg
rename to tools/docker/shinken_container/etc/shinken/shinken.cfg
diff --git a/tools/docker/etc/shinken/templates/generic-contact.cfg b/tools/docker/shinken_container/etc/shinken/templates/generic-contact.cfg
similarity index 100%
rename from tools/docker/etc/shinken/templates/generic-contact.cfg
rename to tools/docker/shinken_container/etc/shinken/templates/generic-contact.cfg
diff --git a/tools/docker/etc/shinken/templates/generic-host.cfg b/tools/docker/shinken_container/etc/shinken/templates/generic-host.cfg
similarity index 100%
rename from tools/docker/etc/shinken/templates/generic-host.cfg
rename to tools/docker/shinken_container/etc/shinken/templates/generic-host.cfg
diff --git a/tools/docker/etc/shinken/templates/generic-service.cfg b/tools/docker/shinken_container/etc/shinken/templates/generic-service.cfg
similarity index 100%
rename from tools/docker/etc/shinken/templates/generic-service.cfg
rename to tools/docker/shinken_container/etc/shinken/templates/generic-service.cfg
diff --git a/tools/docker/etc/shinken/templates/srv-pnp.cfg b/tools/docker/shinken_container/etc/shinken/templates/srv-pnp.cfg
similarity index 100%
rename from tools/docker/etc/shinken/templates/srv-pnp.cfg
rename to tools/docker/shinken_container/etc/shinken/templates/srv-pnp.cfg
diff --git a/tools/docker/etc/shinken/templates/time_templates.cfg b/tools/docker/shinken_container/etc/shinken/templates/time_templates.cfg
similarity index 100%
rename from tools/docker/etc/shinken/templates/time_templates.cfg
rename to tools/docker/shinken_container/etc/shinken/templates/time_templates.cfg
diff --git a/tools/docker/etc/shinken/timeperiods/24x7.cfg b/tools/docker/shinken_container/etc/shinken/timeperiods/24x7.cfg
similarity index 100%
rename from tools/docker/etc/shinken/timeperiods/24x7.cfg
rename to tools/docker/shinken_container/etc/shinken/timeperiods/24x7.cfg
diff --git a/tools/docker/etc/shinken/timeperiods/none.cfg b/tools/docker/shinken_container/etc/shinken/timeperiods/none.cfg
similarity index 100%
rename from tools/docker/etc/shinken/timeperiods/none.cfg
rename to tools/docker/shinken_container/etc/shinken/timeperiods/none.cfg
diff --git a/tools/docker/etc/shinken/timeperiods/us-holidays.cfg b/tools/docker/shinken_container/etc/shinken/timeperiods/us-holidays.cfg
similarity index 100%
rename from tools/docker/etc/shinken/timeperiods/us-holidays.cfg
rename to tools/docker/shinken_container/etc/shinken/timeperiods/us-holidays.cfg
diff --git a/tools/docker/etc/shinken/timeperiods/workhours.cfg b/tools/docker/shinken_container/etc/shinken/timeperiods/workhours.cfg
similarity index 100%
rename from tools/docker/etc/shinken/timeperiods/workhours.cfg
rename to tools/docker/shinken_container/etc/shinken/timeperiods/workhours.cfg
diff --git a/tools/docker/etc/supervisor/conf.d/supervisor.conf b/tools/docker/shinken_container/etc/supervisor/conf.d/supervisor.conf
similarity index 58%
rename from tools/docker/etc/supervisor/conf.d/supervisor.conf
rename to tools/docker/shinken_container/etc/supervisor/conf.d/supervisor.conf
index 078c0b3..64dfae5 100644
--- a/tools/docker/etc/supervisor/conf.d/supervisor.conf
+++ b/tools/docker/shinken_container/etc/supervisor/conf.d/supervisor.conf
@@ -3,6 +3,3 @@ nodaemon=true
 
 [program:shinken]
 command=/bin/sh -c "service shinken start"
-
-[program:surveil]
-command=/bin/sh -c "sleep 20 && surveil-api"
diff --git a/tools/docker/surveil_container/etc/supervisor/conf.d/supervisor.conf b/tools/docker/surveil_container/etc/supervisor/conf.d/supervisor.conf
new file mode 100644
index 0000000..4304615
--- /dev/null
+++ b/tools/docker/surveil_container/etc/supervisor/conf.d/supervisor.conf
@@ -0,0 +1,8 @@
+[supervisord]
+nodaemon=true
+
+[program:surveil]
+command=/bin/sh -c "surveil-api"
+
+[program:surveil-init]
+command=/bin/sh -c "sleep 10 && surveil-init"