diff --git a/installers/10-install-client-tools.sh b/installers/10-install-client-tools.sh
index 5a02e70..aff534d 100755
--- a/installers/10-install-client-tools.sh
+++ b/installers/10-install-client-tools.sh
@@ -135,14 +135,19 @@
 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y python3 python3-setuptools python3-dev python3-pip
 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libmagic1
 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y make
-sudo -H python3 -m pip install -U pip
+python3 -m pip install --user -U pip
 # Install OSM IM and its dependencies via pip
-python3 -m pip install -r "https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=${OSM_IM_VERSION}"
+python3 -m pip install --user -r "https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=${OSM_IM_VERSION}"
 # Path needs to include $HOME/.local/bin in order to use pyang
 [ "$(which pyang)" = "$HOME/.local/bin/pyang" ] || export PATH=$HOME/.local/bin:${PATH}
-python3 -m pip install "git+https://osm.etsi.org/gerrit/osm/IM.git@${OSM_IM_VERSION}#egg=osm-im" --upgrade
-python3 -m pip install -r "https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=${OSM_CLIENT_VERSION}"
-python3 -m pip install git+https://osm.etsi.org/gerrit/osm/osmclient.git@${OSM_CLIENT_VERSION}#egg=osmclient
+#python3 -m pip install --user "git+https://osm.etsi.org/gerrit/osm/IM.git@${OSM_IM_VERSION}#egg=osm-im" --upgrade
+TMP_DIR=$(mktemp -d)
+git clone https://osm.etsi.org/gerrit/osm/IM.git "$TMP_DIR/IM"
+git -C "$TMP_DIR/IM" checkout "${OSM_IM_VERSION}"
+git -C "$TMP_DIR/IM" pull "https://osm.etsi.org/gerrit/osm/IM" refs/changes/15/15515/1
+python3 -m pip install --user "$TMP_DIR/IM"
+python3 -m pip install --user -r "https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=${OSM_CLIENT_VERSION}"
+python3 -m pip install --user git+https://osm.etsi.org/gerrit/osm/osmclient.git@${OSM_CLIENT_VERSION}#egg=osmclient
 echo "OSM client installed"
 
 popd