diff --git a/deployLXCdevContainers.sh b/deployLXCdevContainers.sh
index e4a08d8..e762c44 100755
--- a/deployLXCdevContainers.sh
+++ b/deployLXCdevContainers.sh
@@ -71,7 +71,7 @@ echo Done
 
 echo ------------------------------------
 echo "Add opv_master line in /etc/host"
-lineOpvMaster=`cat /etc/hosts | grep opv_master -n | awk '{print $1}' FS=":"`
+lineOpvMaster=`cat /etc/hosts | sed "s/#.*//g" | grep opv_master -n | awk '{print $1}' FS=":"`
 
 for i in $lineOpvMaster
 do
diff --git a/roles/base/tasks/opensfm.yml b/roles/base/tasks/opensfm.yml
index db7f594..4814ae1 100644
--- a/roles/base/tasks/opensfm.yml
+++ b/roles/base/tasks/opensfm.yml
@@ -39,13 +39,12 @@
   shell: |
     source /home/opv/venvs/opv/bin/activate
     pip3 install opencv-python
-
     cd /home/opv/
-    git clone https://github.com/OpenPathView/OpenSfM.git
+    git clone --recursive https://github.com/mapillary/OpenSfM.git
     cd OpenSfM
-    pip3 install -r requirements.txt
-    python3 setup.py build
+    pip3 install -r requirements.txt  && \
+    python3 setup.py build  && \
     python3 setup.py install
-    exit 0
+    exit $?
   args:
     executable: /bin/bash
diff --git a/roles/base/tasks/opv.yml b/roles/base/tasks/opv.yml
index 4637b5f..965427a 100644
--- a/roles/base/tasks/opv.yml
+++ b/roles/base/tasks/opv.yml
@@ -25,7 +25,7 @@
 ### Installation de OPV ###
 ###########################
 
-- name: Update pip, wheel and setuptools
+- name: Update wheel and setuptools
   pip:
     name: "{{ item }}"
     extra_args: "--upgrade"
@@ -34,12 +34,25 @@
     state: latest
     editable: false
   with_items:
-    - pip
     - wheel
     - setuptools
   become: yes
   become_user: opv
 
+- name: Update pip
+  pip:
+    name: "{{ item }}"
+    extra_args: "--upgrade"
+    virtualenv: /home/opv/venvs/opv
+    virtualenv_command: pyvenv
+    state: present
+    editable: false
+    version: 18.1
+  with_items:
+    - pip
+  become: yes
+  become_user: opv
+
 - name: Install OPV modules
   pip:
     name: "git+{{ item }}"