diff --git a/PyMISP b/PyMISP
index 81f5d596a..190f82923 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit 81f5d596a7dd5cb1ca7213ac4fbdf07b402420b7
+Subproject commit 190f82923687cebaf06138724e7c03239e529cb4
diff --git a/app/files/scripts/misp-stix b/app/files/scripts/misp-stix
index daaee3ac5..260920bf7 160000
--- a/app/files/scripts/misp-stix
+++ b/app/files/scripts/misp-stix
@@ -1 +1 @@
-Subproject commit daaee3ac5cad8f0d182d25658860aee0b5cabed6
+Subproject commit 260920bf7c9d8f678b0d69730acb17e9a34811f2
diff --git a/tools/gen_misp_types_categories.py b/tools/gen_misp_types_categories.py
index 0bde31517..9a9388c07 100755
--- a/tools/gen_misp_types_categories.py
+++ b/tools/gen_misp_types_categories.py
@@ -87,7 +87,7 @@ def jq_file(fname):
 
 
 # verify if the folders exist before continuing
-folders = ['PyMISP', 'misp-book', 'misp-website', 'misp-rfc']
+folders = ['PyMISP', 'misp-book', 'misp-website-new', 'misp-rfc']
 for folder in folders:
     if not os.path.isdir('../../' + folder):
         exit("Make sure you git clone all the folders before running the script: {}".format(folders))
@@ -167,10 +167,10 @@ with open('../../misp-book/categories-and-types/README.md', 'w') as f:
 # Find the offset of the start header: "### MISP default attributes and categories"
 # Find the offset of the end/next header:  "## MISP objects"
 # Replace our new content in between
-print("Updating MISP website - ../../misp-website/content/datamodels.md")
+print("Updating MISP website - ../../misp-website-new/content/datamodels.md")
 misp_website = []
 store_lines = True
-with open('../../misp-website/content/datamodels.md', 'r') as f:
+with open('../../misp-website-new/content/datamodels.md', 'r') as f:
     for line in f:
         # start marker
         if store_lines:
@@ -183,7 +183,7 @@ with open('../../misp-website/content/datamodels.md', 'r') as f:
         elif line.startswith('## MISP objects'):
             store_lines = True
             misp_website.append(line)
-with open('../../misp-website/content/datamodels.md', 'w') as f:
+with open('../../misp-website-new/content/datamodels.md', 'w') as f:
     f.write(''.join(misp_website))