diff --git a/installers/10-install-client-tools.sh b/installers/10-install-client-tools.sh
index 51153d1..c32bfb0 100755
--- a/installers/10-install-client-tools.sh
+++ b/installers/10-install-client-tools.sh
@@ -132,21 +132,27 @@
 # OSM client
 OSM_CLIENT_VERSION=${OSM_CLIENT_VERSION:-"master"}
 OSM_IM_VERSION=${OSM_IM_VERSION:-"master"}
-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 python3 python3-setuptools python3-dev python3-pip python3-venv
+sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libmagic1t64
 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y make
-python3 -m pip install --user -U pip
+
+python3 -m venv venv
+source venv/bin/activate
+python -m pip install -U pip
+
 # Install OSM IM and its dependencies via pip
-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}"
+pip install -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 --user "git+https://osm.etsi.org/gerrit/osm/IM.git@${OSM_IM_VERSION}#egg=osm-im" --upgrade
+#pip install "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" fetch "https://osm.etsi.org/gerrit/osm/IM" refs/changes/15/15515/1 && git -C "$TMP_DIR/IM" checkout FETCH_HEAD
-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
+pip install "$TMP_DIR/IM"
+pip install -r "https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=${OSM_CLIENT_VERSION}"
+pip install git+https://osm.etsi.org/gerrit/osm/osmclient.git@${OSM_CLIENT_VERSION}#egg=osmclient
+mkdir -p $HOME/.local/bin
+ln -s $HOME/venv/bin/osm $HOME/.local/bin/osm
 echo "OSM client installed"
 
 popd