diff --git a/INSTALL/INSTALL.sh b/INSTALL/INSTALL.sh
index 20738c7bd..893ff5fe8 100755
--- a/INSTALL/INSTALL.sh
+++ b/INSTALL/INSTALL.sh
@@ -75,6 +75,8 @@
 # $ MISPvars
 MISPvars () {
   debug "Setting generic ${LBLUE}MISP${NC} variables shared by all flavours" 2> /dev/null
+  # Some distros have no openssl installed by default, catch that exception.
+  $(openssl help 2> /dev/null) || (echo "No openssl, please install to continue"; exit -1)
   # Local non-root MISP user
   MISP_USER="${MISP_USER:-misp}"
   MISP_PASSWORD="${MISP_PASSWORD:-$(openssl rand -hex 32)}"
@@ -2237,8 +2239,9 @@ enableEPEL_REMI_8 () {
   ([[ ${DISTRI} == "centos8stream" ]] || [[ ${DISTRI} == "centos8" ]] || [[ ${DISTRI} == "rocky8.4" ]]) && sudo dnf config-manager --set-enabled powertools
 }
 
-enableREMI_f33 () {
-  sudo dnf install http://rpms.remirepo.net/fedora/remi-release-33.rpm
+enableREMI_fedora () {
+  [[ "${DISTRI%??}" == "fedora" ]] && sudo dnf install http://rpms.remirepo.net/fedora/remi-release-${DISTRI:6}.rpm -y
+  [[ dnf list installed mod_lua ]] && sudo dnf remove mod_lua -y
   sudo dnf install dnf-utils -y
   sudo dnf module enable php:remi-7.4 -y
 }
@@ -2300,7 +2303,7 @@ yumInstallCoreDeps8 () {
                    policycoreutils-python-utils \
                    langpacks-en glibc-all-langpacks \
                    libxslt-devel zlib-devel ssdeep-devel -y
-  sudo alternatives --set python /usr/bin/python3
+  readlink -f /usr/bin/python | grep python3 || sudo alternatives --set python /usr/bin/python3
 
   # Enable and start redis
   sudo systemctl enable --now redis.service
@@ -2495,7 +2498,7 @@ installCoreRHEL8 () {
   cd $PATH_TO_MISP/app/files/scripts/python-cybox
   $SUDO_WWW git config core.filemode false
   # If you umask is has been changed from the default, it is a good idea to reset it to 0022 before installing python modules
-  ([[ ${DISTRI} == 'fedora33' ]] || [[ ${DISTRI} == 'rhel8.3' ]]) && sudo dnf install cmake3 -y && CMAKE_BIN='cmake3'
+  ([[ ${DISTRI} == 'fedora33' ]] || [[ ${DISTRI} == 'fedora34' ]] || [[ ${DISTRI} == 'rhel8.3' ]]) && sudo dnf install cmake3 -y && CMAKE_BIN='cmake3'
   ([[ ${DISTRI} == 'centos8stream' ]] || [[ ${DISTRI} == 'centos8' ]] || [[ ${DISTRI} == 'rocky8.4' ]]) && sudo dnf install cmake -y && CMAKE_BIN='cmake'
 
   UMASK=$(umask)
@@ -2914,7 +2917,7 @@ mispmodulesRHEL () {
   [[ "${DIST_VER}" =~ ^[7].* ]] && sudo dnf install openjpeg-devel gcc-c++ poppler-cpp-devel pkgconfig python3-devel redhat-rpm-config -y
 
   # some misp-modules dependencies for RHEL8
-  ([[ "${DISTRI}" == "fedora33" ]] || [[ "${DIST_VER}" =~ ^[8].* ]]) && sudo dnf install openjpeg2-devel gcc-c++ poppler-cpp-devel pkgconfig python3-devel redhat-rpm-config -y
+  ([[ "${DISTRI}" == "fedora33" ]] || [[ "${DISTRI}" == "fedora34" ]] || [[ "${DIST_VER}" =~ ^[8].* ]]) && sudo dnf install openjpeg2-devel gcc-c++ poppler-cpp-devel pkgconfig python3-devel redhat-rpm-config -y
 
   sudo chmod 2777 /usr/local/src
   sudo chown root:users /usr/local/src
@@ -3543,8 +3546,8 @@ installMISPRHEL () {
       apacheConfig_RHEL7
     fi
 
-    if [[ "${DISTRI}" == "fedora33" ]]; then
-      enableREMI_f33
+    if [[ "${DISTRI%??}" == "fedora" ]]; then
+      enableREMI_fedora
       yumInstallCoreDeps8
       installEntropyRHEL
       installCoreRHEL8
diff --git a/INSTALL/INSTALL.sh.sfv b/INSTALL/INSTALL.sh.sfv
index 2d4c8f003..50eafa5c5 100644
--- a/INSTALL/INSTALL.sh.sfv
+++ b/INSTALL/INSTALL.sh.sfv
@@ -1,5 +1,5 @@
-; Generated by RHash v1.4.0 on 2021-06-28 at 09:56.26
+; Generated by RHash v1.3.9 on 2021-07-02 at 13:02.58
 ; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
 ;
-;       162002  09:56.26 2021-06-28 INSTALL.sh
-INSTALL.sh 3F884909B77C2EDF13B539BDAA911B7036BC451A 18E32C5259D87866E89E279672ADEE443FACD06CEEECBB3CD6A700B1630CDB7D E21B44E1CC6E20281BDE51F38B37850E234354C84BA452247A8D74038E806DE0E492A3B3D6B83592E77F84839ADF74A7 1CFFF3650C140D56B8E2342733A6625B29A02562E95A5205A8B8502E6BF4812CCAF8FC3519EDBCA343CC659D23D9C881E23E9C7AB5F140EED12DAFD5678B70D3
+;       162404  13:02.58 2021-07-02 INSTALL.sh
+INSTALL.sh 1294D74733945902D131835D3470A6467D9C2B7C E2FE6E1298CF1808FE96D8B85B43C89AF05D3AA99DBDC5D41C5C22333C72335B ED34BA6488598898F3D7CB540DEC742AA0514CC01C2B9B49DDEA50A528F5069C34491919F7792461E834EC7091AA5866 0B7CEB3738A43C14E5F61AA0B00B2EC2A08C94889AA209A2F0562061261BD82961053CB5E6C4446BF08A891B95892E1E4A4E5A2984EB6AE0C154C1DE8770A6C4
diff --git a/INSTALL/INSTALL.sh.sha1 b/INSTALL/INSTALL.sh.sha1
index edce1c7b2..8b5aaef78 100644
--- a/INSTALL/INSTALL.sh.sha1
+++ b/INSTALL/INSTALL.sh.sha1
@@ -1 +1 @@
-3f884909b77c2edf13b539bdaa911b7036bc451a  INSTALL.sh
+1294d74733945902d131835d3470a6467d9c2b7c  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha256 b/INSTALL/INSTALL.sh.sha256
index 167d1a5a8..762bc5c04 100644
--- a/INSTALL/INSTALL.sh.sha256
+++ b/INSTALL/INSTALL.sh.sha256
@@ -1 +1 @@
-18e32c5259d87866e89e279672adee443facd06ceeecbb3cd6a700b1630cdb7d  INSTALL.sh
+e2fe6e1298cf1808fe96d8b85b43c89af05d3aa99dbdc5d41c5c22333c72335b  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha384 b/INSTALL/INSTALL.sh.sha384
index b3bd83e32..91b8c5b74 100644
--- a/INSTALL/INSTALL.sh.sha384
+++ b/INSTALL/INSTALL.sh.sha384
@@ -1 +1 @@
-e21b44e1cc6e20281bde51f38b37850e234354c84ba452247a8d74038e806de0e492a3b3d6b83592e77f84839adf74a7  INSTALL.sh
+ed34ba6488598898f3d7cb540dec742aa0514cc01c2b9b49ddea50a528f5069c34491919f7792461e834ec7091aa5866  INSTALL.sh
diff --git a/INSTALL/INSTALL.sh.sha512 b/INSTALL/INSTALL.sh.sha512
index 486387aa3..5c5440424 100644
--- a/INSTALL/INSTALL.sh.sha512
+++ b/INSTALL/INSTALL.sh.sha512
@@ -1 +1 @@
-1cfff3650c140d56b8e2342733a6625b29a02562e95a5205a8b8502e6bf4812ccaf8fc3519edbca343cc659d23d9c881e23e9c7ab5f140eed12dafd5678b70d3  INSTALL.sh
+0b7ceb3738a43c14e5f61aa0b00b2ec2a08c94889aa209a2f0562061261bd82961053cb5e6c4446bf08a891b95892e1e4a4e5a2984eb6ae0c154c1de8770a6c4  INSTALL.sh