diff --git a/scripts/install.sh b/scripts/install.sh
index e23592f..0d1e121 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -35,7 +35,6 @@ else
     done
     venv="~/venvs"
 fi
-python3 -m pip --version > /dev/null 2>&1 || { echo "pip is not installed, please install pip for python3"; exit 1; }
 
 if [ "$what" = "server" ]; then
     echo "Installing heartbeat server (hbd)"
@@ -45,10 +44,14 @@ else
 fi
 if [ ! -d  $venv/hbd ]; then
     mkdir -p $venv
-    python3 -m venv $venv/hbd --system-site-packages
+    python3 -m venv $venv/hbd --system-site-packages --without-pip
+    . $venv/hbd/bin/activate
+    curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py
+    deactivate
+#  python3 -m pip --version > /dev/null 2>&1 || { echo "pip is not installed, please install pip for python3"; exit 1; }
 fi
 . $venv/hbd/bin/activate
-pip install --index-url https://git.wrede.ca/api/packages/andreas/pypi/simple/ --extra-index-url https://pypi.org/simple hbd[$what]
+pip install --upgrade --index-url https://git.wrede.ca/api/packages/andreas/pypi/simple/ --extra-index-url https://pypi.org/simple hbd[$what]
 if [ "$what" = "server" ]; then
     rm -f ~$where/hbd
     ln -sf $(which hbd) $where/hbd