diff --git a/fig.yml b/fig.yml
index 08e7e73..9e2e716 100644
--- a/fig.yml
+++ b/fig.yml
@@ -21,9 +21,12 @@ mongo:
    - "27017:27017"
 
 influxdb:
-  image: tutum/influxdb
+  image: savoirfairelinux/influxdb
   environment:
     PRE_CREATE_DB: "db;grafana"
+  ports:
+    - "8083:8083"
+    - "8086:8086"
 
 grafana:
   image: savoirfairelinux/grafana
diff --git a/tools/docker/shinken_container/Dockerfile b/tools/docker/shinken_container/Dockerfile
index bed0b90..0056698 100644
--- a/tools/docker/shinken_container/Dockerfile
+++ b/tools/docker/shinken_container/Dockerfile
@@ -9,12 +9,14 @@ RUN apt-get install -y vim supervisor python-dev libffi-dev libssl-dev
 
 ### 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 sh  -c 'gpg --recv-keys --keyserver pgp.mit.edu 2320E8F8 && gpg --export --armor 2320E8F8 | apt-key add -' && \
+    echo 'deb http://deb.kaji-project.org/ubuntu14.04/ amakuni main' >> /etc/apt/sources.list.d/kaji.list && \
+    apt-get update
+RUN apt-get install -y shinken-common
 RUN shinken --init
 
 ## modules
-#RUN mkdir /var/lib/shinken/share
+RUN mkdir /var/lib/shinken/share /var/lib/shinken/doc /var/lib/shinken/inventory
 RUN shinken install webui
 RUN shinken install auth-cfg-password
 RUN pip install influxdb && shinken install mod-influxdb
diff --git a/tools/docker/shinken_container/etc/shinken/daemons/brokerd.ini b/tools/docker/shinken_container/etc/shinken/daemons/brokerd.ini
index 4cc8d2e..52e9cdc 100644
--- a/tools/docker/shinken_container/etc/shinken/daemons/brokerd.ini
+++ b/tools/docker/shinken_container/etc/shinken/daemons/brokerd.ini
@@ -43,6 +43,6 @@ log_level=WARNING
 max_queue_size=100000
 
 
-modules_dir=/var/lib/shinken/modules
+modules_dir=/usr/share/pyshared/shinken/modules/
 user=shinken
 group=shinken
diff --git a/tools/docker/shinken_container/etc/shinken/daemons/pollerd.ini b/tools/docker/shinken_container/etc/shinken/daemons/pollerd.ini
index d4e202d..58e1d12 100644
--- a/tools/docker/shinken_container/etc/shinken/daemons/pollerd.ini
+++ b/tools/docker/shinken_container/etc/shinken/daemons/pollerd.ini
@@ -36,6 +36,6 @@ local_log=%(logdir)s/pollerd.log
 log_level=WARNING
 
 
-modules_dir=/var/lib/shinken/modules
+modules_dir=/usr/share/pyshared/shinken/modules/
 user=shinken
 group=shinken
diff --git a/tools/docker/shinken_container/etc/shinken/daemons/reactionnerd.ini b/tools/docker/shinken_container/etc/shinken/daemons/reactionnerd.ini
index 12c7ae9..59e2375 100644
--- a/tools/docker/shinken_container/etc/shinken/daemons/reactionnerd.ini
+++ b/tools/docker/shinken_container/etc/shinken/daemons/reactionnerd.ini
@@ -31,6 +31,6 @@ local_log=%(logdir)s/reactionnerd.log
 # accepted log level values= DEBUG,INFO,WARNING,ERROR,CRITICAL
 log_level=WARNING
 
-modules_dir=/var/lib/shinken/modules
+modules_dir=/usr/share/pyshared/shinken/modules/
 user=shinken
 group=shinken
diff --git a/tools/docker/shinken_container/etc/shinken/daemons/receiverd.ini b/tools/docker/shinken_container/etc/shinken/daemons/receiverd.ini
index b58c89f..feb3ea8 100644
--- a/tools/docker/shinken_container/etc/shinken/daemons/receiverd.ini
+++ b/tools/docker/shinken_container/etc/shinken/daemons/receiverd.ini
@@ -31,6 +31,6 @@ local_log=%(logdir)s/receiverd.log
 # accepted log level values= DEBUG,INFO,WARNING,ERROR,CRITICAL
 log_level=WARNING
 
-modules_dir=/var/lib/shinken/modules
+modules_dir=/usr/share/pyshared/shinken/modules/
 user=shinken
 group=shinken
diff --git a/tools/docker/shinken_container/etc/shinken/daemons/schedulerd.ini b/tools/docker/shinken_container/etc/shinken/daemons/schedulerd.ini
index 9425ce2..19b41ec 100644
--- a/tools/docker/shinken_container/etc/shinken/daemons/schedulerd.ini
+++ b/tools/docker/shinken_container/etc/shinken/daemons/schedulerd.ini
@@ -36,6 +36,6 @@ local_log=%(logdir)s/schedulerd.log
 # accepted log level values= DEBUG,INFO,WARNING,ERROR,CRITICAL
 log_level=WARNING
 
-modules_dir=/var/lib/shinken/modules
+modules_dir=/usr/share/pyshared/shinken/modules/
 user=shinken
 group=shinken
diff --git a/tools/docker/shinken_container/etc/shinken/shinken.cfg b/tools/docker/shinken_container/etc/shinken/shinken.cfg
index 3717ee7..fe122b9 100644
--- a/tools/docker/shinken_container/etc/shinken/shinken.cfg
+++ b/tools/docker/shinken_container/etc/shinken/shinken.cfg
@@ -116,7 +116,7 @@ shinken_user=shinken
 shinken_group=shinken
 
 # The path to the modules directory
-modules_dir=/var/lib/shinken/modules
+modules_dir=/usr/share/pyshared/shinken/modules/
 
 # Set to 0 if you want to make this daemon (arbiter) NOT run
 daemon_enabled=1