diff --git a/ToDoList.md b/ToDoList.md
index ee704a4..54ced20 100644
--- a/ToDoList.md
+++ b/ToDoList.md
@@ -1,8 +1,35 @@
 # ToDoList (not exhaustive)
 
-* Complete iptables roles and use it (maybe only for non-firewalld systems).
+* Complete iptables role for routers (FORWARD, NAT, ...).
+* Complete sysctl customizations role for routers (forward) and RA.
+* Create postfix (client) configuration.
 * Create backup roles (server and clients) + git clone --mirror of the GIT repositories to backup them.
-* Create monitoring roles (server and clients) : Icinga and Munin.
+* Create Icinga2 server and clients roles.
 * Add a pre-task which can install python-apt, gentoolkit or python-yum if not installed (with shell module).
-* Add roles for different function (DNS resolvers, VPN server, BGP router, ...)
+* Add roles for different function:
+  * **DNS authority**
+  * **DNS resolvers**
+  * **OpenVPN server**
+  * **Wireguard server (or tinc ?)**
+  * **BGP router**
+  * **Key server**
+  * **LDAP server**
+  * **Mail server**
+  * **DOH server**
+  * **Weechat + IRC Relay**
+  * GIT
+  * Pad/Paste/...
+  * Build server (Gentoo builds)
+  * Peertube
+  * Nextcloud
+  * Zabbix/LibreNMS/autres trucs à tester
+  * Tests (ex: restauration backup)
+  * Site Web
+  * Minecraft Server
+  * Kubernetes cluster
 
+## More...
+
+* Role munin-async: add possibility to deploy multiple SSH keys (if multiple Munin server).
+* Role munin-node: add some plugins / custom configurations for more details.
+* Test deploy all the infrastructure to validate ansible-base.