diff --git a/Dockerfile b/Dockerfile
index 0145fcc..b3520aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,9 @@ RUN apt-get install -y subversion && \
     svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/openstack-cinder-http /usr/share/monitoring/packs/sfl/openstack-cinder-http && \
     svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/openstack-keystone-http /usr/share/monitoring/packs/sfl/openstack-keystone-http && \
     svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/openstack-nova-http /usr/share/monitoring/packs/sfl/openstack-nova-http && \
-    svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/openstack-host /usr/share/monitoring/packs/openstack-host && \
+    svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/openstack-host /usr/share/monitoring/packs/sfl/openstack-host && \
+    svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-system-nrpe /usr/share/monitoring/packs/sfl/linux-system-nrpe && \
+    svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/generic-host /usr/share/monitoring/packs/sfl/generic-host && \
     apt-get remove -y subversion
 
 ADD requirements.txt /opt/surveil/requirements.txt
diff --git a/surveil/cmd/init.py b/surveil/cmd/init.py
index 6a35b0d..db0f67f 100644
--- a/surveil/cmd/init.py
+++ b/surveil/cmd/init.py
@@ -95,6 +95,14 @@ def main():
             ]
         )
 
+        subprocess.call(
+            [
+                "surveil-pack-upload",
+                "--mongo-uri=" + config.surveil_api_config['mongodb_uri'],
+                "/usr/share/monitoring/packs/sfl/linux-system-nrpe/",
+            ]
+        )
+
         subprocess.call(
             [
                 "surveil-pack-upload",
diff --git a/tools/docker/alignak_container/Dockerfile b/tools/docker/alignak_container/Dockerfile
index c51c78a..2e8cfbe 100644
--- a/tools/docker/alignak_container/Dockerfile
+++ b/tools/docker/alignak_container/Dockerfile
@@ -102,12 +102,6 @@ RUN cd /plugins/check_cinder && sudo /opt/surveilplugins/env/bin/python setup.py
 RUN cd /plugins/check_ceilometer && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_ceilometer /usr/lib/monitoring/plugins/sfl/
 RUN cd /plugins/check_nova_host_status && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_nova_host_status /usr/lib/monitoring/plugins/sfl/
 
-## packs
-RUN sh  -c 'gpg --recv-keys --keyserver keyserver.ubuntu.com 2320E8F8 && gpg --export --armor 2320E8F8 | apt-key add -' && \
-    sh -c "echo 'deb http://deb.kaji-project.org/ubuntu14.04/ plugins main' >> /etc/apt/sources.list.d/kaji.list" && \
-    apt-get update && \
-    apt-get install -y --force-yes monitoring-packs-sfl-generic-host monitoring-packs-sfl-linux-system-nrpe
-
 ## Add check example plugin
 ADD plugins/check-example /plugins/check_example
 RUN virtualenv /plugins/check_example/env