diff --git a/Makefile b/Makefile
index cfd87b6e23..2cc28a9d6f 100644
--- a/Makefile
+++ b/Makefile
@@ -300,6 +300,8 @@ uorb_graphs:
 	@$(MAKE) --no-print-directory px4_fmu-v2_default uorb_graph
 	@$(MAKE) --no-print-directory px4_fmu-v4_default uorb_graph
 	@$(MAKE) --no-print-directory px4_fmu-v5_default uorb_graph
+	@$(MAKE) --no-print-directory px4_fmu-v5x_default uorb_graph
+	@$(MAKE) --no-print-directory px4_fmu-v6x_default uorb_graph
 	@$(MAKE) --no-print-directory px4_sitl_default uorb_graph
 
 px4io_update:
diff --git a/docs/public/middleware/index.html b/docs/public/middleware/index.html
index 7a8ad4e26d..aac0e5bf41 100644
--- a/docs/public/middleware/index.html
+++ b/docs/public/middleware/index.html
@@ -15,6 +15,8 @@
       </option>
       <option value="graph_full.json">All Modules</option>
       <option value="graph_px4_sitl.json">SITL Modules</option>
+      <option value="graph_px4_fmu-v6x.json">FMUv6x Modules</option>
+      <option value="graph_px4_fmu-v5x.json">FMUv5x Modules</option>
       <option value="graph_px4_fmu-v5.json">FMUv5 Modules</option>
       <option value="graph_px4_fmu-v4.json">FMUv4 Modules</option>
       <option value="graph_px4_fmu-v2.json">FMUv2 Modules</option>