diff --git a/baseimage/initializeBaseUbuntuImage.sh b/baseimage/initializeBaseUbuntuImage.sh
index cdb6dd39a..b999c48cc 100644
--- a/baseimage/initializeBaseUbuntuImage.sh
+++ b/baseimage/initializeBaseUbuntuImage.sh
@@ -200,9 +200,6 @@ cp -rf /tmp/box/installer/* "${INSTALLER_SOURCE_DIR}" && rm -rf /tmp/box
 chown "${USER}:${USER}" -R "${INSTALLER_SOURCE_DIR}"
 echo "${INSTALLER_REVISION}" > "${INSTALLER_SOURCE_DIR}/REVISION"
 
-echo "==== Install cloudron-version tool ===="
-npm install -g cloudron-version@0.1.1
-
 # Restore iptables before docker
 echo "==== Install iptables-restore systemd script ===="
 cat > /etc/systemd/system/iptables-restore.service <<EOF
diff --git a/scripts/cloudron-setup b/scripts/cloudron-setup
index 33ae59546..8d0404dfc 100755
--- a/scripts/cloudron-setup
+++ b/scripts/cloudron-setup
@@ -108,6 +108,10 @@ fi
 rm /tmp/initializeBaseUbuntuImage.sh
 
 echo "=> Checking version"
+if ! npm install -g cloudron-version@0.1.1 &>> "${LOG_FILE}"; then
+    echo "Failed to install cloudron-version npm package"
+    exit 1
+fi
 NPM_BIN=$(npm bin -g 2>/dev/null)
 if ! version=$(${NPM_BIN}/cloudron-version --out version --versions-url "${versionsUrl}" --version "${version}"); then
     echo "No such version ${version}"