diff --git a/INSTALL/INSTALL.tpl.sh b/INSTALL/INSTALL.tpl.sh
index 69e3c9572..c101b369f 100755
--- a/INSTALL/INSTALL.tpl.sh
+++ b/INSTALL/INSTALL.tpl.sh
@@ -495,14 +495,13 @@ installMISPonKali () {
   cd ${PATH_TO_MISP}/app/files/scripts/python-stix
   ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/pip install .
 
-  debug "Install maec"
+  debug "Installing maec"
   cd ${PATH_TO_MISP}/app/files/scripts/python-maec
   ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/pip install .
 
-  # install STIX2.0 library to support STIX 2.0 export
-  debug "Installing cti-python-stix2"
-  # install STIX2.0 library to support STIX 2.0 export:
-  cd ${PATH_TO_MISP}/cti-python-stix2
+  # Install misp-stix
+  debug "Installing misp-stix"
+  cd ${PATH_TO_MISP}/app/files/scripts/misp-stix
   ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/pip install .
 
   debug "Installing mixbox"
@@ -530,7 +529,7 @@ installMISPonKali () {
   ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/pip install zmq
 
   debug "Installing cake"
-  composer
+  composer74
 
   ${SUDO_WWW} cp -fa ${PATH_TO_MISP}/INSTALL/setup/config.php ${PATH_TO_MISP}/app/Plugin/CakeResque/Config/config.php
 
diff --git a/docs/generic/upgrading.md b/docs/generic/upgrading.md
index 24b678c92..060e32202 100644
--- a/docs/generic/upgrading.md
+++ b/docs/generic/upgrading.md
@@ -46,8 +46,7 @@ sudo -H -u www-data ${PATH_TO_MISP}/venv/bin/pip install -U .
 cd $PATH_TO_MISP/app/files/scripts/python-maec
 sudo -u www-data git pull
 sudo -H -u www-data ${PATH_TO_MISP}/venv/bin/pip install -U .
-# install STIX2.0 library to support STIX 2.0 export:
-cd ${PATH_TO_MISP}/cti-python-stix2
+cd ${PATH_TO_MISP}/app/files/scripts/misp-stix
 sudo -H -u www-data ${PATH_TO_MISP}/venv/bin/pip install -I -U .
 
 # install mixbox to accommodate the new STIX dependencies:
diff --git a/docs/xINSTALL.OpenBSD.md b/docs/xINSTALL.OpenBSD.md
index fcfd4eee8..eed6b4009 100644
--- a/docs/xINSTALL.OpenBSD.md
+++ b/docs/xINSTALL.OpenBSD.md
@@ -353,20 +353,20 @@ cd /var/www/htdocs/MISP/app/files/scripts/python-maec
 $SUDO_WWW git config core.filemode false
 doas /usr/local/virtualenvs/MISP/bin/python setup.py install
 
-# install mixbox to accommodate the new STIX dependencies:
+# Install mixbox to accommodate the new STIX dependencies:
 cd /var/www/htdocs/MISP/app/files/scripts/mixbox
 $SUDO_WWW git config core.filemode false
 doas /usr/local/virtualenvs/MISP/bin/python setup.py install
 
-# install PyMISP
+# Install PyMISP
 cd /var/www/htdocs/MISP/PyMISP
 doas /usr/local/virtualenvs/MISP/bin/python setup.py install
 
-# install support for STIX 2.0
-cd /var/www/htdocs/MISP/cti-python-stix2
+# Install misp-stix
+cd /var/www/htdocs/MISP/app/files/scripts/misp-stix
 doas /usr/local/virtualenvs/MISP/bin/python setup.py install
 
-# install python-magic and pydeep
+# Install python-magic and pydeep
 doas /usr/local/virtualenvs/MISP/bin/pip install python-magic
 doas /usr/local/virtualenvs/MISP/bin/pip install git+https://github.com/kbandla/pydeep.git
 ```
diff --git a/docs/xINSTALL.centos7.md b/docs/xINSTALL.centos7.md
index b18015411..659cb27dc 100644
--- a/docs/xINSTALL.centos7.md
+++ b/docs/xINSTALL.centos7.md
@@ -200,8 +200,8 @@ cd ${PATH_TO_MISP}/app/files/scripts/mixbox
 $SUDO_WWW git config core.filemode false
 ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/pip install .
 
-# install STIX2.0 library to support STIX 2.0 export:
-cd ${PATH_TO_MISP}/cti-python-stix2
+# Install misp-stix
+cd ${PATH_TO_MISP}/app/files/scripts/misp-stix
 ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/pip install .
 
 # install PyMISP
diff --git a/docs/xINSTALL.debian10.md b/docs/xINSTALL.debian10.md
index e607758d3..b0be0f907 100644
--- a/docs/xINSTALL.debian10.md
+++ b/docs/xINSTALL.debian10.md
@@ -158,8 +158,7 @@ ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/pip install .
 cd ${PATH_TO_MISP}/app/files/scripts/python-maec
 $SUDO_WWW git config core.filemode false
 ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/pip install .
-# install STIX2.0 library to support STIX 2.0 export:
-cd ${PATH_TO_MISP}/cti-python-stix2
+cd ${PATH_TO_MISP}/app/files/scripts/misp-stix
 ${SUDO_WWW} ${PATH_TO_MISP}/venv/bin/pip install .
 
 # install PyMISP