diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh
index 5eb939907..9f79ef596 100755
--- a/INSTALL/INSTALL.sh
+++ b/INSTALL/INSTALL.sh
@@ -1084,6 +1084,9 @@ installCore () {
   # install python-magic
   $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install python-magic
 
+  # install plyara
+  $SUDO_WWW ${PATH_TO_MISP}/venv/bin/pip install plyara
+
   # Install Crypt_GPG and Console_CommandLine
   sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Console_CommandLine/package.xml
   sudo pear install ${PATH_TO_MISP}/INSTALL/dependencies/Crypt_GPG/package.xml
@@ -1581,11 +1584,17 @@ viper () {
   $SUDO_USER sed -i "s/^misp_key\ =/misp_key\ =\ $AUTH_KEY/g" ${VIPER_HOME}/viper.conf
   # Reset admin password to: admin/Password1234
   echo "Fixing admin.db with default password"
+  VIPER_COUNT=0
   while [ "$(sudo sqlite3 ${VIPER_HOME}/admin.db 'UPDATE auth_user SET password="pbkdf2_sha256$100000$iXgEJh8hz7Cf$vfdDAwLX8tko1t0M1TLTtGlxERkNnltUnMhbv56wK/U="'; echo $?)" -ne "0" ]; do
     # FIXME This might lead to a race condition, the while loop is sub-par
     sudo chown $MISP_USER:$MISP_USER ${VIPER_HOME}/admin.db
     echo "Updating viper-web admin password, giving process time to start-up, sleeping 5, 4, 3,…"
     sleep 6
+    VIPER_COUNT=$[$VIPER_COUNT+1]
+    if [[ "$VIPER_COUNT" > '10' ]]; then
+      echo "Something is wrong with updating viper. Continuing without db update."
+      break
+    fi
   done
 
   # Add viper-web to rc.local to be started on boot
diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1
index 30d65e71c..3e95e65f5 100644
--- a/INSTALL/INSTALL.sh.sha1
+++ b/INSTALL/INSTALL.sh.sha1
@@ -1 +1 @@
-1df66d811e99de4e2bc864707e6f3028c594e515  INSTALL.sh
+81a19d45ae7f499cfe34e35e2c3af93af58ecc9f  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256
index 420d1c0c3..a6833fa19 100644
--- a/INSTALL/INSTALL.sh.sha256
+++ b/INSTALL/INSTALL.sh.sha256
@@ -1 +1 @@
-ec15b8f47e26dd0604165c14d38728c5ef02db625d9b1fbe6b8e238f09447dd2  INSTALL.sh
+cb9ab4292ed6dac59884e4cf51f4a83a5525e499dfbc76a637f1d49811382280  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384
index b4b7403f7..cd48dbbef 100644
--- a/INSTALL/INSTALL.sh.sha384
+++ b/INSTALL/INSTALL.sh.sha384
@@ -1 +1 @@
-ed1af1ecd1140d330d1f775121bd5192f82f9a92f75f6fe0c611ca11968e81fd9c24de4af54635811bfaeadae8f55f70  INSTALL.sh
+0a807abd32d6d8f894d1466a0854b449c1bc53fde9b0fbb43582d007f48749c103c4b607f385a75c548a3422b5a9fd57  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512
index e7061e43e..dc77c1f12 100644
--- a/INSTALL/INSTALL.sh.sha512
+++ b/INSTALL/INSTALL.sh.sha512
@@ -1 +1 @@
-a5c87c821aaae9b23cb5842cb9cb907e4ac0b918e4ac3abe333fa38d88f08074d5389df05a945fbd52cfe5d83989d44a7a22e2bd9a9c45ddfc5ab16f1878fb25  INSTALL.sh
+4fa55166257b1438e503323d28ffc35cab19a7503709bac699393870ff2225899204f7263b583512e15e9214b912457ab52ab9281a957720c611bbdbc3b58815  INSTALL.sh
diff --git a/docs/generic/viper-debian.md b/docs/generic/viper-debian.md
index 729830abc..55041670b 100644
--- a/docs/generic/viper-debian.md
+++ b/docs/generic/viper-debian.md
@@ -49,11 +49,17 @@ viper () {
   $SUDO_USER sed -i "s/^misp_key\ =/misp_key\ =\ $AUTH_KEY/g" ${VIPER_HOME}/viper.conf
   # Reset admin password to: admin/Password1234
   echo "Fixing admin.db with default password"
+  VIPER_COUNT=0
   while [ "$(sudo sqlite3 ${VIPER_HOME}/admin.db 'UPDATE auth_user SET password="pbkdf2_sha256$100000$iXgEJh8hz7Cf$vfdDAwLX8tko1t0M1TLTtGlxERkNnltUnMhbv56wK/U="'; echo $?)" -ne "0" ]; do
     # FIXME This might lead to a race condition, the while loop is sub-par
     sudo chown $MISP_USER:$MISP_USER ${VIPER_HOME}/admin.db
     echo "Updating viper-web admin password, giving process time to start-up, sleeping 5, 4, 3,…"
     sleep 6
+    VIPER_COUNT=$[$VIPER_COUNT+1]
+    if [[ "$VIPER_COUNT" > '10' ]]; then
+      echo "Something is wrong with updating viper. Continuing without db update."
+      break
+    fi
   done
 
   # Add viper-web to rc.local to be started on boot