diff --git a/Cargo.lock b/Cargo.lock
index dea8b8d87f6..1ce9a33ca69 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,22 +1,16 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
 [[package]]
 name = "adler2"
 version = "2.0.0"
@@ -25,9 +19,9 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "ahash"
-version = "0.8.7"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "getrandom",
@@ -38,18 +32,18 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "ammonia"
-version = "3.3.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e6d1c7838db705c9b756557ee27c384ce695a1c51a6fe528784cb1c6840170"
+checksum = "1ab99eae5ee58501ab236beb6f20f6ca39be615267b014899c89b2f0bc18a459"
 dependencies = [
  "html5ever",
  "maplit",
@@ -81,9 +75,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstream"
-version = "0.6.14"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -96,43 +90,43 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.4"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 
 [[package]]
 name = "appendlist"
@@ -170,18 +164,18 @@ dependencies = [
 
 [[package]]
 name = "askama_derive"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ccf09143e56923c12e027b83a9553210a3c58322ed8419a53461b14a4dccd85"
+checksum = "19fe8d6cb13c4714962c072ea496f3392015f0989b1a2847bb4b2d9effd71d83"
 dependencies = [
  "askama_parser",
  "basic-toml",
  "mime",
  "mime_guess",
- "proc-macro2 1.0.89",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
  "serde",
- "syn 2.0.85",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -192,9 +186,9 @@ checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341"
 
 [[package]]
 name = "askama_parser"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "262eb9cf7be51269c5f2951eeda9ccd14d6934e437457f47b4f066bf55a6770d"
+checksum = "acb1161c6b64d1c3d83108213c2a2533a342ac225aabd0bda218278c2ddb00c0"
 dependencies = [
  "nom",
 ]
@@ -211,13 +205,14 @@ dependencies = [
 
 [[package]]
 name = "assert_cmd"
-version = "2.0.12"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6"
+checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d"
 dependencies = [
  "anstyle",
  "bstr",
  "doc-comment",
+ "libc",
  "predicates",
  "predicates-core",
  "predicates-tree",
@@ -226,23 +221,23 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -253,9 +248,9 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
 [[package]]
 name = "base64"
-version = "0.21.6"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64"
@@ -265,9 +260,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "basic-toml"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2db21524cad41c5591204d22d75e1970a2d1f71060214ca931dc7d5afe2c14e5"
+checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8"
 dependencies = [
  "serde",
 ]
@@ -278,7 +273,16 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
 dependencies = [
- "bit-vec",
+ "bit-vec 0.6.3",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec 0.8.0",
 ]
 
 [[package]]
@@ -287,6 +291,12 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -316,13 +326,13 @@ checksum = "9672cb0edeadf721484e298c0ed4dd70b0eaa3acaed5b4fd0bd73ca32e51d814"
 dependencies = [
  "ahash",
  "appendlist",
- "base64 0.21.6",
+ "base64 0.21.7",
  "fluent-uri",
- "idna",
+ "idna 0.5.0",
  "once_cell",
  "percent-encoding",
  "regex",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.5",
  "serde",
  "serde_json",
  "url",
@@ -330,12 +340,12 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.9.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc"
+checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22"
 dependencies = [
  "memchr",
- "regex-automata 0.4.7",
+ "regex-automata 0.4.9",
  "serde",
 ]
 
@@ -353,9 +363,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "cast"
@@ -378,6 +388,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
 version = "0.4.38"
@@ -395,9 +411,9 @@ dependencies = [
 
 [[package]]
 name = "ciborium"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
 dependencies = [
  "ciborium-io",
  "ciborium-ll",
@@ -406,15 +422,15 @@ dependencies = [
 
 [[package]]
 name = "ciborium-io"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
 
 [[package]]
 name = "ciborium-ll"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
 dependencies = [
  "ciborium-io",
  "half",
@@ -422,9 +438,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.11"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
+checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -432,49 +448,49 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.11"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
+checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
 dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim 0.11.0",
- "terminal_size",
+ "strsim",
+ "terminal_size 0.4.0",
 ]
 
 [[package]]
 name = "clap_complete"
-version = "4.5.10"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbeb5ae3a578b7f639911ed31e98a48e16ef6f44e62d275184bb755a093fea55"
+checksum = "d9647a559c112175f17cf724dc72d3645680a883c58481332779192b0d8e7a01"
 dependencies = [
  "clap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.11"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
  "heck 0.5.0",
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
 
 [[package]]
 name = "cli-table"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adfbb116d9e2c4be7011360d0c0bee565712c11e969c9609b25b619366dc379d"
+checksum = "b53f9241f288a7b12c56565f04aaeaeeab6b8923d42d99255d4ca428b4d97f89"
 dependencies = [
  "cli-table-derive",
  "csv",
@@ -484,12 +500,12 @@ dependencies = [
 
 [[package]]
 name = "cli-table-derive"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2af3bfb9da627b0a6c467624fb7963921433774ed435493b5c08a3053e829ad4"
+checksum = "3e83a93253aaae7c74eb7428ce4faa6e219ba94886908048888701819f82fb94"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
  "syn 1.0.109",
 ]
 
@@ -505,9 +521,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "colored"
@@ -531,24 +547,24 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crc"
-version = "3.0.1"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
 dependencies = [
  "crc-catalog",
 ]
@@ -606,9 +622,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.12"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -638,6 +654,12 @@ version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -650,9 +672,9 @@ dependencies = [
 
 [[package]]
 name = "csv"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
+checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
 dependencies = [
  "csv-core",
  "itoa",
@@ -671,53 +693,54 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.130"
+version = "1.0.131"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c042a0ba58aaff55299632834d1ea53ceff73d62373f62c9ae60890ad1b942"
+checksum = "2568d7d2cfc051e43414fe1ef80c712cbcd60c3624d1ad1cb4b2572324d0a5d9"
 dependencies = [
  "cc",
  "cxxbridge-flags",
  "cxxbridge-macro",
+ "foldhash",
  "link-cplusplus",
 ]
 
 [[package]]
 name = "cxx-build"
-version = "1.0.130"
+version = "1.0.131"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45dc1c88d0fdac57518a9b1f6c4f4fb2aca8f3c30c0d03d7d8518b47ca0bcea6"
+checksum = "1674a8b80cdcce32512a75975d85d569b160f612ee1d31645bc46771f7c220a1"
 dependencies = [
  "cc",
  "codespan-reporting",
- "proc-macro2 1.0.89",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
  "scratch",
- "syn 2.0.85",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.130"
+version = "1.0.131"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa7ed7d30b289e2592cc55bc2ccd89803a63c913e008e6eb59f06cddf45bb52f"
+checksum = "0c710c27f23b7fa00c23aaee9e6fd3e79a6dffc5f5c6217487ec5213f51296b7"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.130"
+version = "1.0.131"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8c465d22de46b851c04630a5fc749a26005b263632ed2e0d9cc81518ead78d"
+checksum = "0aa53ef9fc54b986272efe83e257bbb417d1c3ceab1b732411d8c634fda572be"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
  "rustversion",
- "syn 2.0.85",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "darling"
-version = "0.20.8"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -725,27 +748,38 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.8"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "strsim 0.10.0",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "strsim",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.8"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
- "quote 1.0.35",
- "syn 2.0.85",
+ "quote 1.0.37",
+ "syn 2.0.89",
+]
+
+[[package]]
+name = "dbus"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
+dependencies = [
+ "libc",
+ "libdbus-sys",
+ "winapi",
 ]
 
 [[package]]
@@ -763,16 +797,16 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "diesel"
-version = "2.2.4"
+version = "2.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "158fe8e2e68695bd615d7e4f3227c0727b151330d3e253b525086c348d055d5e"
+checksum = "cbf9649c05e0a9dbd6d0b0b8301db5182b972d0fd02f0a7c6736cf632d7c0fd5"
 dependencies = [
  "bitflags 2.6.0",
  "byteorder",
@@ -791,9 +825,9 @@ checksum = "e7f2c3de51e2ba6bf2a648285696137aaf0f5f487bcbea93972fe8a364e131a4"
 dependencies = [
  "diesel_table_macro_syntax",
  "dsl_auto_type",
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -802,7 +836,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25"
 dependencies = [
- "syn 2.0.85",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -842,9 +876,9 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -862,16 +896,16 @@ dependencies = [
  "darling",
  "either",
  "heck 0.5.0",
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "elasticlunr-rs"
@@ -887,24 +921,34 @@ dependencies = [
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.33"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "env_filter"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+dependencies = [
+ "log 0.4.22",
+ "regex",
+]
+
 [[package]]
 name = "env_logger"
-version = "0.10.1"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
 dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
  "humantime",
- "is-terminal",
  "log 0.4.22",
- "regex",
- "termcolor",
 ]
 
 [[package]]
@@ -915,12 +959,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -937,20 +981,20 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 
 [[package]]
 name = "fancy-regex"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2"
+checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
 dependencies = [
- "bit-set",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.2",
+ "bit-set 0.8.0",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
 name = "fastrand"
-version = "2.0.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
 
 [[package]]
 name = "file-owner"
@@ -963,14 +1007,14 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.23"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
- "windows-sys 0.52.0",
+ "libredox",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -980,7 +1024,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -1007,6 +1051,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -1056,9 +1106,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1087,9 +1137,9 @@ checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1108,9 +1158,9 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -1127,9 +1177,9 @@ checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-timer"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 
 [[package]]
 name = "futures-util"
@@ -1161,9 +1211,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1172,9 +1222,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "glob"
@@ -1197,8 +1247,8 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "729f9bd3449d77e7831a18abfb7ba2f99ee813dfd15b8c2167c9a54ba20aa99d"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
  "syn 1.0.109",
 ]
 
@@ -1213,7 +1263,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.11",
+ "http 0.2.12",
  "indexmap",
  "slab",
  "tokio",
@@ -1223,38 +1273,43 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "1.8.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
 
 [[package]]
 name = "handlebars"
-version = "4.5.0"
+version = "6.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225"
+checksum = "fd4ccde012831f9a071a637b0d4e31df31c0f6c525784b35ae76a9ac6bc1e315"
 dependencies = [
  "log 0.4.22",
+ "num-order",
  "pest",
  "pest_derive",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
  "ahash",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.15.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
 name = "hashlink"
@@ -1262,7 +1317,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
 dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -1271,10 +1326,10 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
 dependencies = [
- "base64 0.21.6",
+ "base64 0.21.7",
  "bytes",
  "headers-core",
- "http 0.2.11",
+ "http 0.2.12",
  "httpdate",
  "mime",
  "sha1",
@@ -1286,7 +1341,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
 dependencies = [
- "http 0.2.11",
+ "http 0.2.12",
 ]
 
 [[package]]
@@ -1303,9 +1358,15 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 
 [[package]]
 name = "hex"
@@ -1335,23 +1396,23 @@ dependencies = [
 
 [[package]]
 name = "html5ever"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
+checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4"
 dependencies = [
  "log 0.4.22",
  "mac",
  "markup5ever",
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 1.0.109",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -1376,7 +1437,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
- "http 0.2.11",
+ "http 0.2.12",
  "pin-project-lite",
 ]
 
@@ -1405,9 +1466,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -1432,16 +1493,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.28"
+version = "0.14.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
  "h2",
- "http 0.2.11",
+ "http 0.2.12",
  "http-body 0.4.6",
  "httparse",
  "httpdate",
@@ -1456,9 +1517,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
+checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1480,7 +1541,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper 0.14.28",
+ "hyper 0.14.31",
  "native-tls",
  "tokio",
  "tokio-native-tls",
@@ -1494,7 +1555,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.5.0",
+ "hyper 1.5.1",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -1513,7 +1574,7 @@ dependencies = [
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.1",
- "hyper 1.5.0",
+ "hyper 1.5.1",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -1544,6 +1605,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1560,23 +1739,44 @@ dependencies = [
  "unicode-normalization",
 ]
 
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
 [[package]]
 name = "include_dir"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e"
+checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
 dependencies = [
  "include_dir_macros",
 ]
 
 [[package]]
 name = "include_dir_macros"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f"
+checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
 ]
 
 [[package]]
@@ -1586,16 +1786,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.1",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
 name = "inotify"
-version = "0.10.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
+checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "futures-core",
  "inotify-sys",
  "libc",
@@ -1611,39 +1811,28 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.10"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455"
+checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
 dependencies = [
- "hermit-abi",
- "rustix 0.38.34",
+ "hermit-abi 0.4.0",
+ "libc",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.0"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "itertools"
@@ -1654,15 +1843,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -1674,36 +1854,57 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.10"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "js-sys"
-version = "0.3.66"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.164"
+version = "0.2.166"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36"
+
+[[package]]
+name = "libdbus-sys"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
+checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+ "redox_syscall",
+]
 
 [[package]]
 name = "libsqlite3-sys"
@@ -1727,21 +1928,21 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
-name = "linux-raw-sys"
-version = "0.4.12"
+name = "litemap"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1792,9 +1993,9 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
 [[package]]
 name = "markup5ever"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
+checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45"
 dependencies = [
  "log 0.4.22",
  "phf",
@@ -1815,9 +2016,9 @@ dependencies = [
 
 [[package]]
 name = "mdbook"
-version = "0.4.36"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80992cb0e05f22cc052c99f8e883f1593b891014b96a8b4637fd274d7030c85e"
+checksum = "fe1f98b8d66e537d2f0ba06e7dec4f44001deec539a2d18bfc102d6a86189148"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -1831,7 +2032,6 @@ dependencies = [
  "memchr",
  "once_cell",
  "opener",
- "pathdiff",
  "pulldown-cmark",
  "regex",
  "serde",
@@ -1865,9 +2065,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "mime_guess"
-version = "2.0.4"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
 dependencies = [
  "mime",
  "unicase",
@@ -1907,15 +2107,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.0"
@@ -1927,13 +2118,14 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
+ "hermit-abi 0.3.9",
  "libc",
  "wasi",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1948,11 +2140,10 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
- "lazy_static",
  "libc",
  "log 0.4.22",
  "openssl",
@@ -1966,18 +2157,19 @@ dependencies = [
 
 [[package]]
 name = "new_debug_unreachable"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "nix"
-version = "0.27.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
+ "cfg_aliases",
  "libc",
 ]
 
@@ -1999,11 +2191,11 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
 [[package]]
 name = "normpath"
-version = "1.1.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5"
+checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2032,62 +2224,68 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
 [[package]]
-name = "num-traits"
-version = "0.2.17"
+name = "num-modular"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17bb261bf36fa7d83f4c294f834e91256769097b3cb505d44831e0a179ac647f"
+
+[[package]]
+name = "num-order"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "537b596b97c40fcf8056d153049eb22f481c17ebce72a513ec9286e4986d1bb6"
 dependencies = [
- "autocfg",
- "libm",
+ "num-modular",
 ]
 
 [[package]]
-name = "num_cpus"
-version = "1.16.0"
+name = "num-traits"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
- "hermit-abi",
- "libc",
+ "autocfg",
+ "libm",
 ]
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "oorandom"
-version = "11.1.3"
+version = "11.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
 
 [[package]]
 name = "opener"
-version = "0.6.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c62dcb6174f9cb326eac248f07e955d5d559c272730b6c03e396b443b562788"
+checksum = "d0812e5e4df08da354c851a3376fead46db31c2214f849d3de356d774d057681"
 dependencies = [
  "bstr",
+ "dbus",
  "normpath",
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "openssl"
-version = "0.10.66"
+version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
@@ -2104,9 +2302,9 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -2117,9 +2315,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.103"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
@@ -2135,9 +2333,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -2145,15 +2343,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2162,12 +2360,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -2176,20 +2368,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.6"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06"
+checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
 dependencies = [
  "memchr",
- "thiserror",
+ "thiserror 1.0.69",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.7.6"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcd6ab1236bbdb3a49027e920e693192ebfe8913f6d60e294de57463a493cfde"
+checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd"
 dependencies = [
  "pest",
  "pest_generator",
@@ -2197,22 +2389,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.6"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a31940305ffc96863a735bef7c7994a00b325a7138fdbc5bda0f1a0476d3275"
+checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.6"
+version = "2.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7ff62f5259e53b78d1af898941cdcdccfae7385cf7d793a6e55de5d05bb4b7d"
+checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d"
 dependencies = [
  "once_cell",
  "pest",
@@ -2221,21 +2413,21 @@ dependencies = [
 
 [[package]]
 name = "phf"
-version = "0.10.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
 dependencies = [
- "phf_shared",
+ "phf_shared 0.11.2",
 ]
 
 [[package]]
 name = "phf_codegen"
-version = "0.10.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
+checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a"
 dependencies = [
- "phf_generator",
- "phf_shared",
+ "phf_generator 0.11.2",
+ "phf_shared 0.11.2",
 ]
 
 [[package]]
@@ -2244,7 +2436,17 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
 dependencies = [
- "phf_shared",
+ "phf_shared 0.10.0",
+ "rand",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared 0.11.2",
  "rand",
 ]
 
@@ -2257,31 +2459,40 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
+
 [[package]]
 name = "pin-project"
-version = "1.1.3"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -2291,15 +2502,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.28"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "plotters"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -2310,15 +2521,15 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
 dependencies = [
  "plotters-backend",
 ]
@@ -2331,15 +2542,18 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "pq-sys"
-version = "0.4.8"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c0052426df997c0cbd30789eb44ca097e3541717a7b8fa36b1c464ee7edebd"
+checksum = "f6cc05d7ea95200187117196eee9edd0644424911821aeb28a18ce60ea0b8793"
 dependencies = [
  "vcpkg",
 ]
@@ -2352,14 +2566,13 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "predicates"
-version = "3.0.4"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0"
+checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97"
 dependencies = [
  "anstyle",
  "difflib",
  "float-cmp",
- "itertools 0.11.0",
  "normalize-line-endings",
  "predicates-core",
  "regex",
@@ -2367,15 +2580,15 @@ dependencies = [
 
 [[package]]
 name = "predicates-core"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
+checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
+checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"
 dependencies = [
  "predicates-core",
  "termtree",
@@ -2383,9 +2596,9 @@ dependencies = [
 
 [[package]]
 name = "pretty_assertions"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
 dependencies = [
  "diff",
  "yansi",
@@ -2397,7 +2610,7 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit 0.22.22",
+ "toml_edit",
 ]
 
 [[package]]
@@ -2411,31 +2624,41 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "procfs"
-version = "0.14.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69"
+checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
 dependencies = [
- "bitflags 1.3.2",
- "byteorder",
+ "bitflags 2.6.0",
+ "hex",
+ "lazy_static",
+ "procfs-core",
+ "rustix",
+]
+
+[[package]]
+name = "procfs-core"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
+dependencies = [
+ "bitflags 2.6.0",
  "hex",
- "lazy_static",
- "rustix 0.36.17",
 ]
 
 [[package]]
 name = "prometheus"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
+checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
 dependencies = [
  "cfg-if",
  "fnv",
@@ -2444,24 +2667,24 @@ dependencies = [
  "memchr",
  "parking_lot",
  "procfs",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "proptest"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
+checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
 dependencies = [
- "bit-set",
- "bit-vec",
+ "bit-set 0.5.3",
+ "bit-vec 0.6.3",
  "bitflags 2.6.0",
  "lazy_static",
  "num-traits",
  "rand",
  "rand_chacha",
  "rand_xorshift",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.5",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -2469,15 +2692,22 @@ dependencies = [
 
 [[package]]
 name = "pulldown-cmark"
-version = "0.9.3"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998"
+checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "memchr",
+ "pulldown-cmark-escape",
  "unicase",
 ]
 
+[[package]]
+name = "pulldown-cmark-escape"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd348ff538bc9caeda7ee8cad2d1d48236a1f443c1fa3913c6a02fe0043b1dd3"
+
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -2486,9 +2716,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quick-xml"
-version = "0.36.2"
+version = "0.37.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
+checksum = "f22f29bdff3987b4d8632ef95fd6424ec7e4e0a57e2f4fc63e489e75357f6a03"
 dependencies = [
  "memchr",
  "serde",
@@ -2505,11 +2735,11 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
- "proc-macro2 1.0.89",
+ "proc-macro2 1.0.92",
 ]
 
 [[package]]
@@ -2564,9 +2794,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -2574,9 +2804,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -2584,23 +2814,23 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.2",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -2614,13 +2844,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -2631,31 +2861,31 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "relative-path"
-version = "1.9.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc"
+checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 
 [[package]]
 name = "reqwest"
-version = "0.11.23"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
- "base64 0.21.6",
+ "base64 0.21.7",
  "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
  "h2",
- "http 0.2.11",
+ "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.28",
+ "hyper 0.14.31",
  "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
@@ -2665,9 +2895,11 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
+ "rustls-pemfile 1.0.4",
  "serde",
  "serde_json",
  "serde_urlencoded",
+ "sync_wrapper 0.1.2",
  "system-configuration",
  "tokio",
  "tokio-native-tls",
@@ -2695,7 +2927,7 @@ dependencies = [
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.5.0",
+ "hyper 1.5.1",
  "hyper-tls 0.6.0",
  "hyper-util",
  "ipnet",
@@ -2710,7 +2942,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 1.0.2",
  "tokio",
  "tokio-native-tls",
  "tower-service",
@@ -2729,9 +2961,9 @@ checksum = "194d8e591e405d1eecf28819740abed6d719d1a2db87fc0bcdedee9a26d55560"
 
 [[package]]
 name = "rstest"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b423f0e62bdd61734b67cd21ff50871dfaeb9cc74f869dcd6af974fbcb19936"
+checksum = "0a2c585be59b6b5dd66a9d2084aa1d8bd52fbdb806eafdeffb52791147862035"
 dependencies = [
  "futures",
  "futures-timer",
@@ -2741,19 +2973,19 @@ dependencies = [
 
 [[package]]
 name = "rstest_macros"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e1711e7d14f74b12a58411c542185ef7fb7f2e7f8ee6e2940a883628522b42"
+checksum = "825ea780781b15345a146be27eaefb05085e337e869bff01b4306a4fd4a9ad5a"
 dependencies = [
  "cfg-if",
  "glob",
  "proc-macro-crate",
- "proc-macro2 1.0.89",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.85",
+ "syn 2.0.89",
  "unicode-ident",
 ]
 
@@ -2830,7 +3062,7 @@ dependencies = [
  "reqwest 0.12.9",
  "rstest",
  "rudder_cli",
- "secrecy 0.10.3",
+ "secrecy",
  "serde",
  "serde_ini",
  "serde_json",
@@ -2859,7 +3091,7 @@ dependencies = [
  "futures",
  "hex",
  "humantime",
- "hyper 0.14.28",
+ "hyper 0.14.31",
  "inotify",
  "lazy_static",
  "nom",
@@ -2869,16 +3101,17 @@ dependencies = [
  "prometheus",
  "proptest",
  "regex",
- "reqwest 0.11.23",
- "secrecy 0.8.0",
+ "reqwest 0.11.27",
+ "secrecy",
  "serde",
+ "serde-inline-default",
  "serde_json",
  "sha2",
  "tempfile",
- "thiserror",
+ "thiserror 2.0.3",
  "tokio",
  "tokio-stream",
- "toml 0.8.8",
+ "toml 0.8.19",
  "tracing",
  "tracing-subscriber",
  "walkdir",
@@ -2971,7 +3204,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
- "strsim 0.11.0",
+ "strsim",
  "tempfile",
  "test-generator",
  "tracing",
@@ -3003,48 +3236,34 @@ dependencies = [
  "cxx",
  "cxx-build",
  "paste",
- "terminal_size",
+ "terminal_size 0.3.0",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.36.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "305efbd14fde4139eb501df5f136994bb520b033fa9fbdce287507dc23b8c7ed"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.1.4",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.34"
+version = "0.38.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.12",
+ "linux-raw-sys",
  "windows-sys 0.52.0",
 ]
 
@@ -3054,7 +3273,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
- "base64 0.21.6",
+ "base64 0.21.7",
 ]
 
 [[package]]
@@ -3074,9 +3293,9 @@ checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
 
 [[package]]
 name = "rustversion"
-version = "1.0.14"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
 
 [[package]]
 name = "rusty-fork"
@@ -3092,9 +3311,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.16"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -3107,11 +3326,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3141,16 +3360,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152"
 
-[[package]]
-name = "secrecy"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e"
-dependencies = [
- "serde",
- "zeroize",
-]
-
 [[package]]
 name = "secrecy"
 version = "0.10.3"
@@ -3163,11 +3372,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.9.2"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -3176,9 +3385,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3186,15 +3395,15 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.214"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
@@ -3210,15 +3419,26 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "serde-inline-default"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3acbd21cb24261fc36f595b38d3b34d0ff4e31a6b42edd6a43387d27c5787c8"
+dependencies = [
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
+]
+
 [[package]]
 name = "serde_derive"
-version = "1.0.214"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -3234,9 +3454,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.132"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "itoa",
  "memchr",
@@ -3246,9 +3466,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -3317,9 +3537,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
@@ -3353,12 +3573,12 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.5.5"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3372,6 +3592,12 @@ dependencies = [
  "strum",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "stdio-override"
 version = "0.1.3"
@@ -3390,7 +3616,7 @@ dependencies = [
  "new_debug_unreachable",
  "once_cell",
  "parking_lot",
- "phf_shared",
+ "phf_shared 0.10.0",
  "precomputed-hash",
  "serde",
 ]
@@ -3401,23 +3627,17 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
 dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2 1.0.89",
- "quote 1.0.35",
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
 ]
 
 [[package]]
 name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "strsim"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "strum"
@@ -3435,8 +3655,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.89",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
  "rustversion",
  "syn 1.0.109",
 ]
@@ -3458,36 +3678,53 @@ version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.85"
+version = "2.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
  "unicode-ident",
 ]
 
 [[package]]
 name = "sync_wrapper"
-version = "1.0.1"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
+]
+
 [[package]]
 name = "sysinfo"
-version = "0.31.4"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be"
+checksum = "4c33cd241af0f2e9e3b5c32163b873b29956890b5342e6745b917ce9d490f4af"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3520,9 +3757,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.40"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
+checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6"
 dependencies = [
  "filetime",
  "libc",
@@ -3531,15 +3768,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.9.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
  "fastrand",
- "redox_syscall",
- "rustix 0.38.34",
- "windows-sys 0.52.0",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3568,10 +3805,20 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
- "rustix 0.38.34",
+ "rustix",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "terminal_size"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
+dependencies = [
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "termtree"
 version = "0.4.1"
@@ -3591,29 +3838,49 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.65"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+dependencies = [
+ "thiserror-impl 2.0.3",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "thiserror-impl",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.65"
+version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
+checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -3650,6 +3917,16 @@ dependencies = [
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinytemplate"
 version = "1.2.1"
@@ -3662,9 +3939,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -3677,31 +3954,30 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.1"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
- "num_cpus",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -3716,9 +3992,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -3727,16 +4003,15 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
@@ -3750,14 +4025,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.8"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.21.0",
+ "toml_edit",
 ]
 
 [[package]]
@@ -3769,19 +4044,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow 0.5.34",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.22.22"
@@ -3789,8 +4051,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
+ "serde",
+ "serde_spanned",
  "toml_datetime",
- "winnow 0.6.20",
+ "winnow",
 ]
 
 [[package]]
@@ -3801,15 +4065,15 @@ checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log 0.4.22",
  "pin-project-lite",
@@ -3824,27 +4088,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf"
 dependencies = [
  "crossbeam-channel",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "tracing-subscriber",
 ]
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -3906,9 +4170,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "uname-rs"
@@ -3924,45 +4188,42 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
 [[package]]
 name = "unicase"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.14"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-xid"
@@ -3978,12 +4239,12 @@ checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
- "idna",
+ "idna 1.0.3",
  "percent-encoding",
 ]
 
@@ -3993,17 +4254,29 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.6.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "getrandom",
 ]
@@ -4022,9 +4295,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "void"
@@ -4043,9 +4316,9 @@ dependencies = [
 
 [[package]]
 name = "walkdir"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -4062,28 +4335,26 @@ dependencies = [
 
 [[package]]
 name = "warp"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e92e22e03ff1230c03a1a8ee37d2f89cd489e2e541b7550d6afad96faed169"
+checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
  "headers",
- "http 0.2.11",
- "hyper 0.14.28",
+ "http 0.2.12",
+ "hyper 0.14.31",
  "log 0.4.22",
  "mime",
  "mime_guess",
  "percent-encoding",
  "pin-project",
- "rustls-pemfile 1.0.4",
  "scoped-tls",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "tokio",
- "tokio-stream",
  "tokio-util",
  "tower-service",
  "tracing",
@@ -4097,34 +4368,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.89"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.89"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log 0.4.22",
  "once_cell",
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.39"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4134,38 +4406,38 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.89"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
- "quote 1.0.35",
+ "quote 1.0.37",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.89"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.89"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasm-streams"
-version = "0.3.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -4176,9 +4448,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.66"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4186,13 +4458,13 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "6.0.3"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
+checksum = "c9cad3279ade7346b96e38731a641d7343dd6a53d55083dd54eadfa5a1b38c6b"
 dependencies = [
  "either",
  "home",
- "rustix 0.38.34",
+ "rustix",
  "winsafe",
 ]
 
@@ -4214,11 +4486,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4274,9 +4546,9 @@ version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -4285,9 +4557,9 @@ version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -4329,15 +4601,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -4357,18 +4620,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-targets"
-version = "0.42.2"
+name = "windows-sys"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4402,12 +4659,6 @@ dependencies = [
  "windows_x86_64_msvc 0.52.6",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -4420,12 +4671,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -4438,12 +4683,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -4462,12 +4701,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -4480,12 +4713,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -4498,12 +4725,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -4516,12 +4737,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -4534,15 +4749,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "winnow"
-version = "0.5.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winnow"
 version = "0.6.20"
@@ -4568,54 +4774,134 @@ version = "0.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "xattr"
-version = "1.2.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914566e6413e7fa959cc394fb30e563ba80f3541fbd40816d4c05a0fc3f2a0f1"
+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
 dependencies = [
  "libc",
- "linux-raw-sys 0.4.12",
- "rustix 0.38.34",
+ "linux-raw-sys",
+ "rustix",
 ]
 
 [[package]]
 name = "yansi"
-version = "0.5.1"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
+ "synstructure",
+]
 
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
- "proc-macro2 1.0.89",
- "quote 1.0.35",
- "syn 2.0.85",
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
+ "synstructure",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2 1.0.92",
+ "quote 1.0.37",
+ "syn 2.0.89",
+]
 
 [[package]]
 name = "zip"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
+checksum = "99d52293fc86ea7cf13971b3bb81eb21683636e7ae24c729cdaf1b7c4157a352"
 dependencies = [
  "arbitrary",
  "crc32fast",
@@ -4624,7 +4910,7 @@ dependencies = [
  "flate2",
  "indexmap",
  "memchr",
- "thiserror",
+ "thiserror 2.0.3",
  "time",
  "zopfli",
 ]
diff --git a/Jenkinsfile b/Jenkinsfile
index 22b84d4afe5..bb519f70b6e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
 
 def failedBuild = false
-def version = "8.2"
+def version = "8.3"
 
 def slackResponse = null
 def changeUrl = env.CHANGE_URL
@@ -345,7 +345,9 @@ pipeline {
                     agent {
                         dockerfile {
                             filename 'policies/Dockerfile'
-                            additionalBuildArgs  "--build-arg USER_ID=${env.JENKINS_UID} --build-arg RUDDER_VER=${env.RUDDER_VERSION}-nightly --build-arg PSANALYZER_VER=1.20.0"
+                            // no 8.3 build for now
+                            additionalBuildArgs  "--build-arg USER_ID=${env.JENKINS_UID} --build-arg RUDDER_VER=8.2-nightly --build-arg PSANALYZER_VER=1.20.0"
+                            //additionalBuildArgs  "--build-arg USER_ID=${env.JENKINS_UID} --build-arg RUDDER_VER=${env.RUDDER_VERSION}-nightly --build-arg PSANALYZER_VER=1.20.0"
                             // mount cache
                             args '-v /srv/cache/cargo:/usr/local/cargo/registry -v /srv/cache/sccache:/home/jenkins/.cache/sccache -v /srv/cache/cargo-vet:/home/jenkins/.cache/cargo-vet'
                         }
diff --git a/Jenkinsfile-security b/Jenkinsfile-security
index 6f50dbc3eb1..08dd12b126d 100644
--- a/Jenkinsfile-security
+++ b/Jenkinsfile-security
@@ -1,6 +1,6 @@
 
 
-def version = "8.2"
+def version = "8.3"
 def slackResponse = null
 
 def errors = []
diff --git a/README.md b/README.md
index 9f3e571da4f..bb228cdd4d5 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 <h1 align="center">
     <a href="https://www.rudder.io" target="blank_">
           <picture>
-              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/Normation/rudder/master/logo/rudder-logo-rect-white.svg">
-              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/Normation/rudder/master/logo/rudder-logo-rect-black.svg">
-              <img height="100" alt="Rudder logo" src="https://raw.githubusercontent.com/Normation/rudder/master/logo/rudder-logo-rect-black.svg">
+              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/Normation/rudder/master/logo/icons/svg/rudder-logo-rect-white.svg">
+              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/Normation/rudder/master/logo/icons/svg/rudder-logo-rect-black.svg">
+              <img height="100" alt="Rudder logo" src="https://raw.githubusercontent.com/Normation/rudder/master/logo/icons/svg/rudder-logo-rect-black.svg">
         </picture>
     </a>
     <br>
diff --git a/api-doc/Makefile b/api-doc/Makefile
index 9c3171c0598..f3e7a86286c 100644
--- a/api-doc/Makefile
+++ b/api-doc/Makefile
@@ -10,7 +10,7 @@ $(API): clean
 	mkdir -p build target/$@
 	cp -r ../$@/sources/api-doc build/$@
 	mkdir -p build/$@/assets
-	cp -r assets/. build/$@/assets
+	cp ../logo/icons/svg/rudder-logo-rect-*.svg build/$@/assets/
 	cp node_modules/rapidoc/dist/rapidoc-min.js build/$@/assets/
 	cp -r rapidoc.html build/$@/
 	./build.py $@ build target
diff --git a/api-doc/assets/rudder-white.svg b/api-doc/assets/rudder-white.svg
deleted file mode 100644
index 587b8314d37..00000000000
--- a/api-doc/assets/rudder-white.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 1300 300"
-   height="300"
-   width="1300"
-   xml:space="preserve"
-   id="svg2"
-   version="1.1"
-   sodipodi:docname="logo-rudder-2021-white.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1848"
-     inkscape:window-height="1016"
-     id="namedview9"
-     showgrid="false"
-     inkscape:zoom="0.37384615"
-     inkscape:cx="630.67473"
-     inkscape:cy="209.76215"
-     inkscape:window-x="750"
-     inkscape:window-y="1107"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" /><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs6" /><g
-     transform="matrix(1.3333333,0,0,1.3333333,0,7.5e-6)"
-     id="g10"><g
-       id="g12"><path
-         id="path16"
-         style="fill:#13beb7;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 141.797,18.77 c -51.836,0 -93.856,41.964 -93.859,93.726 0,24.859 9.89,48.703 27.492,66.281 17.601,17.578 41.472,27.453 66.367,27.453 24.891,-0.003 48.762,-9.878 66.363,-27.457 17.602,-17.578 27.488,-41.418 27.488,-66.277 -0.039,-23.273 -8.75,-45.699 -24.433,-62.914 l -61.246,68.184 c -1.871,1.882 -4.344,2.816 -6.809,2.816 -2.465,0 -4.941,-0.934 -6.812,-2.816 -3.766,-3.758 -3.766,-9.852 0,-13.614 L 204.617,43.004 C 187.398,27.445 165.016,18.809 141.797,18.77 Z m -15.738,34.312 c 2.691,6.012 8.718,10.199 15.742,10.199 7.011,0 13.043,-4.187 15.734,-10.199 5.395,1.43 10.485,3.574 15.199,6.313 -0.609,1.566 -0.945,3.207 -1.074,4.843 l -20.578,17.891 c -2.949,-0.91 -6.059,-1.387 -9.281,-1.387 -17.535,0 -31.801,14.238 -31.801,31.766 0,17.5 14.266,31.75 31.801,31.75 17.527,0 31.797,-14.25 31.797,-31.75 0,-3.383 -0.543,-6.629 -1.516,-9.68 l 17.547,-20.156 c 1.82,-0.074 3.613,-0.418 5.344,-1.059 2.742,4.692 4.89,9.782 6.316,15.157 -6.012,2.703 -10.203,8.722 -10.203,15.738 0,7.004 4.191,13.019 10.203,15.707 -1.426,5.39 -3.574,10.473 -6.316,15.168 -6.153,-2.321 -13.368,-1.035 -18.325,3.91 -4.96,4.961 -6.253,12.152 -3.914,18.309 -4.714,2.738 -9.804,4.886 -15.199,6.308 -2.691,-6.004 -8.723,-10.195 -15.734,-10.195 -7.024,0 -13.051,4.191 -15.742,10.195 -5.399,-1.422 -10.489,-3.57 -15.188,-6.308 2.336,-6.157 1.035,-13.348 -3.93,-18.309 -4.937,-4.945 -12.16,-6.231 -18.312,-3.91 -2.754,-4.695 -4.887,-9.778 -6.328,-15.168 6.015,-2.688 10.211,-8.703 10.211,-15.707 0,-7.016 -4.196,-13.035 -10.211,-15.723 1.441,-5.387 3.574,-10.48 6.328,-15.172 6.152,2.321 13.375,1.035 18.312,-3.929 4.965,-4.946 6.266,-12.145 3.93,-18.289 4.699,-2.739 9.789,-4.883 15.188,-6.313 z" /></g></g><path
-     id="path18-2"
-     d="m 792.01033,60.024596 v 68.821794 c -3.63596,-6.78127 -9.00037,-12.2193 -16.10959,-16.31788 -7.1039,-4.26128 -14.99404,-6.38683 -23.68192,-6.38683 -10.7345,0 -20.20845,2.83853 -28.41767,8.51582 -8.21323,5.6719 -14.68634,13.40212 -19.42094,23.17797 -4.73994,9.6199 -7.10366,20.49905 -7.10366,32.63884 0,9.14663 1.41549,17.6576 4.25943,25.54285 2.84397,7.88511 6.87044,14.74262 12.07837,20.57579 5.36923,5.83328 11.60411,10.40675 18.71333,13.7187 7.2599,3.15197 15.15536,4.72968 23.68191,4.72968 8.36385,0 16.33904,-1.89115 23.91625,-5.67777 7.58388,-3.77995 13.58366,-9.53512 17.9996,-17.2644 l 0.71373,6.38534 c 0.948,5.04658 3.39537,8.98846 7.33801,11.82715 4.10925,2.83861 9.39608,4.25641 15.87064,4.25641 4.10394,0 9.47288,-0.63009 16.10345,-1.89004 v -31.45948 c -2.83863,-0.31203 -4.89026,-1.1817 -6.15559,-2.59763 -1.26664,-1.57873 -1.89613,-4.25972 -1.89613,-8.04099 V 60.024596 Z m 154.88816,0 v 68.821794 c -3.6359,-6.78127 -9.00031,-12.2193 -16.10954,-16.31788 -7.10388,-4.26128 -14.99409,-6.38683 -23.68197,-6.38683 -10.73445,0 -20.20746,2.83853 -28.42067,8.51582 -8.20925,5.6719 -14.68335,13.40212 -19.41798,23.17797 -4.73989,9.6199 -7.10363,20.49905 -7.10363,32.63884 0,9.14663 1.41549,17.6576 4.25945,25.54285 2.84395,7.88511 6.87044,14.74262 12.07833,20.57579 5.3693,5.83328 11.60415,10.40675 18.71338,13.7187 7.25987,3.15197 15.1569,4.72968 23.68346,4.72968 8.36385,0 16.3375,-1.89115 23.91473,-5.67777 7.58389,-3.77995 13.58365,-9.53512 17.99958,-17.2644 l 0.71377,6.38534 c 0.94793,5.04658 3.3953,8.98846 7.33798,11.82715 4.10922,2.83861 9.39607,4.25641 15.87058,4.25641 4.10397,0 9.47293,-0.63009 16.10349,-1.89004 v -31.45948 c -2.83862,-0.31203 -4.89562,-1.1817 -6.15558,-2.59763 -1.26663,-1.57873 -1.89617,-4.25972 -1.89617,-8.04099 V 60.024596 Z M 402.34932,64.751141 V 232.67802 h 38.84342 v -54.16114 h 26.28413 l 24.88577,41.84387 c 0,0 1.47489,2.43641 2.36022,3.54564 1.86399,2.35335 4.52026,5.38565 6.17089,6.57222 3.87461,2.78661 8.53093,4.09402 15.16151,4.09402 2.05198,0 4.34401,-0.15991 6.86932,-0.47327 2.68794,-0.31735 5.767,-0.79195 9.24026,-1.42134 v -31.45336 c -3.14527,0.12523 -4.57952,0.15543 -6.47417,-0.86998 -2.25595,-1.21456 -3.89605,-3.06705 -5.38669,-5.28559 l -1.56072,-2.63591 -13.13517,-22.19781 c 5.68259,-3.15197 10.57743,-7.17094 14.68669,-12.06146 4.10394,-5.04673 7.26052,-10.64616 9.46848,-16.79271 2.2133,-6.30669 3.31749,-12.9309 3.31749,-19.86815 0,-6.93734 -1.4216,-13.79303 -4.26556,-20.57431 -2.6813,-6.78112 -6.4687,-12.848551 -11.36463,-18.212485 -4.89592,-5.515911 -10.73975,-9.855145 -17.52632,-13.011116 -6.62924,-3.306613 -13.89582,-4.963998 -21.79035,-4.963998 z m 38.84342,34.057115 h 34.33585 c 2.99997,0 5.84391,0.949027 8.52654,2.839634 2.68263,1.89075 4.89574,4.57323 6.63038,8.04256 1.89597,3.31195 2.84269,7.24928 2.84269,11.8226 0,4.5719 -0.78925,8.59228 -2.3679,12.06145 -1.5773,3.46801 -3.63179,6.22953 -6.1571,8.28153 -2.3693,1.8906 -5.13011,2.83342 -8.28607,2.83342 h -35.52439 z m 632.18846,7.140444 c -14.0542,0 -26.0553,3.07864 -36.0038,9.2372 -9.9484,6.00069 -17.6084,13.97542 -22.9774,23.92389 -5.2111,9.79061 -7.8158,20.68653 -7.8158,32.68784 0,8.36935 1.4995,16.42211 4.4999,24.15978 3.0003,7.57981 7.3431,14.29193 13.0279,20.1347 5.8428,5.84275 12.8698,10.50044 21.0813,13.97447 8.2114,3.31619 17.6077,4.97475 28.1879,4.97475 9.4748,0 18.0808,-1.42166 25.8185,-4.26403 7.8955,-2.84245 14.6858,-6.71133 20.3705,-11.60663 5.8429,-5.05324 10.3431,-10.81609 13.5014,-17.29051 l -32.2147,-9.00132 c -1.8948,4.57942 -5.3679,8.21149 -10.4211,10.896 -4.8952,2.68444 -10.1858,4.02658 -15.8706,4.02658 -4.5795,0 -8.9223,-0.94769 -13.0281,-2.8427 -4.1056,-2.05284 -7.5007,-4.97402 -10.1852,-8.76394 -2.5266,-3.78982 -4.0261,-8.44752 -4.5,-13.97448 h 91.905 c 0.1579,-1.57913 0.3154,-3.39508 0.4733,-5.44793 0.3157,-2.21079 0.4732,-4.42267 0.4732,-6.63345 0,-11.36973 -2.6047,-21.86972 -7.8159,-31.50239 -5.2111,-9.79052 -12.7914,-17.68739 -22.7399,-23.688 -9.7905,-6.00071 -21.7122,-8.99983 -35.7664,-8.99983 z m 156.527,0.66781 c -7.4212,0.15598 -14.5244,2.59794 -21.3109,7.32724 -6.792,4.73453 -12.317,11.27625 -16.5783,19.63075 v -25.06802 h -34.8167 v 124.17154 h 37.8952 v -74.50411 c 3.312,-5.6773 8.6823,-9.932 16.1035,-12.77068 7.4226,-2.99459 15.7071,-4.4953 24.8644,-4.4953 v -34.0571 c -0.6307,-0.15598 -1.4168,-0.23432 -2.3649,-0.23432 z m -675.20864,1.88997 v 79.46812 c 0,15.29718 3.31865,26.96239 9.94788,35.0037 6.63058,8.04249 16.26642,12.06303 28.89555,12.06303 10.41717,0 19.81414,-1.89115 28.18334,-5.67777 8.52521,-3.94266 15.62973,-10.00861 21.31097,-18.21249 l 0.71373,7.57387 c 0.94798,5.04116 3.39616,8.98398 7.34411,11.82259 3.94261,2.68256 9.23394,4.02053 15.86453,4.02053 2.05195,0 4.34268,-0.15612 6.86931,-0.47482 2.68263,-0.31202 5.75951,-0.78583 9.23414,-1.41522 v -31.45948 c -2.99996,-0.31203 -5.12994,-1.1817 -6.38992,-2.59763 -1.10931,-1.57873 -1.66181,-4.25972 -1.66181,-8.04099 v -82.07344 h -37.89076 v 76.63006 c -2.37062,4.25995 -5.05708,7.72858 -8.0517,10.4058 -2.99997,2.68272 -6.0828,4.65126 -9.23874,5.91663 -3.15596,1.09865 -6.47325,1.65111 -9.94789,1.65111 -5.52522,0 -9.78754,-1.9694 -12.78749,-5.91208 -2.99996,-4.09858 -4.49989,-9.93239 -4.49989,-17.50029 v -71.19123 z m 518.20694,24.68206 c 4.7373,0 9.08,1.10522 13.0278,3.31594 3.9479,2.05294 7.106,5.05355 9.4747,9.00139 2.3686,3.78984 3.8697,8.29007 4.5013,13.50123 h -54.0063 c 0.6315,-5.21116 2.1327,-9.71139 4.5013,-13.50123 2.3687,-3.94784 5.4473,-6.94845 9.2373,-9.00139 3.9479,-2.21072 8.3685,-3.31594 13.2639,-3.31594 z m -308.60931,5.1202 c 3.79061,0 7.49872,0.94354 11.13334,2.83813 3.78662,1.89069 7.10464,4.41178 9.94328,7.56775 2.99995,3.15064 5.29221,6.86025 6.87084,11.11495 v 26.01454 c -1.26131,2.52524 -2.84361,4.89108 -4.73422,7.09911 -1.89599,2.20797 -4.02677,4.02124 -6.39605,5.43718 -2.21333,1.42268 -4.57836,2.60469 -7.10367,3.54728 -2.52663,0.79196 -5.13628,1.1824 -7.81892,1.1824 -4.25994,0 -8.20788,-0.78749 -11.84247,-2.3648 -3.63062,-1.57324 -6.78738,-3.78098 -9.47002,-6.61966 -2.68795,-2.99458 -4.81739,-6.38478 -6.39604,-10.17148 -1.4213,-3.94259 -2.12896,-8.19878 -2.12896,-12.77069 0,-4.41733 0.63023,-8.59362 1.89156,-12.53629 1.42132,-3.94259 3.3946,-7.4113 5.92124,-10.40588 2.52528,-3.15188 5.44666,-5.59997 8.76393,-7.33335 3.47463,-1.73462 7.26089,-2.59919 11.36616,-2.59919 z m 154.8882,0 c 3.79061,0 7.5003,0.94354 11.13486,2.83813 3.78662,1.89069 7.10311,4.41178 9.94172,7.56775 3,3.15064 5.29202,6.86025 6.86934,11.11495 v 26.01454 c -1.25995,2.52524 -2.84205,4.89108 -4.73273,7.09911 -1.89595,2.20797 -4.02675,4.02124 -6.39602,5.43718 -2.21329,1.42268 -4.57834,2.60469 -7.10366,3.54728 -2.52665,0.79196 -5.13628,1.1824 -7.81891,1.1824 -4.25995,0 -8.20866,-0.78749 -11.83789,-2.3648 -3.63597,-1.57324 -6.79195,-3.78098 -9.47458,-6.61966 -2.68796,-2.99458 -4.81586,-6.38478 -6.39451,-10.17148 -1.42134,-3.94259 -2.13049,-8.19878 -2.13049,-12.77069 0,-4.41733 0.63001,-8.59362 1.88998,-12.53629 1.42267,-3.94259 3.39616,-7.4113 5.92282,-10.40588 2.52525,-3.15188 5.44816,-5.59997 8.76543,-7.33335 3.47459,-1.73462 7.25933,-2.59919 11.36464,-2.59919 z"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.33331347"
-     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/api-doc/assets/rudder.svg b/api-doc/assets/rudder.svg
deleted file mode 100644
index 7eb08a77a34..00000000000
--- a/api-doc/assets/rudder.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   xml:space="preserve"
-   width="1300"
-   height="300"
-   viewBox="0 0 1300 300"
-   sodipodi:docname="logo-rudder-2021.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs6" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1848"
-     inkscape:window-height="1016"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="0.5286983"
-     inkscape:cx="72.47793"
-     inkscape:cy="334.38434"
-     inkscape:window-x="750"
-     inkscape:window-y="1107"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g10" /><g
-     id="g10"
-     inkscape:groupmode="layer"
-     inkscape:label="2021-FIC-logo-rudder"
-     transform="matrix(1.3333333,0,0,1.3333333,0,7.5e-6)"><g
-       id="g12"><path
-         d="m 141.797,18.77 c -51.836,0 -93.856,41.964 -93.859,93.726 0,24.859 9.89,48.703 27.492,66.281 17.601,17.578 41.472,27.453 66.367,27.453 24.891,-0.003 48.762,-9.878 66.363,-27.457 17.602,-17.578 27.488,-41.418 27.488,-66.277 -0.039,-23.273 -8.75,-45.699 -24.433,-62.914 l -61.246,68.184 c -1.871,1.882 -4.344,2.816 -6.809,2.816 -2.465,0 -4.941,-0.934 -6.812,-2.816 -3.766,-3.758 -3.766,-9.852 0,-13.614 L 204.617,43.004 C 187.398,27.445 165.016,18.809 141.797,18.77 Z m -15.738,34.312 c 2.691,6.012 8.718,10.199 15.742,10.199 7.011,0 13.043,-4.187 15.734,-10.199 5.395,1.43 10.485,3.574 15.199,6.313 -0.609,1.566 -0.945,3.207 -1.074,4.843 l -20.578,17.891 c -2.949,-0.91 -6.059,-1.387 -9.281,-1.387 -17.535,0 -31.801,14.238 -31.801,31.766 0,17.5 14.266,31.75 31.801,31.75 17.527,0 31.797,-14.25 31.797,-31.75 0,-3.383 -0.543,-6.629 -1.516,-9.68 l 17.547,-20.156 c 1.82,-0.074 3.613,-0.418 5.344,-1.059 2.742,4.692 4.89,9.782 6.316,15.157 -6.012,2.703 -10.203,8.722 -10.203,15.738 0,7.004 4.191,13.019 10.203,15.707 -1.426,5.39 -3.574,10.473 -6.316,15.168 -6.153,-2.321 -13.368,-1.035 -18.325,3.91 -4.96,4.961 -6.253,12.152 -3.914,18.309 -4.714,2.738 -9.804,4.886 -15.199,6.308 -2.691,-6.004 -8.723,-10.195 -15.734,-10.195 -7.024,0 -13.051,4.191 -15.742,10.195 -5.399,-1.422 -10.489,-3.57 -15.188,-6.308 2.336,-6.157 1.035,-13.348 -3.93,-18.309 -4.937,-4.945 -12.16,-6.231 -18.312,-3.91 -2.754,-4.695 -4.887,-9.778 -6.328,-15.168 6.015,-2.688 10.211,-8.703 10.211,-15.707 0,-7.016 -4.196,-13.035 -10.211,-15.723 1.441,-5.387 3.574,-10.48 6.328,-15.172 6.152,2.321 13.375,1.035 18.312,-3.929 4.965,-4.946 6.266,-12.145 3.93,-18.289 4.699,-2.739 9.789,-4.883 15.188,-6.313 z"
-         style="fill:#13beb7;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16"
-         inkscape:connector-curvature="0" /></g><path
-       id="path18-2"
-       d="m 594.00776,45.01845 v 51.61634 c -2.72697,-5.08595 -6.75027,-9.16447 -12.08219,-12.23841 -5.32792,-3.19596 -11.24553,-4.79012 -17.76144,-4.79012 -8.05087,0 -15.15634,2.1289 -21.31325,6.38687 -6.15992,4.25392 -11.01476,10.05159 -14.56571,17.38347 -3.55495,7.21493 -5.32774,15.37429 -5.32774,24.47913 0,6.85997 1.06162,13.2432 3.19457,19.15714 2.13298,5.91383 5.15283,11.05696 9.05878,15.43184 4.02692,4.37496 8.70308,7.80506 14.035,10.28903 5.44492,2.36397 11.36652,3.54726 17.76143,3.54726 6.27289,0 12.25428,-1.41837 17.93719,-4.25833 5.68791,-2.83497 10.18774,-7.15134 13.4997,-12.9483 l 0.53529,4.789 c 0.711,3.78494 2.54653,6.74135 5.50351,8.87037 3.08194,2.12895 7.04706,3.1923 11.90298,3.1923 3.07796,0 7.10466,-0.47256 12.07759,-1.41753 V 150.9139 c -2.12897,-0.23402 -3.66769,-0.88627 -4.61669,-1.94822 -0.94998,-1.18405 -1.4221,-3.19479 -1.4221,-6.03074 V 45.01845 Z m 116.16613,0 v 51.61634 c -2.72693,-5.08595 -6.75023,-9.16447 -12.08216,-12.23841 -5.32791,-3.19596 -11.24557,-4.79012 -17.76148,-4.79012 -8.05083,0 -15.15559,2.1289 -21.3155,6.38687 -6.15694,4.25392 -11.01251,10.05159 -14.56348,17.38347 -3.55492,7.21493 -5.32773,15.37429 -5.32773,24.47913 0,6.85997 1.06162,13.2432 3.19459,19.15714 2.13296,5.91383 5.15283,11.05696 9.05875,15.43184 4.02697,4.37496 8.70311,7.80506 14.03503,10.28903 5.44491,2.36397 11.36768,3.54726 17.7626,3.54726 6.27289,0 12.25312,-1.41837 17.93605,-4.25833 5.68792,-2.83497 10.18774,-7.15134 13.49968,-12.9483 l 0.53533,4.789 c 0.71095,3.78494 2.54648,6.74135 5.50349,8.87037 3.08191,2.12895 7.04705,3.1923 11.90293,3.1923 3.07798,0 7.1047,-0.47256 12.07762,-1.41753 V 150.9139 c -2.12897,-0.23402 -3.67172,-0.88627 -4.61669,-1.94822 -0.94997,-1.18405 -1.42212,-3.19479 -1.42212,-6.03074 V 45.01845 Z M 301.762,48.56336 v 125.94515 h 29.13256 v -40.62085 h 19.7131 l 18.66433,31.3829 c 0,0 1.10617,1.82731 1.77016,2.65923 1.398,1.76501 3.3902,4.03924 4.62817,4.92917 2.90596,2.08995 6.3982,3.07051 11.37113,3.07051 1.53899,0 3.25801,-0.11993 5.15199,-0.35495 2.01596,-0.23801 4.32525,-0.59396 6.9302,-1.06601 v -23.59002 c -2.35895,0.0939 -3.43464,0.11657 -4.85563,-0.65248 -1.69196,-0.91092 -2.92204,-2.30029 -4.04002,-3.9642 l -1.17054,-1.97693 -9.85137,-16.64835 c 4.26194,-2.36398 7.93307,-5.37821 11.01501,-9.0461 3.07796,-3.78504 5.44539,-7.98462 7.10136,-12.59453 1.65998,-4.73002 2.48812,-9.69817 2.48812,-14.90111 0,-5.20301 -1.0662,-10.34477 -3.19917,-15.43073 -2.01097,-5.08584 -4.85152,-9.63642 -8.52347,-13.65937 -3.67194,-4.13693 -8.05481,-7.39136 -13.14474,-9.75834 -4.97193,-2.47996 -10.42187,-3.72299 -16.34276,-3.72299 z m 29.13256,25.54283 h 25.75189 c 2.24998,0 4.38293,0.71177 6.39491,2.12973 2.01197,1.41806 3.6718,3.42992 4.97278,6.03192 1.42198,2.48396 2.13202,5.43696 2.13202,8.86695 0,3.42892 -0.59194,6.44421 -1.77593,9.04609 -1.18297,2.601 -2.72384,4.67214 -4.61782,6.21114 -1.77698,1.41795 -3.84758,2.12507 -6.21455,2.12507 h -26.6433 z m 474.14136,5.35534 c -10.54065,0 -19.54147,2.30898 -27.00285,6.9279 -7.4613,4.50051 -13.2063,10.48156 -17.23305,17.94291 -3.90832,7.34296 -5.86185,15.5149 -5.86185,24.51588 0,6.27701 1.12463,12.31658 3.37493,18.11983 2.25022,5.68486 5.50732,10.71895 9.77092,15.10103 4.3821,4.38206 9.65235,7.87533 15.81098,10.48085 6.15855,2.48715 13.20577,3.73107 21.14092,3.73107 7.1061,0 13.5606,-1.06625 19.36388,-3.19803 5.92162,-2.13183 11.01435,-5.0335 15.27787,-8.70497 4.38218,-3.78993 7.75733,-8.11207 10.12605,-12.96788 l -24.16102,-6.75099 c -1.4211,3.43456 -4.02593,6.15861 -7.81583,8.172 -3.6714,2.01333 -7.63935,3.01993 -11.90295,3.01993 -3.43462,0 -6.69172,-0.71077 -9.77107,-2.13202 -3.0792,-1.53963 -5.62553,-3.73052 -7.6389,-6.57296 -1.89495,-2.84236 -3.01958,-6.33564 -3.375,-10.48086 h 68.92875 c 0.11842,-1.18434 0.23655,-2.54631 0.35497,-4.08594 0.23678,-1.6581 0.3549,-3.31701 0.3549,-4.97509 0,-8.5273 -1.95352,-16.40229 -5.86192,-23.62679 -3.90833,-7.34289 -9.59355,-13.26554 -17.05493,-17.766 -7.34287,-4.50053 -16.28415,-6.74987 -26.8248,-6.74987 z m 117.39526,0.50085 c -5.5659,0.11699 -10.8933,1.94846 -15.98318,5.49543 -5.094,3.5509 -9.23775,8.45719 -12.43373,14.72307 V 81.37986 h -26.11252 v 93.12865 h 28.4214 v -55.87808 c 2.484,-4.25797 6.51173,-7.449 12.07763,-9.57801 5.56695,-2.24594 11.78032,-3.37147 18.6483,-3.37147 V 80.13812 c -0.47303,-0.11698 -1.0626,-0.17574 -1.77368,-0.17574 z m -506.4065,1.41748 v 59.60109 c 0,11.47288 2.48899,20.22179 7.46091,26.25277 4.97294,6.03187 12.19982,9.04728 21.67167,9.04728 7.81287,0 14.8606,-1.41837 21.1375,-4.25833 6.39391,-2.957 11.7223,-7.50646 15.98323,-13.65937 l 0.5353,5.6804 c 0.71098,3.78087 2.54712,6.73799 5.50808,8.86695 2.95696,2.01192 6.92545,3.01539 11.8984,3.01539 1.53896,0 3.25701,-0.11709 5.15198,-0.35611 2.01197,-0.23402 4.31963,-0.58937 6.92561,-1.06142 V 150.9139 c -2.24997,-0.23402 -3.84746,-0.88627 -4.79244,-1.94822 -0.83199,-1.18405 -1.24636,-3.19479 -1.24636,-6.03074 V 81.37986 h -28.41807 v 57.47254 c -1.77797,3.19497 -3.79281,5.79644 -6.03878,7.80435 -2.24998,2.01204 -4.5621,3.48845 -6.92905,4.43747 -2.36697,0.82399 -4.85494,1.23834 -7.46092,1.23834 -4.14392,0 -7.34066,-1.47705 -9.59062,-4.43406 -2.24997,-3.07394 -3.37492,-7.44929 -3.37492,-13.12522 V 81.37986 Z M 804.6799,99.89141 c 3.55297,0 6.81,0.82891 9.77085,2.48695 2.96092,1.53971 5.3295,3.79016 7.10602,6.75104 1.77645,2.84238 2.90228,6.21756 3.37598,10.12593 h -40.50473 c 0.47363,-3.90837 1.59953,-7.28355 3.37598,-10.12593 1.77652,-2.96088 4.08547,-5.21133 6.92797,-6.75104 2.96093,-1.65804 6.27638,-2.48695 9.94793,-2.48695 z m -231.45699,3.84015 c 2.84296,0 5.62404,0.70765 8.35,2.12859 2.83997,1.41802 5.32848,3.30884 7.45746,5.67582 2.24997,2.36298 3.96916,5.14518 5.15313,8.33621 v 19.5109 c -0.94598,1.89393 -2.1327,3.66831 -3.55066,5.32433 -1.42199,1.65598 -3.02008,3.01593 -4.79704,4.07789 -1.66,1.06701 -3.43377,1.95351 -5.32775,2.66046 -1.89497,0.59397 -3.85221,0.8868 -5.86419,0.8868 -3.19496,0 -6.15591,-0.59062 -8.88185,-1.7736 -2.72297,-1.17993 -5.09054,-2.83574 -7.10252,-4.96475 -2.01596,-2.24593 -3.61304,-4.78858 -4.79703,-7.62861 -1.06597,-2.95694 -1.59672,-6.14908 -1.59672,-9.57801 0,-3.313 0.47267,-6.44522 1.41867,-9.40222 1.06599,-2.95694 2.54595,-5.55847 4.44093,-7.80441 1.89396,-2.36391 4.085,-4.19998 6.57295,-5.50001 2.60597,-1.30097 5.44567,-1.94939 8.52462,-1.94939 z m 116.16615,0 c 2.84296,0 5.62523,0.70765 8.35115,2.12859 2.83996,1.41802 5.32733,3.30884 7.45629,5.67582 2.25,2.36298 3.96901,5.14518 5.152,8.33621 v 19.5109 c -0.94496,1.89393 -2.13153,3.66831 -3.54954,5.32433 -1.42197,1.65598 -3.02007,3.01593 -4.79702,4.07789 -1.65997,1.06701 -3.43376,1.95351 -5.32775,2.66046 -1.89498,0.59397 -3.85221,0.8868 -5.86418,0.8868 -3.19496,0 -6.15649,-0.59062 -8.87842,-1.7736 -2.72697,-1.17993 -5.09396,-2.83574 -7.10593,-4.96475 -2.01597,-2.24593 -3.6119,-4.78858 -4.79588,-7.62861 -1.06601,-2.95694 -1.59787,-6.14908 -1.59787,-9.57801 0,-3.313 0.47251,-6.44522 1.41748,-9.40222 1.06701,-2.95694 2.54712,-5.55847 4.44212,-7.80441 1.89394,-2.36391 4.08612,-4.19998 6.57407,-5.50001 2.60594,-1.30097 5.4445,-1.94939 8.52348,-1.94939 z"
-       style="fill:#041922;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999851"
-       inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/api-doc/rapidoc.html b/api-doc/rapidoc.html
index fae4175155a..55148129c36 100644
--- a/api-doc/rapidoc.html
+++ b/api-doc/rapidoc.html
@@ -18,8 +18,8 @@
     sans-serif' mono-font='SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace'
     nav-bg-color="#041922" theme="light" nav-text-color="#ffffffaa" nav-accent-color="#13BEB7" primary-color="#13BEB7"
     allow-spec-file-download="true" info-description-headings-in-navbar="true">
-    <img slot="nav-logo" src="../assets/rudder-white.svg" style="height: 50px;" />
+    <img slot="nav-logo" src="../assets/rudder-logo-rect-white.svg" style="height: 50px;" />
   </rapi-doc>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/ci/rust.sh b/ci/rust.sh
index 223b9ea46b6..e71c214c0c1 100755
--- a/ci/rust.sh
+++ b/ci/rust.sh
@@ -6,7 +6,7 @@ rustup component add clippy
 rustup component add rustfmt
 
 # Install pre-compiled sccache
-SCCACHE_VER=0.8.1
+SCCACHE_VER=0.8.2
 wget --quiet https://github.com/mozilla/sccache/releases/download/v$SCCACHE_VER/sccache-v$SCCACHE_VER-x86_64-unknown-linux-musl.tar.gz
 tar -xf sccache-v$SCCACHE_VER-x86_64-unknown-linux-musl.tar.gz
 chmod +x sccache-v$SCCACHE_VER-x86_64-unknown-linux-musl/sccache
@@ -20,4 +20,4 @@ mv cargo-deny-$DENY_VER-x86_64-unknown-linux-musl/cargo-deny /usr/local/bin/
 
 # Build & check tools
 cargo install --locked cargo-auditable@0.6.4
-cargo install --locked cargo-cyclonedx@0.5.5
+cargo install --locked cargo-cyclonedx@0.5.6
diff --git a/ci/typos.Dockerfile b/ci/typos.Dockerfile
index efe3cbcdfc3..e28303a9a77 100644
--- a/ci/typos.Dockerfile
+++ b/ci/typos.Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.81.0-bookworm
+FROM rust:1.83.0-bookworm
 LABEL ci=rudder/ci/typos.Dockerfile
 ARG VERSION
 
diff --git a/deny.toml b/deny.toml
index 689f672ec2c..9ac0f742fbb 100644
--- a/deny.toml
+++ b/deny.toml
@@ -13,6 +13,7 @@ allow = [
     "BSD-3-Clause",
     "BSL-1.0",
     "MPL-2.0",
+    "Unicode-3.0",
 ]
 
 [advisories]
diff --git a/logo/.gitignore b/logo/.gitignore
new file mode 100644
index 00000000000..65537ab81c8
--- /dev/null
+++ b/logo/.gitignore
@@ -0,0 +1,3 @@
+*.png
+*.ico
+*.svgz
diff --git a/logo/README.md b/logo/README.md
index 33dea1903b6..a0cada6049d 100644
--- a/logo/README.md
+++ b/logo/README.md
@@ -8,22 +8,31 @@
     </tr>
     <tr>
         <th>black</th>
-        <td><img src="rudder-logo-square-black.svg" width="200"></td>
-        <td><img src="rudder-logo-rect-black.svg" width="500"></td>
+        <td><img src="icons/svg/rudder-logo-square-black.svg" width="200"></td>
+        <td><img src="icons/svg/rudder-logo-rect-black.svg" width="500"></td>
     </tr>
     <tr>
         <th>white</th>
-        <td><img src="rudder-logo-square-white.svg" width="200"></td>
-        <td><img src="rudder-logo-rect-white.svg" width="500"></td>
+        <td><img src="icons/svg/rudder-logo-square-white.svg" width="200"></td>
+        <td><img src="icons/svg/rudder-logo-rect-white.svg" width="500"></td>
     </tr>
     <tr>
         <th>monochrome black</th>
-        <td><img src="rudder-logo-square-monochrome-black.svg" width="200"></td>
-        <td><img src="rudder-logo-rect-monochrome-black.svg" width="500"></td>
+        <td><img src="icons/svg/rudder-logo-square-monochrome-black.svg" width="200"></td>
+        <td><img src="icons/svg/rudder-logo-rect-monochrome-black.svg" width="500"></td>
     </tr>
     <tr>
         <th>monochrome white</th>
-        <td><img src="rudder-logo-square-monochrome-white.svg" width="200"></td>
-        <td><img src="rudder-logo-rect-monochrome-white.svg" width="500"></td>
+        <td><img src="icons/svg/rudder-logo-square-monochrome-white.svg" width="200"></td>
+        <td><img src="icons/svg/rudder-logo-rect-monochrome-white.svg" width="500"></td>
+    </tr>
+    <tr>
+        <th>no text</th>
+        <td><img src="icons/svg/rudder-logo-notext.svg" width="200"></td>
+        <td><img src="icons/svg/rudder-logo-notext.svg" width="200"></td>
     </tr>
 </table>
+
+### Build
+
+The build the full set of icons (optimized SVG and PNG), use the `convert.sh` script.
diff --git a/logo/convert.sh b/logo/convert.sh
new file mode 100755
index 00000000000..9d2f0ee7c8d
--- /dev/null
+++ b/logo/convert.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+# This script requires:
+#
+# * inkscape (best for SVG -> PNG)
+# * svgo (for SVG optimization)
+# * zopfli (best png opimizer: https://iter.ca/post/zopfli/)
+#
+# NOTE: This script aims at best size result over time, and should be used for one-shot jobs.
+
+set -e
+
+target="icons"
+archive="rudder-logos"
+rm -rf "${target}" "${archive}.*"
+
+sources="../webapp/sources/rudder/rudder-web/src/main/svg/logo/*.svg"
+png_sizes=(512 1024)
+
+#################################################
+# Favicon
+
+out_dir="${target}/favicons"
+mkdir -p "${out_dir}"
+cd ../webapp/sources/rudder/rudder-web/src/main/ && ./favicon.sh && cd - >/dev/null
+cp ../webapp/sources/rudder/rudder-web/src/main/webapp/images/rudder-favicon.ico "${target}/favicons/"
+
+#################################################
+### Optimized SVG
+
+out_dir="${target}/svg"
+mkdir -p "${out_dir}"
+for file in ${sources}
+do
+    basename=$(basename "${file}")
+    out="${out_dir}/${basename}"
+    zout="${out_dir}/${basename%.svg}.svgz"
+    echo "${file}"
+    echo "    optimizing (svgo) -> ${out}"
+    svgo --quiet --multipass --input "${file}" --output "${out}"
+    #echo "    compressing (gzip) -> ${zout}"
+    #gzip --best --stdout "${out}" > "${zout}"
+done
+
+#################################################
+# Optimized PNG
+
+for file in ${sources}
+do
+    echo "${file}"
+    for size in "${png_sizes[@]}"
+    do
+        out_dir="${target}/png/${size}px" 
+        mkdir -p "${out_dir}"
+        basename=$(basename "${file}")
+        out="${out_dir}/${basename%.svg}.png"
+        echo "    generating (inkscape, ${size}px) -> ${out}"
+        inkscape --export-filename="${out}" -w "${size}" "${file}"
+        echo "    optimizing (zopflipng)"
+        zopflipng -y -m "${out}" "${out}" >/dev/null
+    done
+done
+
+#################################################
+# Archive
+
+zip -q -r "${archive}" icons
+tar -czf "${archive}.tar.gz" icons
diff --git a/logo/icons/svg/rudder-logo-notext.svg b/logo/icons/svg/rudder-logo-notext.svg
new file mode 100644
index 00000000000..c6f38e36c8d
--- /dev/null
+++ b/logo/icons/svg/rudder-logo-notext.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="50mm" height="50mm" viewBox="0 0 177.165 177.165"><path d="M141.797 18.77c-51.836 0-93.856 41.964-93.859 93.726a93.68 93.68 0 0 0 27.492 66.281 93.92 93.92 0 0 0 66.367 27.453 93.93 93.93 0 0 0 66.363-27.457 93.66 93.66 0 0 0 27.488-66.277 93.66 93.66 0 0 0-24.433-62.914l-61.246 68.184a9.57 9.57 0 0 1-6.809 2.816 9.58 9.58 0 0 1-6.812-2.816c-3.766-3.758-3.766-9.852 0-13.614l68.269-61.148a93.94 93.94 0 0 0-62.82-24.234m-15.738 34.312c2.691 6.012 8.718 10.199 15.742 10.199 7.011 0 13.043-4.187 15.734-10.199a61.7 61.7 0 0 1 15.199 6.313c-.609 1.566-.945 3.207-1.074 4.843l-20.578 17.891a31.4 31.4 0 0 0-9.281-1.387C124.266 80.742 110 94.98 110 112.508c0 17.5 14.266 31.75 31.801 31.75 17.527 0 31.797-14.25 31.797-31.75 0-3.383-.543-6.629-1.516-9.68l17.547-20.156a17.4 17.4 0 0 0 5.344-1.059 61 61 0 0 1 6.316 15.157c-6.012 2.703-10.203 8.722-10.203 15.738 0 7.004 4.191 13.019 10.203 15.707a61 61 0 0 1-6.316 15.168c-6.153-2.321-13.368-1.035-18.325 3.91-4.96 4.961-6.253 12.152-3.914 18.309a61.4 61.4 0 0 1-15.199 6.308c-2.691-6.004-8.723-10.195-15.734-10.195-7.024 0-13.051 4.191-15.742 10.195a61 61 0 0 1-15.188-6.308c2.336-6.157 1.035-13.348-3.93-18.309-4.937-4.945-12.16-6.231-18.312-3.91a61 61 0 0 1-6.328-15.168c6.015-2.688 10.211-8.703 10.211-15.707 0-7.016-4.196-13.035-10.211-15.723a61.2 61.2 0 0 1 6.328-15.172c6.152 2.321 13.375 1.035 18.312-3.929 4.965-4.946 6.266-12.145 3.93-18.289a61.3 61.3 0 0 1 15.188-6.313" style="fill:#13beb7;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(-24.19 -.892)scale(.79533)"/></svg>
\ No newline at end of file
diff --git a/logo/icons/svg/rudder-logo-rect-black.svg b/logo/icons/svg/rudder-logo-rect-black.svg
new file mode 100644
index 00000000000..997d4ac965b
--- /dev/null
+++ b/logo/icons/svg/rudder-logo-rect-black.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1300" height="300"><path d="M141.797 18.77c-51.836 0-93.856 41.964-93.859 93.726a93.68 93.68 0 0 0 27.492 66.281 93.92 93.92 0 0 0 66.367 27.453 93.93 93.93 0 0 0 66.363-27.457 93.66 93.66 0 0 0 27.488-66.277 93.66 93.66 0 0 0-24.433-62.914l-61.246 68.184a9.57 9.57 0 0 1-6.809 2.816 9.58 9.58 0 0 1-6.812-2.816c-3.766-3.758-3.766-9.852 0-13.614l68.269-61.148a93.94 93.94 0 0 0-62.82-24.234m-15.738 34.312c2.691 6.012 8.718 10.199 15.742 10.199 7.011 0 13.043-4.187 15.734-10.199a61.7 61.7 0 0 1 15.199 6.313c-.609 1.566-.945 3.207-1.074 4.843l-20.578 17.891a31.4 31.4 0 0 0-9.281-1.387C124.266 80.742 110 94.98 110 112.508c0 17.5 14.266 31.75 31.801 31.75 17.527 0 31.797-14.25 31.797-31.75 0-3.383-.543-6.629-1.516-9.68l17.547-20.156a17.4 17.4 0 0 0 5.344-1.059 61 61 0 0 1 6.316 15.157c-6.012 2.703-10.203 8.722-10.203 15.738 0 7.004 4.191 13.019 10.203 15.707a61 61 0 0 1-6.316 15.168c-6.153-2.321-13.368-1.035-18.325 3.91-4.96 4.961-6.253 12.152-3.914 18.309a61.4 61.4 0 0 1-15.199 6.308c-2.691-6.004-8.723-10.195-15.734-10.195-7.024 0-13.051 4.191-15.742 10.195a61 61 0 0 1-15.188-6.308c2.336-6.157 1.035-13.348-3.93-18.309-4.937-4.945-12.16-6.231-18.312-3.91a61 61 0 0 1-6.328-15.168c6.015-2.688 10.211-8.703 10.211-15.707 0-7.016-4.196-13.035-10.211-15.723a61.2 61.2 0 0 1 6.328-15.172c6.152 2.321 13.375 1.035 18.312-3.929 4.965-4.946 6.266-12.145 3.93-18.289a61.3 61.3 0 0 1 15.188-6.313" style="fill:#13beb7;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1.33333)"/><path d="M594.008 45.018v51.617c-2.727-5.086-6.75-9.165-12.082-12.239q-7.99-4.792-17.762-4.79-12.076 0-21.313 6.387c-6.16 4.254-11.015 10.052-14.566 17.384-3.555 7.215-5.328 15.374-5.328 24.479 0 6.86 1.062 13.243 3.195 19.157q3.2 8.87 9.059 15.432 6.039 6.563 14.035 10.289 8.168 3.546 17.761 3.547 9.411.001 17.937-4.258 8.532-4.253 13.5-12.949l.535 4.79q1.068 5.675 5.504 8.87 4.621 3.193 11.903 3.192 4.618 0 12.077-1.417v-23.595q-3.193-.353-4.616-1.948-1.423-1.776-1.422-6.031V45.018Zm116.166 0v51.617c-2.727-5.086-6.75-9.165-12.082-12.239q-7.99-4.792-17.762-4.79-12.075 0-21.315 6.387c-6.157 4.254-11.013 10.052-14.564 17.384-3.555 7.215-5.327 15.374-5.327 24.479 0 6.86 1.061 13.243 3.194 19.157q3.2 8.87 9.059 15.432 6.039 6.563 14.035 10.289 8.169 3.546 17.763 3.547 9.41.001 17.936-4.258 8.53-4.253 13.5-12.949l.535 4.79q1.066 5.675 5.503 8.87c3.082 2.129 7.047 3.192 11.903 3.192q4.618 0 12.078-1.417v-23.595c-2.13-.234-3.672-.886-4.617-1.948q-1.424-1.776-1.422-6.031V45.018Zm-408.412 3.545V174.51h29.133v-40.621h19.713l18.664 31.383s1.106 1.827 1.77 2.659c1.398 1.765 3.39 4.039 4.628 4.929 2.906 2.09 6.399 3.07 11.371 3.07q2.31-.001 5.152-.354 3.024-.357 6.93-1.066v-23.59c-2.358.093-3.434.116-4.855-.653-1.692-.91-2.922-2.3-4.04-3.964l-1.17-1.977-9.852-16.648q6.392-3.546 11.015-9.047a42.7 42.7 0 0 0 7.101-12.594q2.49-7.096 2.489-14.901 0-7.803-3.2-15.43a44.2 44.2 0 0 0-8.523-13.66q-5.509-6.207-13.145-9.759-7.46-3.721-16.343-3.723zm29.133 25.543h25.751q3.376.001 6.395 2.13 3.02 2.128 4.973 6.032 2.132 3.724 2.132 8.867t-1.776 9.046q-1.776 3.901-4.618 6.211-2.665 2.126-6.214 2.125h-26.643zm474.14 5.356q-15.81 0-27.002 6.927-11.192 6.75-17.233 17.943-5.862 11.014-5.862 24.516 0 9.416 3.375 18.12a45.4 45.4 0 0 0 9.771 15.101q6.573 6.573 15.811 10.48 9.239 3.732 21.14 3.732 10.66 0 19.365-3.198 8.882-3.198 15.278-8.705 6.573-5.684 10.126-12.968l-24.161-6.75q-2.131 5.151-7.816 8.171-5.508 3.02-11.903 3.02-5.152 0-9.771-2.132-4.62-2.31-7.64-6.573-2.841-4.264-3.374-10.48h68.929q.177-1.777.355-4.087.355-2.488.355-4.975 0-12.79-5.862-23.627-5.864-11.014-17.055-17.766-11.014-6.75-26.825-6.75m117.396.5q-8.349.175-15.983 5.496-7.64 5.324-12.434 14.723v-18.8h-26.112v93.129h28.421V118.63q3.727-6.386 12.078-9.578c5.567-2.246 11.78-3.371 18.648-3.371V80.138q-.708-.176-1.774-.176zM416.025 81.38v59.6q.002 17.21 7.46 26.254 7.463 9.048 21.672 9.047 11.72.001 21.138-4.258c6.394-2.957 11.722-7.507 15.983-13.66l.535 5.68q1.067 5.674 5.508 8.868c2.957 2.012 6.926 3.015 11.899 3.015q2.309.001 5.152-.356 3.018-.353 6.925-1.061v-23.595q-3.375-.353-4.792-1.948-1.247-1.776-1.246-6.031V81.38H477.84v57.472q-2.667 4.793-6.038 7.805c-2.25 2.012-4.562 3.488-6.93 4.437q-3.55 1.238-7.46 1.239-6.215.001-9.59-4.435-3.375-4.61-3.376-13.125V81.38ZM804.68 99.89q5.33 0 9.77 2.487 4.442 2.31 7.107 6.751 2.664 4.264 3.376 10.126h-40.505q.712-5.862 3.376-10.126 2.664-4.44 6.928-6.75 4.44-2.488 9.948-2.488m-231.457 3.84q4.263-.002 8.35 2.13a24.9 24.9 0 0 1 7.457 5.675c2.25 2.363 3.97 5.145 5.153 8.336v19.511a26 26 0 0 1-3.55 5.324q-2.132 2.485-4.797 4.078a27.8 27.8 0 0 1-5.328 2.66 19.5 19.5 0 0 1-5.864.888q-4.793 0-8.882-1.774a21.3 21.3 0 0 1-7.103-4.965 26.7 26.7 0 0 1-4.797-7.628q-1.597-4.436-1.596-9.578 0-4.969 1.418-9.403 1.599-4.435 4.441-7.804 2.841-3.548 6.573-5.5 3.908-1.95 8.525-1.95m116.166 0q4.263-.002 8.351 2.13a24.9 24.9 0 0 1 7.456 5.675c2.25 2.363 3.97 5.145 5.152 8.336v19.511a26 26 0 0 1-3.549 5.324q-2.132 2.485-4.797 4.078a27.8 27.8 0 0 1-5.328 2.66 19.5 19.5 0 0 1-5.864.888q-4.794 0-8.878-1.774a21.3 21.3 0 0 1-7.106-4.965 26.7 26.7 0 0 1-4.796-7.628q-1.598-4.436-1.598-9.578 0-4.969 1.417-9.403 1.6-4.435 4.443-7.804 2.84-3.548 6.574-5.5c2.606-1.301 5.444-1.95 8.523-1.95" style="fill:#041922;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:.9999851" transform="scale(1.33333)"/></svg>
\ No newline at end of file
diff --git a/logo/icons/svg/rudder-logo-rect-monochrome-black.svg b/logo/icons/svg/rudder-logo-rect-monochrome-black.svg
new file mode 100644
index 00000000000..cc7b5e17c30
--- /dev/null
+++ b/logo/icons/svg/rudder-logo-rect-monochrome-black.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1300" height="300"><path d="M141.797 18.77c-51.836 0-93.856 41.964-93.859 93.726a93.68 93.68 0 0 0 27.492 66.281 93.92 93.92 0 0 0 66.367 27.453 93.93 93.93 0 0 0 66.363-27.457 93.66 93.66 0 0 0 27.488-66.277 93.66 93.66 0 0 0-24.433-62.914l-61.246 68.184a9.57 9.57 0 0 1-6.809 2.816 9.58 9.58 0 0 1-6.812-2.816c-3.766-3.758-3.766-9.852 0-13.614l68.269-61.148a93.94 93.94 0 0 0-62.82-24.234m-15.738 34.312c2.691 6.012 8.718 10.199 15.742 10.199 7.011 0 13.043-4.187 15.734-10.199a61.7 61.7 0 0 1 15.199 6.313c-.609 1.566-.945 3.207-1.074 4.843l-20.578 17.891a31.4 31.4 0 0 0-9.281-1.387C124.266 80.742 110 94.98 110 112.508c0 17.5 14.266 31.75 31.801 31.75 17.527 0 31.797-14.25 31.797-31.75 0-3.383-.543-6.629-1.516-9.68l17.547-20.156a17.4 17.4 0 0 0 5.344-1.059 61 61 0 0 1 6.316 15.157c-6.012 2.703-10.203 8.722-10.203 15.738 0 7.004 4.191 13.019 10.203 15.707a61 61 0 0 1-6.316 15.168c-6.153-2.321-13.368-1.035-18.325 3.91-4.96 4.961-6.253 12.152-3.914 18.309a61.4 61.4 0 0 1-15.199 6.308c-2.691-6.004-8.723-10.195-15.734-10.195-7.024 0-13.051 4.191-15.742 10.195a61 61 0 0 1-15.188-6.308c2.336-6.157 1.035-13.348-3.93-18.309-4.937-4.945-12.16-6.231-18.312-3.91a61 61 0 0 1-6.328-15.168c6.015-2.688 10.211-8.703 10.211-15.707 0-7.016-4.196-13.035-10.211-15.723a61.2 61.2 0 0 1 6.328-15.172c6.152 2.321 13.375 1.035 18.312-3.929 4.965-4.946 6.266-12.145 3.93-18.289a61.3 61.3 0 0 1 15.188-6.313" style="fill:#041922;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1.33333)"/><path d="M792.016 60.022v68.822c-3.636-6.781-9-12.22-16.11-16.318-7.104-4.261-14.994-6.387-23.682-6.387q-16.102 0-28.417 8.516c-8.213 5.672-14.687 13.402-19.421 23.178-4.74 9.62-7.104 20.5-7.104 32.639 0 9.147 1.416 17.658 4.26 25.543q4.266 11.826 12.078 20.576c5.37 5.833 11.604 10.406 18.713 13.718q10.891 4.729 23.682 4.73c8.364 0 16.34-1.891 23.916-5.678q11.376-5.67 18-17.264l.714 6.385q1.423 7.57 7.338 11.827c4.11 2.839 9.396 4.257 15.87 4.257q6.157 0 16.104-1.89v-31.46c-2.839-.312-4.89-1.182-6.156-2.597q-1.898-2.37-1.896-8.041V60.022Zm154.888 0v68.822c-3.636-6.781-9-12.22-16.11-16.318-7.103-4.261-14.993-6.387-23.681-6.387q-16.102 0-28.421 8.516c-8.21 5.672-14.683 13.402-19.418 23.178-4.74 9.62-7.104 20.5-7.104 32.639 0 9.147 1.416 17.658 4.26 25.543q4.266 11.826 12.078 20.576c5.37 5.833 11.604 10.406 18.714 13.718q10.891 4.729 23.683 4.73 12.547.001 23.915-5.678 11.375-5.67 18-17.264l.713 6.385q1.423 7.57 7.338 11.827c4.11 2.839 9.396 4.257 15.87 4.257q6.158 0 16.104-1.89v-31.46c-2.839-.312-4.896-1.182-6.155-2.597q-1.899-2.37-1.897-8.041V60.022ZM402.355 64.75v167.927h38.843v-54.162h26.285l24.885 41.844s1.475 2.437 2.36 3.546c1.864 2.353 4.52 5.386 6.171 6.572 3.875 2.787 8.531 4.094 15.162 4.094q3.08-.002 6.87-.473 4.03-.477 9.24-1.421v-31.454c-3.146.126-4.58.156-6.475-.87-2.256-1.214-3.896-3.067-5.386-5.285l-1.561-2.636-13.135-22.198q8.523-4.727 14.686-12.061a57 57 0 0 0 9.469-16.793q3.318-9.461 3.317-19.868c0-6.938-1.421-13.793-4.265-20.575a58.9 58.9 0 0 0-11.365-18.212q-7.346-8.276-17.526-13.011c-6.63-3.307-13.896-4.964-21.79-4.964zm38.843 34.057h34.336q4.501.002 8.527 2.84c2.682 1.89 4.896 4.573 6.63 8.042 1.896 3.312 2.843 7.25 2.843 11.823q0 6.858-2.368 12.061c-1.577 3.468-3.632 6.23-6.157 8.282q-3.553 2.834-8.286 2.833h-35.525zm632.189 7.14q-21.08 0-36.004 9.238-14.923 9-22.977 23.923-7.816 14.687-7.816 32.688 0 12.554 4.5 24.16 4.5 11.37 13.028 20.135 8.764 8.763 21.081 13.974 12.317 4.975 28.188 4.975 14.212 0 25.818-4.264 11.844-4.264 20.37-11.607 8.765-7.58 13.502-17.29l-32.214-9.002q-2.842 6.87-10.422 10.896-7.342 4.027-15.87 4.027-6.87 0-13.028-2.843-6.158-3.08-10.185-8.764-3.79-5.684-4.5-13.974h91.905q.236-2.37.473-5.448.474-3.317.473-6.633 0-17.054-7.816-31.503-7.816-14.686-22.74-23.688-14.685-9-35.766-9m156.527.668q-11.132.234-21.311 7.327-10.187 7.101-16.578 19.631v-25.068h-34.817v124.172h37.895v-74.504c3.312-5.678 8.682-9.932 16.104-12.771 7.422-2.995 15.707-4.495 24.864-4.495v-34.058q-.944-.234-2.365-.234zm-675.209 1.89v79.468c0 15.297 3.319 26.963 9.948 35.004 6.63 8.042 16.267 12.063 28.896 12.063q15.627.001 28.183-5.678c8.525-3.942 15.63-10.008 21.311-18.212l.714 7.574c.948 5.04 3.396 8.984 7.344 11.822 3.942 2.683 9.234 4.02 15.864 4.02 2.052 0 4.343-.155 6.87-.474q4.023-.47 9.234-1.415v-31.46c-3-.312-5.13-1.182-6.39-2.597q-1.663-2.37-1.662-8.041v-82.074h-37.89v76.63c-2.371 4.26-5.058 7.729-8.052 10.406-3 2.683-6.083 4.651-9.24 5.917q-4.733 1.649-9.947 1.65-8.288.001-12.788-5.911-4.5-6.149-4.5-17.5v-71.192zm518.207 24.682q7.106 0 13.028 3.316 5.922 3.08 9.475 9.001 3.553 5.684 4.5 13.502h-54.005q.947-7.817 4.501-13.502 3.553-5.921 9.237-9 5.922-3.317 13.264-3.317m-308.61 5.12q5.685-.002 11.134 2.838a33.2 33.2 0 0 1 9.943 7.568c3 3.15 5.293 6.86 6.871 11.115v26.015a34.8 34.8 0 0 1-4.734 7.099q-2.843 3.313-6.396 5.437a37 37 0 0 1-7.104 3.547 26 26 0 0 1-7.819 1.183q-6.39 0-11.842-2.365-5.445-2.36-9.47-6.62c-2.688-2.994-4.817-6.385-6.396-10.171q-2.13-5.914-2.129-12.77 0-6.625 1.892-12.537 2.13-5.915 5.92-10.406c2.526-3.152 5.447-5.6 8.765-7.333q5.209-2.601 11.366-2.6m154.889 0q5.684-.002 11.135 2.838a33.2 33.2 0 0 1 9.942 7.568c3 3.15 5.292 6.86 6.869 11.115v26.015a34.8 34.8 0 0 1-4.733 7.099q-2.843 3.313-6.396 5.437a37 37 0 0 1-7.103 3.547 26 26 0 0 1-7.82 1.183q-6.392 0-11.837-2.365a28.4 28.4 0 0 1-9.475-6.62c-2.688-2.994-4.816-6.385-6.394-10.171q-2.131-5.914-2.13-12.77 0-6.625 1.89-12.537 2.132-5.915 5.922-10.406c2.525-3.152 5.448-5.6 8.765-7.333 3.475-1.735 7.26-2.6 11.365-2.6" style="fill:#041922;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.33331347"/></svg>
\ No newline at end of file
diff --git a/logo/icons/svg/rudder-logo-rect-monochrome-white.svg b/logo/icons/svg/rudder-logo-rect-monochrome-white.svg
new file mode 100644
index 00000000000..728b3591dd0
--- /dev/null
+++ b/logo/icons/svg/rudder-logo-rect-monochrome-white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1300" height="300"><g style="fill:#f95"><path d="M141.797 18.77c-51.836 0-93.856 41.964-93.859 93.726a93.68 93.68 0 0 0 27.492 66.281 93.92 93.92 0 0 0 66.367 27.453 93.93 93.93 0 0 0 66.363-27.457 93.66 93.66 0 0 0 27.488-66.277 93.66 93.66 0 0 0-24.433-62.914l-61.246 68.184a9.57 9.57 0 0 1-6.809 2.816 9.58 9.58 0 0 1-6.812-2.816c-3.766-3.758-3.766-9.852 0-13.614l68.269-61.148a93.94 93.94 0 0 0-62.82-24.234m-15.738 34.312c2.691 6.012 8.718 10.199 15.742 10.199 7.011 0 13.043-4.187 15.734-10.199a61.7 61.7 0 0 1 15.199 6.313c-.609 1.566-.945 3.207-1.074 4.843l-20.578 17.891a31.4 31.4 0 0 0-9.281-1.387C124.266 80.742 110 94.98 110 112.508c0 17.5 14.266 31.75 31.801 31.75 17.527 0 31.797-14.25 31.797-31.75 0-3.383-.543-6.629-1.516-9.68l17.547-20.156a17.4 17.4 0 0 0 5.344-1.059 61 61 0 0 1 6.316 15.157c-6.012 2.703-10.203 8.722-10.203 15.738 0 7.004 4.191 13.019 10.203 15.707a61 61 0 0 1-6.316 15.168c-6.153-2.321-13.368-1.035-18.325 3.91-4.96 4.961-6.253 12.152-3.914 18.309a61.4 61.4 0 0 1-15.199 6.308c-2.691-6.004-8.723-10.195-15.734-10.195-7.024 0-13.051 4.191-15.742 10.195a61 61 0 0 1-15.188-6.308c2.336-6.157 1.035-13.348-3.93-18.309-4.937-4.945-12.16-6.231-18.312-3.91a61 61 0 0 1-6.328-15.168c6.015-2.688 10.211-8.703 10.211-15.707 0-7.016-4.196-13.035-10.211-15.723a61.2 61.2 0 0 1 6.328-15.172c6.152 2.321 13.375 1.035 18.312-3.929 4.965-4.946 6.266-12.145 3.93-18.289a61.3 61.3 0 0 1 15.188-6.313" style="fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1.33333)"/></g><path d="M792.01 60.025v68.821c-3.636-6.78-9-12.219-16.11-16.317-7.103-4.262-14.993-6.387-23.681-6.387q-16.103 0-28.418 8.516c-8.213 5.671-14.686 13.402-19.42 23.177-4.74 9.62-7.104 20.5-7.104 32.64 0 9.146 1.415 17.657 4.259 25.542q4.266 11.827 12.078 20.576c5.37 5.833 11.604 10.407 18.714 13.719q10.89 4.729 23.682 4.73c8.363 0 16.339-1.892 23.916-5.678q11.376-5.67 18-17.265l.713 6.386q1.423 7.569 7.338 11.827c4.11 2.838 9.396 4.256 15.87 4.256q6.158 0 16.104-1.89v-31.46c-2.838-.311-4.89-1.181-6.155-2.597-1.267-1.579-1.896-4.26-1.896-8.041V60.025Zm154.889 0v68.821c-3.636-6.78-9-12.219-16.11-16.317-7.104-4.262-14.994-6.387-23.682-6.387q-16.1 0-28.42 8.516c-8.21 5.671-14.684 13.402-19.419 23.177-4.74 9.62-7.103 20.5-7.103 32.64 0 9.146 1.415 17.657 4.26 25.542q4.265 11.827 12.077 20.576c5.37 5.833 11.605 10.407 18.714 13.719 7.26 3.152 15.157 4.73 23.683 4.73q12.548 0 23.915-5.678 11.376-5.67 18-17.265l.713 6.386q1.423 7.569 7.338 11.827c4.11 2.838 9.396 4.256 15.871 4.256q6.157 0 16.103-1.89v-31.46c-2.838-.311-4.895-1.181-6.155-2.597-1.267-1.579-1.896-4.26-1.896-8.041V60.025Zm-544.55 4.726v167.927h38.844v-54.161h26.284l24.886 41.844s1.475 2.436 2.36 3.545c1.864 2.354 4.52 5.386 6.17 6.573 3.875 2.786 8.532 4.094 15.162 4.094q3.08-.002 6.87-.474 4.031-.476 9.24-1.421v-31.453c-3.145.125-4.58.155-6.474-.87-2.256-1.215-3.896-3.067-5.387-5.286l-1.56-2.636-13.136-22.198q8.524-4.726 14.687-12.061a57 57 0 0 0 9.468-16.793q3.32-9.46 3.318-19.868 0-10.404-4.266-20.574a58.9 58.9 0 0 0-11.364-18.213q-7.345-8.276-17.527-13.01c-6.629-3.307-13.896-4.965-21.79-4.965zm38.844 34.057h34.336c3 0 5.844.95 8.526 2.84 2.683 1.89 4.896 4.573 6.63 8.042 1.896 3.312 2.843 7.25 2.843 11.823q0 6.858-2.368 12.061t-6.157 8.282q-3.553 2.834-8.286 2.833h-35.524zm632.188 7.14q-21.08 0-36.004 9.238-14.923 9-22.977 23.924-7.816 14.685-7.816 32.688 0 12.553 4.5 24.16 4.5 11.37 13.028 20.134 8.764 8.763 21.081 13.975 12.318 4.974 28.188 4.974 14.212 0 25.819-4.264 11.843-4.263 20.37-11.606 8.764-7.58 13.502-17.29l-32.215-9.002q-2.842 6.87-10.421 10.896-7.343 4.026-15.87 4.026-6.87 0-13.029-2.842-6.158-3.08-10.185-8.764-3.79-5.685-4.5-13.975h91.905q.236-2.369.473-5.448.474-3.316.473-6.633 0-17.054-7.815-31.502-7.818-14.687-22.74-23.688-14.686-9-35.767-9m156.527.669q-11.131.232-21.31 7.327-10.188 7.1-16.579 19.63v-25.068h-34.817v124.172h37.896v-74.504q4.97-8.514 16.103-12.77c7.423-2.995 15.707-4.496 24.864-4.496V106.85q-.943-.234-2.365-.234zm-675.208 1.89v79.468q.002 22.943 9.947 35.003c6.631 8.043 16.267 12.063 28.896 12.063q15.628.002 28.183-5.677c8.526-3.943 15.63-10.009 21.311-18.213l.714 7.574q1.422 7.563 7.344 11.823c3.943 2.682 9.234 4.02 15.865 4.02q3.078.002 6.869-.475 4.024-.47 9.234-1.415v-31.46c-3-.311-5.13-1.181-6.39-2.597q-1.663-2.369-1.662-8.041v-82.074h-37.89v76.63q-3.558 6.391-8.052 10.406c-3 2.683-6.083 4.652-9.239 5.917q-4.735 1.65-9.948 1.651-8.287 0-12.787-5.912-4.5-6.148-4.5-17.5v-71.192zm518.207 24.682q7.106 0 13.027 3.315 5.922 3.08 9.475 9.002 3.554 5.685 4.501 13.501h-54.006q.948-7.816 4.501-13.501 3.553-5.922 9.238-9.002 5.92-3.315 13.263-3.315m-308.61 5.12c3.79 0 7.499.943 11.134 2.838a33.2 33.2 0 0 1 9.943 7.568c3 3.15 5.292 6.86 6.87 11.115v26.014a34.8 34.8 0 0 1-4.734 7.1q-2.842 3.311-6.396 5.436a37 37 0 0 1-7.103 3.548 26 26 0 0 1-7.82 1.182q-6.39.001-11.842-2.365-5.445-2.36-9.47-6.62c-2.688-2.994-4.817-6.384-6.396-10.17q-2.13-5.914-2.129-12.772 0-6.623 1.892-12.536 2.131-5.913 5.921-10.406c2.525-3.152 5.447-5.6 8.764-7.333 3.475-1.735 7.26-2.6 11.366-2.6m154.888 0c3.791 0 7.5.943 11.135 2.838a33.2 33.2 0 0 1 9.942 7.568c3 3.15 5.292 6.86 6.87 11.115v26.014a34.8 34.8 0 0 1-4.733 7.1q-2.843 3.311-6.396 5.436a37 37 0 0 1-7.104 3.548 26 26 0 0 1-7.819 1.182c-4.26 0-8.209-.787-11.838-2.365a28.4 28.4 0 0 1-9.474-6.62c-2.688-2.994-4.816-6.384-6.395-10.17q-2.13-5.914-2.13-12.772 0-6.623 1.89-12.536 2.133-5.913 5.922-10.406c2.526-3.152 5.448-5.6 8.766-7.333q5.21-2.601 11.364-2.6" style="fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.33331347"/></svg>
\ No newline at end of file
diff --git a/logo/icons/svg/rudder-logo-rect-white.svg b/logo/icons/svg/rudder-logo-rect-white.svg
new file mode 100644
index 00000000000..cc40e56ac3b
--- /dev/null
+++ b/logo/icons/svg/rudder-logo-rect-white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1300" height="300"><path d="M141.797 18.77c-51.836 0-93.856 41.964-93.859 93.726a93.68 93.68 0 0 0 27.492 66.281 93.92 93.92 0 0 0 66.367 27.453 93.93 93.93 0 0 0 66.363-27.457 93.66 93.66 0 0 0 27.488-66.277 93.66 93.66 0 0 0-24.433-62.914l-61.246 68.184a9.57 9.57 0 0 1-6.809 2.816 9.58 9.58 0 0 1-6.812-2.816c-3.766-3.758-3.766-9.852 0-13.614l68.269-61.148a93.94 93.94 0 0 0-62.82-24.234m-15.738 34.312c2.691 6.012 8.718 10.199 15.742 10.199 7.011 0 13.043-4.187 15.734-10.199a61.7 61.7 0 0 1 15.199 6.313c-.609 1.566-.945 3.207-1.074 4.843l-20.578 17.891a31.4 31.4 0 0 0-9.281-1.387C124.266 80.742 110 94.98 110 112.508c0 17.5 14.266 31.75 31.801 31.75 17.527 0 31.797-14.25 31.797-31.75 0-3.383-.543-6.629-1.516-9.68l17.547-20.156a17.4 17.4 0 0 0 5.344-1.059 61 61 0 0 1 6.316 15.157c-6.012 2.703-10.203 8.722-10.203 15.738 0 7.004 4.191 13.019 10.203 15.707a61 61 0 0 1-6.316 15.168c-6.153-2.321-13.368-1.035-18.325 3.91-4.96 4.961-6.253 12.152-3.914 18.309a61.4 61.4 0 0 1-15.199 6.308c-2.691-6.004-8.723-10.195-15.734-10.195-7.024 0-13.051 4.191-15.742 10.195a61 61 0 0 1-15.188-6.308c2.336-6.157 1.035-13.348-3.93-18.309-4.937-4.945-12.16-6.231-18.312-3.91a61 61 0 0 1-6.328-15.168c6.015-2.688 10.211-8.703 10.211-15.707 0-7.016-4.196-13.035-10.211-15.723a61.2 61.2 0 0 1 6.328-15.172c6.152 2.321 13.375 1.035 18.312-3.929 4.965-4.946 6.266-12.145 3.93-18.289a61.3 61.3 0 0 1 15.188-6.313" style="fill:#13beb7;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="scale(1.33333)"/><path d="M792.01 60.025v68.821c-3.636-6.78-9-12.219-16.11-16.317-7.103-4.262-14.993-6.387-23.681-6.387q-16.104 0-28.418 8.515c-8.213 5.672-14.686 13.403-19.42 23.178-4.74 9.62-7.104 20.5-7.104 32.64 0 9.146 1.415 17.657 4.259 25.542q4.266 11.827 12.078 20.576c5.37 5.833 11.604 10.407 18.714 13.719q10.89 4.729 23.682 4.73c8.363 0 16.339-1.892 23.916-5.678q11.375-5.67 18-17.265l.713 6.386q1.423 7.569 7.338 11.827c4.11 2.838 9.396 4.256 15.87 4.256q6.158 0 16.104-1.89v-31.46c-2.838-.311-4.89-1.181-6.155-2.597-1.267-1.579-1.896-4.26-1.896-8.041V60.025Zm154.888 0v68.821c-3.635-6.78-9-12.219-16.11-16.317-7.103-4.262-14.993-6.387-23.681-6.387q-16.1 0-28.42 8.515c-8.21 5.672-14.684 13.403-19.419 23.178-4.74 9.62-7.103 20.5-7.103 32.64 0 9.146 1.415 17.657 4.26 25.542q4.266 11.827 12.077 20.576c5.37 5.833 11.605 10.407 18.714 13.719 7.26 3.152 15.157 4.73 23.683 4.73q12.548 0 23.915-5.678 11.376-5.67 18-17.265l.713 6.386q1.424 7.569 7.338 11.827c4.11 2.838 9.396 4.256 15.871 4.256q6.157 0 16.103-1.89v-31.46c-2.838-.311-4.895-1.181-6.155-2.597-1.267-1.579-1.896-4.26-1.896-8.041V60.025ZM402.35 64.75v167.927h38.844v-54.161h26.284l24.886 41.844s1.475 2.436 2.36 3.545c1.864 2.354 4.52 5.386 6.17 6.573 3.875 2.786 8.532 4.094 15.162 4.094q3.08-.002 6.87-.474 4.031-.476 9.24-1.421v-31.453c-3.145.125-4.58.155-6.474-.87-2.256-1.215-3.896-3.067-5.387-5.286l-1.56-2.636-13.136-22.198q8.524-4.726 14.687-12.061a57 57 0 0 0 9.468-16.793q3.32-9.46 3.318-19.868 0-10.404-4.266-20.574a58.9 58.9 0 0 0-11.364-18.213q-7.345-8.276-17.527-13.01c-6.629-3.307-13.896-4.965-21.79-4.965zm38.844 34.057h34.336c3 0 5.843.95 8.526 2.84s4.896 4.573 6.63 8.042c1.896 3.312 2.843 7.25 2.843 11.823q0 6.858-2.368 12.061t-6.157 8.282q-3.553 2.834-8.286 2.833h-35.524zm632.188 7.14q-21.08 0-36.004 9.238-14.923 9-22.977 23.924-7.816 14.685-7.816 32.688 0 12.553 4.5 24.16 4.5 11.37 13.028 20.134 8.764 8.763 21.081 13.975 12.318 4.974 28.188 4.974 14.212 0 25.819-4.264 11.842-4.263 20.37-11.606 8.764-7.58 13.502-17.29l-32.215-9.002q-2.842 6.87-10.421 10.896-7.343 4.026-15.87 4.026-6.87 0-13.029-2.842-6.158-3.08-10.185-8.764-3.79-5.685-4.5-13.975h91.905q.236-2.369.473-5.448.474-3.316.473-6.633 0-17.054-7.815-31.502-7.818-14.687-22.74-23.688-14.686-9-35.767-9m156.527.669q-11.131.232-21.31 7.327-10.188 7.1-16.579 19.63v-25.068h-34.817v124.172h37.895v-74.504c3.312-5.677 8.683-9.932 16.104-12.77 7.423-2.995 15.707-4.496 24.864-4.496V106.85q-.943-.234-2.365-.234zm-675.208 1.89v79.468q.002 22.943 9.947 35.003c6.631 8.043 16.267 12.063 28.896 12.063q15.628.002 28.183-5.677c8.526-3.943 15.63-10.009 21.311-18.213l.714 7.574q1.422 7.563 7.344 11.823c3.943 2.682 9.234 4.02 15.865 4.02q3.078.002 6.869-.475 4.024-.47 9.234-1.415v-31.46c-3-.311-5.13-1.181-6.39-2.597q-1.663-2.369-1.662-8.041v-82.074h-37.89v76.63q-3.558 6.391-8.052 10.406c-3 2.683-6.083 4.652-9.239 5.917q-4.735 1.65-9.948 1.651-8.287 0-12.787-5.912-4.5-6.148-4.5-17.5v-71.192zm518.206 24.682q7.106 0 13.028 3.315 5.922 3.08 9.475 9.002 3.554 5.685 4.501 13.501h-54.006q.948-7.816 4.501-13.501 3.553-5.922 9.238-9.002 5.92-3.315 13.263-3.315m-308.609 5.12c3.79 0 7.499.943 11.134 2.838a33.2 33.2 0 0 1 9.943 7.568c3 3.15 5.292 6.86 6.87 11.115v26.014a34.8 34.8 0 0 1-4.734 7.1q-2.842 3.311-6.396 5.436a37 37 0 0 1-7.103 3.548 26 26 0 0 1-7.82 1.182q-6.39.001-11.842-2.365-5.445-2.36-9.47-6.62c-2.688-2.994-4.817-6.384-6.396-10.17q-2.13-5.914-2.129-12.772 0-6.623 1.892-12.536 2.131-5.913 5.921-10.406c2.525-3.152 5.447-5.6 8.764-7.333 3.475-1.735 7.26-2.6 11.366-2.6m154.888 0c3.791 0 7.5.943 11.135 2.838a33.2 33.2 0 0 1 9.942 7.568c3 3.15 5.292 6.86 6.87 11.115v26.014a34.8 34.8 0 0 1-4.733 7.1q-2.843 3.311-6.396 5.436a37 37 0 0 1-7.104 3.548 26 26 0 0 1-7.819 1.182c-4.26 0-8.209-.787-11.838-2.365a28.4 28.4 0 0 1-9.474-6.62c-2.688-2.994-4.816-6.384-6.395-10.17q-2.13-5.914-2.13-12.772 0-6.623 1.89-12.536 2.133-5.913 5.922-10.406c2.526-3.152 5.448-5.6 8.766-7.333q5.21-2.601 11.364-2.6" style="fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.33331347"/></svg>
\ No newline at end of file
diff --git a/logo/icons/svg/rudder-logo-square-black.svg b/logo/icons/svg/rudder-logo-square-black.svg
new file mode 100644
index 00000000000..a1d6dbc099f
--- /dev/null
+++ b/logo/icons/svg/rudder-logo-square-black.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1080" height="1080"><g style="stroke-width:.109073"><path d="M66.983-78.185a28.9 28.9 0 0 1-28.899-28.897 28.9 28.9 0 0 1 28.899-28.899 28.9 28.9 0 0 1 28.897 28.899 28.9 28.9 0 0 1-7.523 19.398L69.5-108.707a2.95 2.95 0 0 0-2.096-.868 2.967 2.967 0 0 0-2.098 5.065l21.02 18.853a28.9 28.9 0 0 1-19.342 7.472m-4.846-10.58a5.307 5.307 0 0 1 9.692 0 19 19 0 0 0 4.68-1.945 5.2 5.2 0 0 1-.33-1.493l-6.34-5.517a9.7 9.7 0 0 1-2.857.427c-5.399 0-9.791-4.39-9.791-9.793 0-5.396 4.392-9.789 9.791-9.789 5.396 0 9.79 4.393 9.79 9.789a9.8 9.8 0 0 1-.466 2.984l5.403 6.214c.56.023 1.112.13 1.645.327a19 19 0 0 0 1.945-4.673 5.32 5.32 0 0 1-3.142-4.852c0-2.16 1.29-4.015 3.142-4.843a18.8 18.8 0 0 0-1.945-4.677 5.32 5.32 0 0 1-5.642-1.206 5.3 5.3 0 0 1-1.206-5.644 19 19 0 0 0-4.68-1.945 5.307 5.307 0 0 1-9.691 0c-1.661.439-3.23 1.1-4.677 1.945a5.3 5.3 0 0 1-1.209 5.644c-1.52 1.525-3.744 1.921-5.638 1.206a18.8 18.8 0 0 0-1.948 4.677 5.305 5.305 0 0 1 0 9.69 19 19 0 0 0 1.948 4.678 5.3 5.3 0 0 1 5.638 1.21 5.3 5.3 0 0 1 1.21 5.64 19 19 0 0 0 4.676 1.946" style="opacity:1;fill:#13beb7;fill-opacity:1;stroke:none;stroke-width:4.93193007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:.22977301" transform="matrix(11.46029 0 0 -11.46029 -227.633 -847.415)"/></g><path d="M505.318 807.549v87.762c-4.636-8.648-11.477-15.583-20.543-20.81-9.059-5.433-19.12-8.144-30.199-8.144-13.688 0-25.77 3.62-36.238 10.86-10.474 7.233-18.728 17.09-24.766 29.556-6.044 12.268-9.058 26.14-9.058 41.622 0 11.663 1.805 22.517 5.431 32.572q5.441 15.082 15.403 26.238c6.847 7.439 14.797 13.27 23.863 17.494q13.888 6.03 30.2 6.031c10.665 0 20.835-2.411 30.497-7.24q14.506-7.23 22.953-22.015l.91 8.142q1.816 9.653 9.358 15.082c5.24 3.62 11.982 5.428 20.238 5.428q7.852 0 20.535-2.41V987.6c-3.62-.398-6.236-1.507-7.85-3.313q-2.419-3.02-2.417-10.254V807.55zm197.514 0v87.762c-4.637-8.648-11.477-15.583-20.543-20.81-9.059-5.433-19.12-8.144-30.2-8.144q-20.532 0-36.241 10.86c-10.469 7.233-18.724 17.09-24.762 29.556-6.044 12.268-9.059 26.14-9.059 41.622 0 11.663 1.805 22.517 5.432 32.572q5.44 15.082 15.402 26.238c6.847 7.439 14.798 13.27 23.864 17.494 9.257 4.02 19.328 6.031 30.2 6.031q16 .002 30.497-7.24 14.506-7.23 22.953-22.015l.91 8.142q1.815 9.653 9.358 15.082c5.24 3.62 11.981 5.428 20.238 5.428q7.851 0 20.535-2.41V987.6c-3.62-.398-6.243-1.507-7.85-3.313-1.615-2.013-2.418-5.432-2.418-10.254V807.55zm-694.41 6.027v214.14h49.533V958.65h33.518l31.734 53.36s1.88 3.107 3.01 4.521c2.377 3.001 5.764 6.868 7.869 8.381 4.94 3.554 10.879 5.22 19.334 5.22 2.617 0 5.54-.203 8.76-.603q5.14-.608 11.783-1.812v-40.11c-4.011.16-5.84.199-8.256-1.109-2.877-1.549-4.968-3.911-6.87-6.74l-1.99-3.362-16.75-28.306q10.87-6.029 18.73-15.381a72.6 72.6 0 0 0 12.073-21.414c2.823-8.042 4.23-16.49 4.23-25.336q0-13.267-5.439-26.236c-3.419-8.648-8.248-16.385-14.492-23.225q-9.366-10.553-22.35-16.592c-8.453-4.216-17.72-6.33-27.786-6.33zm49.533 43.43h43.785c3.826 0 7.452 1.21 10.873 3.62 3.421 2.412 6.243 5.833 8.455 10.257 2.418 4.223 3.625 9.244 3.625 15.076q0 8.745-3.02 15.38c-2.01 4.423-4.63 7.945-7.85 10.561q-4.532 3.615-10.567 3.614h-45.3zm806.168 9.105q-26.883 0-45.912 11.78-19.03 11.478-29.3 30.507-9.968 18.728-9.968 41.684 0 16.009 5.739 30.809 5.74 14.499 16.613 25.675 11.175 11.176 26.883 17.82 15.707 6.345 35.945 6.344 18.123 0 32.924-5.437 15.102-5.437 25.976-14.8 11.177-9.666 17.217-22.05l-41.08-11.478q-3.624 8.76-13.289 13.894-9.364 5.135-20.238 5.135-8.76 0-16.613-3.625-7.854-3.927-12.989-11.176-4.832-7.249-5.738-17.82H947.49q.302-3.021.604-6.947.603-4.23.603-8.46.001-21.747-9.967-40.171-9.967-18.728-28.998-30.207-18.727-11.477-45.609-11.477m199.604.852q-14.195.298-27.176 9.344-12.991 9.054-21.14 25.033v-31.967h-44.4v158.344h48.325v-95.008c4.223-7.24 11.072-12.665 20.535-16.285 9.465-3.819 20.03-5.733 31.707-5.733v-43.43q-1.205-.297-3.015-.298zm-861.028 2.41v101.338c0 19.507 4.232 34.382 12.686 44.637s20.743 15.382 36.847 15.382c13.284 0 25.267-2.411 35.94-7.24 10.871-5.028 19.93-12.763 27.176-23.224l.91 9.658q1.813 9.644 9.365 15.076c5.028 3.42 11.775 5.127 20.23 5.127q3.926.001 8.76-.605c3.421-.398 7.345-1.003 11.776-1.805V987.6c-3.826-.398-6.542-1.507-8.149-3.313q-2.12-3.02-2.119-10.254v-104.66h-48.318v97.719c-3.023 5.432-6.45 9.855-10.268 13.27-3.825 3.42-7.757 5.93-11.781 7.544-4.025 1.401-8.255 2.106-12.686 2.106q-10.567.001-16.306-7.54-5.739-7.84-5.739-22.316v-90.783zm660.819 31.475q9.061 0 16.613 4.228 7.55 3.927 12.082 11.479 4.531 7.249 5.74 17.216h-68.869q1.209-9.967 5.74-17.216 4.53-7.552 11.78-11.479 7.55-4.228 16.914-4.228m-393.54 6.529c4.834 0 9.563 1.203 14.198 3.62a42.4 42.4 0 0 1 12.68 9.65c3.825 4.017 6.748 8.748 8.761 14.173v33.174c-1.608 3.22-3.626 6.237-6.037 9.053q-3.626 4.224-8.156 6.933a47.3 47.3 0 0 1-9.059 4.524 33.2 33.2 0 0 1-9.97 1.508q-8.15.001-15.102-3.016-6.945-3.01-12.076-8.441c-3.428-3.819-6.143-8.142-8.156-12.971-1.813-5.028-2.715-10.455-2.715-16.285 0-5.633.803-10.959 2.412-15.986q2.718-7.542 7.55-13.27c3.22-4.02 6.946-7.141 11.176-9.352 4.431-2.212 9.26-3.314 14.495-3.314m197.514 0c4.834 0 9.565 1.203 14.2 3.62a42.4 42.4 0 0 1 12.677 9.65c3.826 4.017 6.749 8.748 8.76 14.173v33.174c-1.607 3.22-3.624 6.237-6.035 9.053q-3.625 4.224-8.157 6.933a47.3 47.3 0 0 1-9.058 4.524 33.2 33.2 0 0 1-9.97 1.508c-5.433 0-10.468-1.004-15.096-3.016q-6.954-3.01-12.083-8.441c-3.427-3.819-6.14-8.142-8.154-12.971q-2.717-7.541-2.717-16.285c0-5.633.804-10.959 2.41-15.986q2.721-7.542 7.553-13.27c3.22-4.02 6.948-7.141 11.178-9.352 4.43-2.212 9.257-3.314 14.492-3.314" style="fill:#041922;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70024383"/></svg>
\ No newline at end of file
diff --git a/logo/icons/svg/rudder-logo-square-monochrome-black.svg b/logo/icons/svg/rudder-logo-square-monochrome-black.svg
new file mode 100644
index 00000000000..5dd5a3258bf
--- /dev/null
+++ b/logo/icons/svg/rudder-logo-square-monochrome-black.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1080" height="1080"><g style="stroke-width:.109073"><path d="M66.983-78.185a28.9 28.9 0 0 1-28.899-28.897 28.9 28.9 0 0 1 28.899-28.899 28.9 28.9 0 0 1 28.897 28.899 28.9 28.9 0 0 1-7.523 19.398L69.5-108.707a2.95 2.95 0 0 0-2.096-.868 2.967 2.967 0 0 0-2.098 5.065l21.02 18.853a28.9 28.9 0 0 1-19.342 7.472m-4.846-10.58a5.307 5.307 0 0 1 9.692 0 19 19 0 0 0 4.68-1.945 5.2 5.2 0 0 1-.33-1.493l-6.34-5.517a9.7 9.7 0 0 1-2.857.427c-5.399 0-9.791-4.39-9.791-9.793 0-5.396 4.392-9.789 9.791-9.789 5.396 0 9.79 4.393 9.79 9.789a9.8 9.8 0 0 1-.466 2.984l5.403 6.214c.56.023 1.112.13 1.645.327a19 19 0 0 0 1.945-4.673 5.32 5.32 0 0 1-3.142-4.852c0-2.16 1.29-4.015 3.142-4.843a18.8 18.8 0 0 0-1.945-4.677 5.32 5.32 0 0 1-5.642-1.206 5.3 5.3 0 0 1-1.206-5.644 19 19 0 0 0-4.68-1.945 5.307 5.307 0 0 1-9.691 0c-1.661.439-3.23 1.1-4.677 1.945a5.3 5.3 0 0 1-1.209 5.644c-1.52 1.525-3.744 1.921-5.638 1.206a18.8 18.8 0 0 0-1.948 4.677 5.305 5.305 0 0 1 0 9.69 19 19 0 0 0 1.948 4.678 5.3 5.3 0 0 1 5.638 1.21 5.3 5.3 0 0 1 1.21 5.64 19 19 0 0 0 4.676 1.946" style="opacity:1;fill:#041922;fill-opacity:1;stroke:none;stroke-width:4.93193007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:.22977301" transform="matrix(11.46029 0 0 -11.46029 -227.633 -847.415)"/></g><path d="M505.319 807.549v87.762c-4.637-8.648-11.477-15.583-20.543-20.81-9.059-5.433-19.12-8.144-30.2-8.144q-20.534 0-36.238 10.86c-10.473 7.233-18.728 17.09-24.765 29.556-6.045 12.268-9.059 26.14-9.059 41.622 0 11.663 1.805 22.517 5.432 32.572q5.44 15.082 15.402 26.238c6.847 7.439 14.798 13.27 23.864 17.494 9.257 4.02 19.326 6.031 30.199 6.031 10.665 0 20.835-2.411 30.498-7.24q14.506-7.23 22.953-22.015l.91 8.142q1.815 9.653 9.358 15.082c5.24 3.62 11.981 5.428 20.238 5.428q7.851 0 20.535-2.41V987.6c-3.62-.398-6.236-1.507-7.85-3.313-1.615-2.013-2.418-5.432-2.418-10.254V807.55zm197.514 0v87.762c-4.637-8.648-11.478-15.583-20.543-20.81-9.06-5.433-19.12-8.144-30.2-8.144q-20.532 0-36.242 10.86c-10.468 7.233-18.724 17.09-24.761 29.556-6.045 12.268-9.059 26.14-9.059 41.622 0 11.663 1.805 22.517 5.432 32.572q5.439 15.082 15.402 26.238c6.847 7.439 14.798 13.27 23.863 17.494 9.258 4.02 19.328 6.031 30.201 6.031q16 .002 30.497-7.24 14.505-7.23 22.953-22.015l.91 8.142q1.815 9.653 9.357 15.082c5.24 3.62 11.982 5.428 20.238 5.428q7.851 0 20.536-2.41V987.6c-3.62-.398-6.243-1.507-7.85-3.313-1.615-2.013-2.418-5.432-2.418-10.254V807.55Zm-694.41 6.027v214.14h49.533V958.65h33.517l31.735 53.36s1.88 3.107 3.01 4.521c2.376 3.001 5.764 6.868 7.869 8.381 4.94 3.554 10.878 5.22 19.334 5.22 2.616 0 5.539-.203 8.76-.603q5.14-.608 11.783-1.812v-40.11c-4.011.16-5.84.199-8.256-1.109-2.877-1.549-4.969-3.911-6.87-6.74l-1.99-3.361-16.75-28.307q10.87-6.028 18.729-15.381a72.6 72.6 0 0 0 12.074-21.414c2.822-8.042 4.23-16.49 4.23-25.336q0-13.267-5.439-26.236c-3.42-8.648-8.249-16.385-14.492-23.225-6.243-7.034-13.696-12.567-22.35-16.592-8.453-4.216-17.72-6.33-27.787-6.33zm49.533 43.43h43.785c3.825 0 7.452 1.21 10.873 3.62 3.42 2.412 6.243 5.833 8.455 10.257 2.418 4.223 3.625 9.244 3.625 15.076q0 8.745-3.02 15.38-3.018 6.636-7.851 10.561-4.53 3.615-10.567 3.614h-45.3Zm806.168 9.105q-26.883 0-45.912 11.78-19.031 11.478-29.301 30.507-9.967 18.728-9.967 41.684 0 16.009 5.738 30.809 5.739 14.499 16.614 25.675 11.175 11.176 26.882 17.82 15.708 6.345 35.946 6.345 18.123 0 32.923-5.438 15.103-5.437 25.977-14.8 11.176-9.666 17.217-22.05l-41.08-11.478q-3.624 8.76-13.29 13.894-9.363 5.135-20.238 5.135-8.76 0-16.613-3.625-7.853-3.927-12.988-11.176-4.832-7.248-5.738-17.82H947.49q.302-3.021.603-6.947.604-4.23.604-8.46 0-21.746-9.967-40.171-9.968-18.728-28.998-30.207-18.726-11.478-45.61-11.477m199.603.852q-14.194.298-27.176 9.344-12.99 9.055-21.14 25.033v-31.967H971.01v158.344h48.325v-95.008c4.223-7.24 11.071-12.665 20.535-16.285 9.465-3.819 20.03-5.733 31.707-5.733v-43.43q-1.204-.298-3.016-.298zm-861.027 2.41v101.338c0 19.507 4.232 34.382 12.685 44.637 8.456 10.256 20.743 15.383 36.848 15.383 13.284 0 25.267-2.412 35.94-7.24 10.87-5.028 19.93-12.764 27.175-23.225l.91 9.658q1.814 9.644 9.366 15.076c5.027 3.42 11.775 5.127 20.23 5.127q3.926.001 8.76-.605c3.42-.398 7.344-1.003 11.775-1.805V987.6c-3.825-.398-6.541-1.507-8.148-3.313q-2.121-3.02-2.12-10.254v-104.66h-48.318v97.719q-4.536 8.148-10.267 13.27c-3.826 3.42-7.757 5.93-11.781 7.544-4.025 1.401-8.255 2.106-12.686 2.106q-10.568.001-16.307-7.54-5.738-7.84-5.738-22.316v-90.783zm660.818 31.475q9.063 0 16.613 4.228 7.552 3.927 12.083 11.479 4.53 7.249 5.74 17.217h-68.87q1.21-9.968 5.74-17.217 4.531-7.552 11.78-11.479 7.551-4.228 16.914-4.228m-393.539 6.529c4.834 0 9.563 1.203 14.197 3.62a42.4 42.4 0 0 1 12.68 9.65c3.826 4.017 6.749 8.748 8.762 14.173v33.174c-1.609 3.22-3.626 6.237-6.037 9.053q-3.626 4.225-8.157 6.933a47.2 47.2 0 0 1-9.058 4.524 33.2 33.2 0 0 1-9.97 1.508q-8.15.001-15.102-3.016-6.945-3.01-12.077-8.441c-3.427-3.819-6.143-8.142-8.156-12.971q-2.716-7.541-2.715-16.285c0-5.633.804-10.959 2.412-15.986q2.72-7.542 7.551-13.27c3.22-4.02 6.946-7.141 11.176-9.352 4.43-2.212 9.26-3.314 14.494-3.314m197.514 0c4.834 0 9.564 1.203 14.199 3.62a42.4 42.4 0 0 1 12.678 9.65c3.825 4.017 6.748 8.748 8.76 14.173v33.174c-1.607 3.22-3.625 6.237-6.036 9.053q-3.625 4.225-8.156 6.933a47.2 47.2 0 0 1-9.058 4.524 33.2 33.2 0 0 1-9.971 1.508c-5.432 0-10.468-1.004-15.096-3.016q-6.952-3.01-12.082-8.441c-3.428-3.819-6.141-8.142-8.154-12.971q-2.718-7.541-2.717-16.285c0-5.633.803-10.959 2.41-15.986q2.72-7.542 7.553-13.27c3.22-4.02 6.947-7.141 11.178-9.352 4.43-2.212 9.257-3.314 14.492-3.314" style="fill:#041922;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70024383"/></svg>
\ No newline at end of file
diff --git a/logo/icons/svg/rudder-logo-square-monochrome-white.svg b/logo/icons/svg/rudder-logo-square-monochrome-white.svg
new file mode 100644
index 00000000000..68d8c78b3f6
--- /dev/null
+++ b/logo/icons/svg/rudder-logo-square-monochrome-white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1080" height="1080"><g style="stroke-width:.109073"><path d="M66.983-78.185a28.9 28.9 0 0 1-28.899-28.897 28.9 28.9 0 0 1 28.899-28.899 28.9 28.9 0 0 1 28.897 28.899 28.9 28.9 0 0 1-7.523 19.398L69.5-108.707a2.95 2.95 0 0 0-2.096-.868 2.967 2.967 0 0 0-2.098 5.065l21.02 18.853a28.9 28.9 0 0 1-19.342 7.472m-4.846-10.58a5.307 5.307 0 0 1 9.692 0 19 19 0 0 0 4.68-1.945 5.2 5.2 0 0 1-.33-1.493l-6.34-5.517a9.7 9.7 0 0 1-2.857.427c-5.399 0-9.791-4.39-9.791-9.793 0-5.396 4.392-9.789 9.791-9.789 5.396 0 9.79 4.393 9.79 9.789a9.8 9.8 0 0 1-.466 2.984l5.403 6.214c.56.023 1.112.13 1.645.327a19 19 0 0 0 1.945-4.673 5.32 5.32 0 0 1-3.142-4.852c0-2.16 1.29-4.015 3.142-4.843a18.8 18.8 0 0 0-1.945-4.677 5.32 5.32 0 0 1-5.642-1.206 5.3 5.3 0 0 1-1.206-5.644 19 19 0 0 0-4.68-1.945 5.307 5.307 0 0 1-9.691 0c-1.661.439-3.23 1.1-4.677 1.945a5.3 5.3 0 0 1-1.209 5.644c-1.52 1.525-3.744 1.921-5.638 1.206a18.8 18.8 0 0 0-1.948 4.677 5.305 5.305 0 0 1 0 9.69 19 19 0 0 0 1.948 4.678 5.3 5.3 0 0 1 5.638 1.21 5.3 5.3 0 0 1 1.21 5.64 19 19 0 0 0 4.676 1.946" style="opacity:1;fill:#fff;fill-opacity:1;stroke:none;stroke-width:4.93193007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:.22977301" transform="matrix(11.46029 0 0 -11.46029 -227.633 -847.415)"/></g><path d="M505.318 807.549v87.762c-4.636-8.648-11.477-15.583-20.543-20.81-9.058-5.433-19.12-8.144-30.199-8.144-13.688 0-25.77 3.62-36.238 10.86-10.474 7.233-18.728 17.09-24.766 29.556-6.044 12.268-9.058 26.14-9.058 41.622 0 11.663 1.805 22.517 5.431 32.572q5.441 15.082 15.403 26.238c6.847 7.439 14.797 13.27 23.863 17.494q13.888 6.03 30.2 6.031c10.665 0 20.835-2.411 30.497-7.24q14.506-7.23 22.953-22.015l.91 8.142q1.816 9.653 9.358 15.082c5.24 3.62 11.982 5.428 20.238 5.428q7.852 0 20.535-2.41V987.6c-3.62-.398-6.236-1.507-7.85-3.313q-2.419-3.02-2.417-10.254V807.55zm197.514 0v87.762c-4.637-8.648-11.477-15.583-20.543-20.81-9.059-5.433-19.12-8.144-30.2-8.144q-20.532 0-36.241 10.86c-10.469 7.233-18.724 17.09-24.762 29.556-6.044 12.268-9.059 26.14-9.059 41.622 0 11.663 1.805 22.517 5.432 32.572q5.44 15.082 15.402 26.238c6.847 7.439 14.798 13.27 23.864 17.494 9.257 4.02 19.328 6.031 30.2 6.031q16 .002 30.497-7.24 14.506-7.23 22.953-22.015l.91 8.142q1.816 9.653 9.358 15.082c5.24 3.62 11.982 5.428 20.238 5.428q7.851 0 20.535-2.41V987.6c-3.62-.398-6.243-1.507-7.85-3.313-1.615-2.013-2.418-5.432-2.418-10.254V807.55Zm-694.41 6.027v214.14h49.533V958.65h33.518l31.734 53.36s1.88 3.107 3.01 4.521c2.377 3.001 5.764 6.868 7.869 8.381 4.94 3.554 10.879 5.22 19.334 5.22 2.617 0 5.54-.203 8.76-.603q5.14-.608 11.783-1.812v-40.11c-4.01.16-5.84.199-8.256-1.109-2.877-1.549-4.968-3.911-6.87-6.74l-1.99-3.362-16.75-28.306q10.87-6.028 18.73-15.381a72.6 72.6 0 0 0 12.073-21.414c2.823-8.042 4.23-16.49 4.23-25.336q0-13.267-5.439-26.236c-3.419-8.648-8.248-16.385-14.492-23.225q-9.366-10.553-22.35-16.592c-8.453-4.216-17.72-6.33-27.786-6.33zm49.533 43.43h43.785c3.826 0 7.452 1.21 10.873 3.62 3.421 2.412 6.243 5.833 8.455 10.257 2.418 4.223 3.625 9.244 3.625 15.076q0 8.745-3.02 15.38c-2.01 4.423-4.63 7.945-7.85 10.561q-4.532 3.615-10.567 3.614h-45.3Zm806.168 9.105q-26.883 0-45.912 11.78-19.03 11.478-29.3 30.507-9.968 18.728-9.968 41.684 0 16.009 5.739 30.809 5.74 14.499 16.613 25.675 11.176 11.176 26.883 17.82 15.707 6.345 35.945 6.345 18.123 0 32.924-5.438 15.102-5.437 25.976-14.8 11.177-9.666 17.217-22.05l-41.08-11.478q-3.623 8.76-13.289 13.894-9.364 5.136-20.238 5.135-8.76 0-16.613-3.625-7.853-3.927-12.989-11.176-4.832-7.249-5.738-17.82H947.49q.302-3.021.604-6.947.604-4.23.603-8.46.001-21.746-9.967-40.171-9.967-18.728-28.998-30.207-18.727-11.478-45.609-11.477m199.604.852q-14.195.298-27.176 9.344-12.991 9.055-21.14 25.033v-31.967h-44.4v158.344h48.325v-95.008c4.223-7.24 11.072-12.665 20.535-16.285 9.465-3.819 20.03-5.733 31.707-5.733v-43.43q-1.205-.297-3.015-.298zm-861.028 2.41v101.338c0 19.507 4.232 34.382 12.686 44.637s20.743 15.383 36.847 15.383c13.284 0 25.267-2.412 35.94-7.24 10.871-5.028 19.931-12.764 27.176-23.225l.91 9.658q1.813 9.644 9.365 15.076c5.028 3.42 11.775 5.127 20.23 5.127q3.926.001 8.76-.605c3.421-.398 7.345-1.003 11.776-1.805V987.6c-3.826-.398-6.542-1.507-8.149-3.313q-2.12-3.02-2.119-10.254v-104.66h-48.318v97.719c-3.023 5.432-6.45 9.855-10.268 13.27-3.825 3.42-7.757 5.93-11.781 7.544-4.025 1.401-8.255 2.106-12.686 2.106q-10.567.001-16.306-7.54-5.739-7.84-5.739-22.316v-90.783zm660.819 31.475q9.061 0 16.613 4.228 7.55 3.927 12.082 11.479 4.531 7.249 5.74 17.216h-68.869q1.209-9.967 5.74-17.216 4.53-7.552 11.78-11.479 7.55-4.228 16.914-4.228m-393.54 6.529c4.834 0 9.563 1.203 14.198 3.62a42.4 42.4 0 0 1 12.68 9.65c3.825 4.017 6.748 8.748 8.761 14.173v33.174c-1.608 3.22-3.626 6.237-6.037 9.053q-3.626 4.224-8.156 6.933a47.3 47.3 0 0 1-9.059 4.524 33.2 33.2 0 0 1-9.97 1.508q-8.15.001-15.102-3.016-6.945-3.01-12.076-8.441c-3.428-3.819-6.143-8.142-8.156-12.971-1.813-5.028-2.715-10.455-2.715-16.285 0-5.633.803-10.959 2.412-15.986q2.718-7.542 7.55-13.27c3.22-4.02 6.946-7.141 11.176-9.352q6.644-3.316 14.495-3.314m197.514 0c4.834 0 9.565 1.203 14.2 3.62a42.4 42.4 0 0 1 12.677 9.65c3.826 4.017 6.749 8.748 8.76 14.173v33.174c-1.607 3.22-3.624 6.237-6.035 9.053q-3.626 4.224-8.156 6.933a47.3 47.3 0 0 1-9.06 4.524 33.2 33.2 0 0 1-9.97 1.508c-5.432 0-10.467-1.004-15.095-3.016q-6.953-3.01-12.083-8.441c-3.427-3.819-6.14-8.142-8.154-12.971q-2.717-7.541-2.717-16.285c0-5.633.804-10.959 2.41-15.986q2.721-7.542 7.553-13.27c3.22-4.02 6.948-7.141 11.178-9.352 4.43-2.212 9.257-3.314 14.492-3.314" style="fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70024383"/></svg>
\ No newline at end of file
diff --git a/logo/icons/svg/rudder-logo-square-white.svg b/logo/icons/svg/rudder-logo-square-white.svg
new file mode 100644
index 00000000000..fa567437e8e
--- /dev/null
+++ b/logo/icons/svg/rudder-logo-square-white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1080" height="1080"><g style="stroke-width:.109073"><path d="M66.983-78.185a28.9 28.9 0 0 1-28.899-28.897 28.9 28.9 0 0 1 28.899-28.899 28.9 28.9 0 0 1 28.897 28.899 28.9 28.9 0 0 1-7.523 19.398L69.5-108.707a2.95 2.95 0 0 0-2.096-.868 2.967 2.967 0 0 0-2.098 5.065l21.02 18.853a28.9 28.9 0 0 1-19.342 7.472m-4.846-10.58a5.307 5.307 0 0 1 9.692 0 19 19 0 0 0 4.68-1.945 5.2 5.2 0 0 1-.33-1.493l-6.34-5.517a9.7 9.7 0 0 1-2.857.427c-5.399 0-9.791-4.39-9.791-9.793 0-5.396 4.392-9.789 9.791-9.789 5.396 0 9.79 4.393 9.79 9.789a9.8 9.8 0 0 1-.466 2.984l5.403 6.214c.56.023 1.112.13 1.645.327a19 19 0 0 0 1.945-4.673 5.32 5.32 0 0 1-3.142-4.852c0-2.16 1.29-4.015 3.142-4.843a18.8 18.8 0 0 0-1.945-4.677 5.32 5.32 0 0 1-5.642-1.206 5.3 5.3 0 0 1-1.206-5.644 19 19 0 0 0-4.68-1.945 5.307 5.307 0 0 1-9.691 0c-1.661.439-3.23 1.1-4.677 1.945a5.3 5.3 0 0 1-1.209 5.644c-1.52 1.525-3.744 1.921-5.638 1.206a18.8 18.8 0 0 0-1.948 4.677 5.305 5.305 0 0 1 0 9.69 19 19 0 0 0 1.948 4.678 5.3 5.3 0 0 1 5.638 1.21 5.3 5.3 0 0 1 1.21 5.64 19 19 0 0 0 4.676 1.946" style="opacity:1;fill:#13beb7;fill-opacity:1;stroke:none;stroke-width:4.93193007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:.22977301" transform="matrix(11.46029 0 0 -11.46029 -227.633 -847.415)"/></g><path d="M505.318 807.548v87.762c-4.636-8.647-11.477-15.582-20.543-20.808-9.058-5.434-19.12-8.145-30.199-8.145-13.688 0-25.77 3.62-36.238 10.86-10.474 7.232-18.728 17.09-24.766 29.556-6.044 12.267-9.058 26.14-9.058 41.621 0 11.664 1.805 22.517 5.431 32.572q5.441 15.082 15.403 26.239c6.847 7.438 14.797 13.27 23.863 17.494q13.888 6.03 30.2 6.031c10.665 0 20.835-2.411 30.497-7.24q14.506-7.231 22.953-22.016l.91 8.143q1.816 9.652 9.358 15.082c5.24 3.62 11.982 5.428 20.238 5.428q7.852 0 20.535-2.41v-40.118c-3.62-.398-6.236-1.507-7.85-3.312q-2.419-3.02-2.417-10.254V807.548Zm197.514 0v87.762c-4.637-8.647-11.477-15.582-20.543-20.808-9.059-5.434-19.12-8.145-30.2-8.145q-20.532 0-36.241 10.86c-10.469 7.232-18.724 17.09-24.762 29.556-6.044 12.267-9.059 26.14-9.059 41.621 0 11.664 1.805 22.517 5.432 32.572q5.44 15.082 15.402 26.239c6.847 7.438 14.798 13.27 23.864 17.494 9.257 4.02 19.328 6.031 30.2 6.031q16 .002 30.497-7.24 14.506-7.231 22.953-22.016l.91 8.143q1.816 9.652 9.358 15.082c5.24 3.62 11.982 5.428 20.238 5.428q7.851 0 20.535-2.41v-40.118c-3.62-.398-6.243-1.507-7.85-3.312-1.615-2.013-2.418-5.432-2.418-10.254V807.548Zm-694.41 6.028v214.14h49.533V958.65h33.518l31.734 53.36s1.88 3.106 3.01 4.52c2.377 3.002 5.764 6.869 7.869 8.382 4.94 3.553 10.879 5.22 19.334 5.22 2.617 0 5.54-.203 8.76-.603q5.14-.608 11.783-1.813v-40.109c-4.01.16-5.84.198-8.256-1.11-2.877-1.548-4.968-3.91-6.87-6.74l-1.99-3.36-16.75-28.308q10.87-6.027 18.73-15.38a72.6 72.6 0 0 0 12.073-21.414c2.823-8.043 4.23-16.49 4.23-25.336s-1.812-17.59-5.439-26.237c-3.419-8.647-8.248-16.384-14.492-23.224-6.243-7.034-13.695-12.568-22.35-16.592-8.453-4.217-17.72-6.33-27.786-6.33zm49.533 43.43h43.785c3.826 0 7.452 1.21 10.873 3.62 3.421 2.412 6.243 5.832 8.455 10.256 2.418 4.224 3.625 9.245 3.625 15.077q0 8.745-3.02 15.38c-2.01 4.423-4.63 7.944-7.85 10.561q-4.532 3.614-10.567 3.613h-45.3Zm806.168 9.105q-26.883 0-45.912 11.78-19.03 11.477-29.3 30.507-9.968 18.728-9.968 41.684 0 16.008 5.739 30.808 5.74 14.5 16.613 25.676 11.176 11.175 26.883 17.82 15.707 6.345 35.945 6.344 18.123 0 32.924-5.437 15.102-5.438 25.976-14.801 11.177-9.665 17.217-22.05l-41.08-11.478q-3.623 8.76-13.289 13.895-9.364 5.135-20.238 5.135-8.76 0-16.613-3.625-7.853-3.927-12.989-11.176-4.832-7.249-5.738-17.82H947.49q.302-3.021.604-6.948.604-4.23.603-8.459.001-21.747-9.967-40.171-9.967-18.728-28.998-30.207-18.727-11.478-45.609-11.477m199.604.852q-14.195.297-27.176 9.343-12.991 9.055-21.14 25.033v-31.966h-44.4v158.343h48.325V932.71c4.223-7.24 11.072-12.666 20.535-16.286 9.465-3.818 20.03-5.732 31.707-5.732v-43.43q-1.205-.298-3.015-.298zm-861.028 2.41V970.71c0 19.507 4.232 34.382 12.686 44.636 8.455 10.256 20.743 15.383 36.847 15.383 13.284 0 25.267-2.412 35.94-7.24 10.871-5.028 19.931-12.763 27.176-23.225l.91 9.658q1.813 9.645 9.365 15.077c5.028 3.42 11.775 5.127 20.23 5.127q3.926.002 8.76-.606 5.13-.599 11.776-1.805V987.6c-3.826-.398-6.542-1.507-8.149-3.312q-2.12-3.02-2.119-10.254v-104.66h-48.318v97.718c-3.023 5.433-6.45 9.856-10.268 13.27-3.825 3.42-7.757 5.931-11.781 7.545-4.025 1.4-8.255 2.105-12.686 2.105q-10.567.002-16.306-7.539-5.739-7.84-5.739-22.316v-90.783zm660.819 31.474q9.061 0 16.613 4.229 7.55 3.927 12.082 11.478 4.531 7.25 5.74 17.217h-68.869q1.209-9.967 5.74-17.217 4.53-7.551 11.78-11.478 7.55-4.23 16.914-4.229m-393.54 6.53c4.834 0 9.563 1.203 14.198 3.619a42.4 42.4 0 0 1 12.68 9.65c3.825 4.018 6.748 8.748 8.761 14.174v33.174c-1.608 3.22-3.626 6.237-6.037 9.053q-3.626 4.223-8.156 6.933a47.2 47.2 0 0 1-9.059 4.524 33.2 33.2 0 0 1-9.97 1.507q-8.15 0-15.102-3.015-6.945-3.01-12.076-8.442c-3.428-3.818-6.143-8.142-8.156-12.97-1.813-5.028-2.715-10.455-2.715-16.286 0-5.633.803-10.958 2.412-15.986q2.718-7.54 7.55-13.27c3.22-4.019 6.946-7.14 11.176-9.351 4.431-2.212 9.26-3.314 14.495-3.314m197.514 0c4.834 0 9.565 1.203 14.2 3.619a42.4 42.4 0 0 1 12.677 9.65c3.826 4.018 6.749 8.748 8.76 14.174v33.174c-1.607 3.22-3.624 6.237-6.035 9.053q-3.626 4.223-8.156 6.933a47.2 47.2 0 0 1-9.06 4.524 33.2 33.2 0 0 1-9.97 1.507c-5.432 0-10.467-1.004-15.095-3.015q-6.954-3.01-12.083-8.442c-3.427-3.818-6.14-8.142-8.154-12.97q-2.717-7.54-2.717-16.286c0-5.633.804-10.958 2.41-15.986q2.721-7.54 7.553-13.27c3.22-4.019 6.948-7.14 11.178-9.351 4.43-2.212 9.257-3.314 14.492-3.314" style="fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70024383"/></svg>
\ No newline at end of file
diff --git a/policies/Dockerfile b/policies/Dockerfile
index 6c627e29e08..bf51d7d68e9 100644
--- a/policies/Dockerfile
+++ b/policies/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.81.0-bookworm
+FROM rust:1.83.0-bookworm
 LABEL ci=rudder/policies/Dockerfile
 
 ARG USER_ID=1000
diff --git a/policies/minifusion/Cargo.toml b/policies/minifusion/Cargo.toml
index c13c4932976..c93f115c5f6 100644
--- a/policies/minifusion/Cargo.toml
+++ b/policies/minifusion/Cargo.toml
@@ -9,8 +9,8 @@ repository.workspace = true
 license.workspace = true
 
 [dependencies]
-quick-xml = { version = "0.36.0", features = ["serialize"] }
-sysinfo = "0.31.0"
+quick-xml = { version = "0.37.0", features = ["serialize"] }
+sysinfo = "0.32.0"
 serde = { version = "1", features = ["derive"] }
 hostname = "0.4"
 anyhow = "1"
diff --git a/policies/minifusion/src/main.rs b/policies/minifusion/src/main.rs
index e512f9e1fce..36fa99a6a89 100644
--- a/policies/minifusion/src/main.rs
+++ b/policies/minifusion/src/main.rs
@@ -163,7 +163,7 @@ impl Inventory {
             })
             .collect();
 
-        sys.refresh_processes(ProcessesToUpdate::All);
+        sys.refresh_processes(ProcessesToUpdate::All, true);
 
         let processes = sys
             .processes()
diff --git a/policies/module-types/system-updates/src/campaign.rs b/policies/module-types/system-updates/src/campaign.rs
index af0cc324d8e..31d7112c051 100644
--- a/policies/module-types/system-updates/src/campaign.rs
+++ b/policies/module-types/system-updates/src/campaign.rs
@@ -118,7 +118,6 @@ impl FullSchedule {
 ///
 /// The returned outcome is not linked to the success of the update, but to the success of the
 /// process. The update itself can fail, but the process can be successful.
-
 pub fn do_schedule(
     p: &RunnerParameters,
     db: &mut PackageDatabase,
diff --git a/policies/module-types/system-updates/src/package_manager/zypper.rs b/policies/module-types/system-updates/src/package_manager/zypper.rs
index 26159587a14..b87ed228403 100644
--- a/policies/module-types/system-updates/src/package_manager/zypper.rs
+++ b/policies/module-types/system-updates/src/package_manager/zypper.rs
@@ -18,7 +18,6 @@ use rudder_module_type::ensure_root_user;
 ///
 /// * SLES 12 SP5+
 /// * SLES 15 SP2+
-
 pub struct ZypperPackageManager {
     rpm: RpmPackageManager,
 }
diff --git a/policies/rudder-commons/Cargo.toml b/policies/rudder-commons/Cargo.toml
index 386a7845b74..ab614b2ba2c 100644
--- a/policies/rudder-commons/Cargo.toml
+++ b/policies/rudder-commons/Cargo.toml
@@ -13,8 +13,8 @@ anyhow = "1"
 colored = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
+fancy-regex = "0.14.0"
 serde_yaml = "0.9.34"
-fancy-regex = "0.13.0"
 nom = "7"
 walkdir = "2"
 log = "0.4"
diff --git a/policies/rudder-commons/src/methods/method.rs b/policies/rudder-commons/src/methods/method.rs
index c92dc606380..70ba61baa5d 100644
--- a/policies/rudder-commons/src/methods/method.rs
+++ b/policies/rudder-commons/src/methods/method.rs
@@ -130,7 +130,6 @@ impl Default for Parameter {
 }
 
 /// Parser
-
 impl FromStr for MethodInfo {
     type Err = Error;
 
diff --git a/policies/rudderc/Cargo.toml b/policies/rudderc/Cargo.toml
index dd9128153cd..9360cfc4015 100644
--- a/policies/rudderc/Cargo.toml
+++ b/policies/rudderc/Cargo.toml
@@ -13,7 +13,7 @@ anyhow = "1"
 askama = "0.12"
 boon = "0.6.0"
 clap = { version = "4", features = ["derive"] }
-quick-xml = { version = "0.36.0", features = ["serialize"] }
+quick-xml = { version = "0.37.0", features = ["serialize"] }
 regex = "1"
 mdbook = { version = "0.4.28", default-features = false, features = ["search"] }
 nom = "7.1.3"
diff --git a/policies/rudderc/docs/src/images/rudder.svg b/policies/rudderc/docs/src/images/rudder.svg
deleted file mode 100644
index 204974bfb1e..00000000000
--- a/policies/rudderc/docs/src/images/rudder.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   xml:space="preserve"
-   width="1300"
-   height="300"
-   viewBox="0 0 1300 300"
-   sodipodi:docname="logo-rudder-2021.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:module="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs6" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1848"
-     inkscape:window-height="1016"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="0.5286983"
-     inkscape:cx="72.47793"
-     inkscape:cy="334.38434"
-     inkscape:window-x="750"
-     inkscape:window-y="1107"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g10" /><g
-     id="g10"
-     inkscape:groupmode="layer"
-     inkscape:label="2021-FIC-logo-rudder"
-     transform="matrix(1.3333333,0,0,1.3333333,0,7.5e-6)"><g
-       id="g12"><path
-         d="m 141.797,18.77 c -51.836,0 -93.856,41.964 -93.859,93.726 0,24.859 9.89,48.703 27.492,66.281 17.601,17.578 41.472,27.453 66.367,27.453 24.891,-0.003 48.762,-9.878 66.363,-27.457 17.602,-17.578 27.488,-41.418 27.488,-66.277 -0.039,-23.273 -8.75,-45.699 -24.433,-62.914 l -61.246,68.184 c -1.871,1.882 -4.344,2.816 -6.809,2.816 -2.465,0 -4.941,-0.934 -6.812,-2.816 -3.766,-3.758 -3.766,-9.852 0,-13.614 L 204.617,43.004 C 187.398,27.445 165.016,18.809 141.797,18.77 Z m -15.738,34.312 c 2.691,6.012 8.718,10.199 15.742,10.199 7.011,0 13.043,-4.187 15.734,-10.199 5.395,1.43 10.485,3.574 15.199,6.313 -0.609,1.566 -0.945,3.207 -1.074,4.843 l -20.578,17.891 c -2.949,-0.91 -6.059,-1.387 -9.281,-1.387 -17.535,0 -31.801,14.238 -31.801,31.766 0,17.5 14.266,31.75 31.801,31.75 17.527,0 31.797,-14.25 31.797,-31.75 0,-3.383 -0.543,-6.629 -1.516,-9.68 l 17.547,-20.156 c 1.82,-0.074 3.613,-0.418 5.344,-1.059 2.742,4.692 4.89,9.782 6.316,15.157 -6.012,2.703 -10.203,8.722 -10.203,15.738 0,7.004 4.191,13.019 10.203,15.707 -1.426,5.39 -3.574,10.473 -6.316,15.168 -6.153,-2.321 -13.368,-1.035 -18.325,3.91 -4.96,4.961 -6.253,12.152 -3.914,18.309 -4.714,2.738 -9.804,4.886 -15.199,6.308 -2.691,-6.004 -8.723,-10.195 -15.734,-10.195 -7.024,0 -13.051,4.191 -15.742,10.195 -5.399,-1.422 -10.489,-3.57 -15.188,-6.308 2.336,-6.157 1.035,-13.348 -3.93,-18.309 -4.937,-4.945 -12.16,-6.231 -18.312,-3.91 -2.754,-4.695 -4.887,-9.778 -6.328,-15.168 6.015,-2.688 10.211,-8.703 10.211,-15.707 0,-7.016 -4.196,-13.035 -10.211,-15.723 1.441,-5.387 3.574,-10.48 6.328,-15.172 6.152,2.321 13.375,1.035 18.312,-3.929 4.965,-4.946 6.266,-12.145 3.93,-18.289 4.699,-2.739 9.789,-4.883 15.188,-6.313 z"
-         style="fill:#13beb7;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16"
-         inkscape:connector-curvature="0" /></g><path
-       id="path18-2"
-       d="m 594.00776,45.01845 v 51.61634 c -2.72697,-5.08595 -6.75027,-9.16447 -12.08219,-12.23841 -5.32792,-3.19596 -11.24553,-4.79012 -17.76144,-4.79012 -8.05087,0 -15.15634,2.1289 -21.31325,6.38687 -6.15992,4.25392 -11.01476,10.05159 -14.56571,17.38347 -3.55495,7.21493 -5.32774,15.37429 -5.32774,24.47913 0,6.85997 1.06162,13.2432 3.19457,19.15714 2.13298,5.91383 5.15283,11.05696 9.05878,15.43184 4.02692,4.37496 8.70308,7.80506 14.035,10.28903 5.44492,2.36397 11.36652,3.54726 17.76143,3.54726 6.27289,0 12.25428,-1.41837 17.93719,-4.25833 5.68791,-2.83497 10.18774,-7.15134 13.4997,-12.9483 l 0.53529,4.789 c 0.711,3.78494 2.54653,6.74135 5.50351,8.87037 3.08194,2.12895 7.04706,3.1923 11.90298,3.1923 3.07796,0 7.10466,-0.47256 12.07759,-1.41753 V 150.9139 c -2.12897,-0.23402 -3.66769,-0.88627 -4.61669,-1.94822 -0.94998,-1.18405 -1.4221,-3.19479 -1.4221,-6.03074 V 45.01845 Z m 116.16613,0 v 51.61634 c -2.72693,-5.08595 -6.75023,-9.16447 -12.08216,-12.23841 -5.32791,-3.19596 -11.24557,-4.79012 -17.76148,-4.79012 -8.05083,0 -15.15559,2.1289 -21.3155,6.38687 -6.15694,4.25392 -11.01251,10.05159 -14.56348,17.38347 -3.55492,7.21493 -5.32773,15.37429 -5.32773,24.47913 0,6.85997 1.06162,13.2432 3.19459,19.15714 2.13296,5.91383 5.15283,11.05696 9.05875,15.43184 4.02697,4.37496 8.70311,7.80506 14.03503,10.28903 5.44491,2.36397 11.36768,3.54726 17.7626,3.54726 6.27289,0 12.25312,-1.41837 17.93605,-4.25833 5.68792,-2.83497 10.18774,-7.15134 13.49968,-12.9483 l 0.53533,4.789 c 0.71095,3.78494 2.54648,6.74135 5.50349,8.87037 3.08191,2.12895 7.04705,3.1923 11.90293,3.1923 3.07798,0 7.1047,-0.47256 12.07762,-1.41753 V 150.9139 c -2.12897,-0.23402 -3.67172,-0.88627 -4.61669,-1.94822 -0.94997,-1.18405 -1.42212,-3.19479 -1.42212,-6.03074 V 45.01845 Z M 301.762,48.56336 v 125.94515 h 29.13256 v -40.62085 h 19.7131 l 18.66433,31.3829 c 0,0 1.10617,1.82731 1.77016,2.65923 1.398,1.76501 3.3902,4.03924 4.62817,4.92917 2.90596,2.08995 6.3982,3.07051 11.37113,3.07051 1.53899,0 3.25801,-0.11993 5.15199,-0.35495 2.01596,-0.23801 4.32525,-0.59396 6.9302,-1.06601 v -23.59002 c -2.35895,0.0939 -3.43464,0.11657 -4.85563,-0.65248 -1.69196,-0.91092 -2.92204,-2.30029 -4.04002,-3.9642 l -1.17054,-1.97693 -9.85137,-16.64835 c 4.26194,-2.36398 7.93307,-5.37821 11.01501,-9.0461 3.07796,-3.78504 5.44539,-7.98462 7.10136,-12.59453 1.65998,-4.73002 2.48812,-9.69817 2.48812,-14.90111 0,-5.20301 -1.0662,-10.34477 -3.19917,-15.43073 -2.01097,-5.08584 -4.85152,-9.63642 -8.52347,-13.65937 -3.67194,-4.13693 -8.05481,-7.39136 -13.14474,-9.75834 -4.97193,-2.47996 -10.42187,-3.72299 -16.34276,-3.72299 z m 29.13256,25.54283 h 25.75189 c 2.24998,0 4.38293,0.71177 6.39491,2.12973 2.01197,1.41806 3.6718,3.42992 4.97278,6.03192 1.42198,2.48396 2.13202,5.43696 2.13202,8.86695 0,3.42892 -0.59194,6.44421 -1.77593,9.04609 -1.18297,2.601 -2.72384,4.67214 -4.61782,6.21114 -1.77698,1.41795 -3.84758,2.12507 -6.21455,2.12507 h -26.6433 z m 474.14136,5.35534 c -10.54065,0 -19.54147,2.30898 -27.00285,6.9279 -7.4613,4.50051 -13.2063,10.48156 -17.23305,17.94291 -3.90832,7.34296 -5.86185,15.5149 -5.86185,24.51588 0,6.27701 1.12463,12.31658 3.37493,18.11983 2.25022,5.68486 5.50732,10.71895 9.77092,15.10103 4.3821,4.38206 9.65235,7.87533 15.81098,10.48085 6.15855,2.48715 13.20577,3.73107 21.14092,3.73107 7.1061,0 13.5606,-1.06625 19.36388,-3.19803 5.92162,-2.13183 11.01435,-5.0335 15.27787,-8.70497 4.38218,-3.78993 7.75733,-8.11207 10.12605,-12.96788 l -24.16102,-6.75099 c -1.4211,3.43456 -4.02593,6.15861 -7.81583,8.172 -3.6714,2.01333 -7.63935,3.01993 -11.90295,3.01993 -3.43462,0 -6.69172,-0.71077 -9.77107,-2.13202 -3.0792,-1.53963 -5.62553,-3.73052 -7.6389,-6.57296 -1.89495,-2.84236 -3.01958,-6.33564 -3.375,-10.48086 h 68.92875 c 0.11842,-1.18434 0.23655,-2.54631 0.35497,-4.08594 0.23678,-1.6581 0.3549,-3.31701 0.3549,-4.97509 0,-8.5273 -1.95352,-16.40229 -5.86192,-23.62679 -3.90833,-7.34289 -9.59355,-13.26554 -17.05493,-17.766 -7.34287,-4.50053 -16.28415,-6.74987 -26.8248,-6.74987 z m 117.39526,0.50085 c -5.5659,0.11699 -10.8933,1.94846 -15.98318,5.49543 -5.094,3.5509 -9.23775,8.45719 -12.43373,14.72307 V 81.37986 h -26.11252 v 93.12865 h 28.4214 v -55.87808 c 2.484,-4.25797 6.51173,-7.449 12.07763,-9.57801 5.56695,-2.24594 11.78032,-3.37147 18.6483,-3.37147 V 80.13812 c -0.47303,-0.11698 -1.0626,-0.17574 -1.77368,-0.17574 z m -506.4065,1.41748 v 59.60109 c 0,11.47288 2.48899,20.22179 7.46091,26.25277 4.97294,6.03187 12.19982,9.04728 21.67167,9.04728 7.81287,0 14.8606,-1.41837 21.1375,-4.25833 6.39391,-2.957 11.7223,-7.50646 15.98323,-13.65937 l 0.5353,5.6804 c 0.71098,3.78087 2.54712,6.73799 5.50808,8.86695 2.95696,2.01192 6.92545,3.01539 11.8984,3.01539 1.53896,0 3.25701,-0.11709 5.15198,-0.35611 2.01197,-0.23402 4.31963,-0.58937 6.92561,-1.06142 V 150.9139 c -2.24997,-0.23402 -3.84746,-0.88627 -4.79244,-1.94822 -0.83199,-1.18405 -1.24636,-3.19479 -1.24636,-6.03074 V 81.37986 h -28.41807 v 57.47254 c -1.77797,3.19497 -3.79281,5.79644 -6.03878,7.80435 -2.24998,2.01204 -4.5621,3.48845 -6.92905,4.43747 -2.36697,0.82399 -4.85494,1.23834 -7.46092,1.23834 -4.14392,0 -7.34066,-1.47705 -9.59062,-4.43406 -2.24997,-3.07394 -3.37492,-7.44929 -3.37492,-13.12522 V 81.37986 Z M 804.6799,99.89141 c 3.55297,0 6.81,0.82891 9.77085,2.48695 2.96092,1.53971 5.3295,3.79016 7.10602,6.75104 1.77645,2.84238 2.90228,6.21756 3.37598,10.12593 h -40.50473 c 0.47363,-3.90837 1.59953,-7.28355 3.37598,-10.12593 1.77652,-2.96088 4.08547,-5.21133 6.92797,-6.75104 2.96093,-1.65804 6.27638,-2.48695 9.94793,-2.48695 z m -231.45699,3.84015 c 2.84296,0 5.62404,0.70765 8.35,2.12859 2.83997,1.41802 5.32848,3.30884 7.45746,5.67582 2.24997,2.36298 3.96916,5.14518 5.15313,8.33621 v 19.5109 c -0.94598,1.89393 -2.1327,3.66831 -3.55066,5.32433 -1.42199,1.65598 -3.02008,3.01593 -4.79704,4.07789 -1.66,1.06701 -3.43377,1.95351 -5.32775,2.66046 -1.89497,0.59397 -3.85221,0.8868 -5.86419,0.8868 -3.19496,0 -6.15591,-0.59062 -8.88185,-1.7736 -2.72297,-1.17993 -5.09054,-2.83574 -7.10252,-4.96475 -2.01596,-2.24593 -3.61304,-4.78858 -4.79703,-7.62861 -1.06597,-2.95694 -1.59672,-6.14908 -1.59672,-9.57801 0,-3.313 0.47267,-6.44522 1.41867,-9.40222 1.06599,-2.95694 2.54595,-5.55847 4.44093,-7.80441 1.89396,-2.36391 4.085,-4.19998 6.57295,-5.50001 2.60597,-1.30097 5.44567,-1.94939 8.52462,-1.94939 z m 116.16615,0 c 2.84296,0 5.62523,0.70765 8.35115,2.12859 2.83996,1.41802 5.32733,3.30884 7.45629,5.67582 2.25,2.36298 3.96901,5.14518 5.152,8.33621 v 19.5109 c -0.94496,1.89393 -2.13153,3.66831 -3.54954,5.32433 -1.42197,1.65598 -3.02007,3.01593 -4.79702,4.07789 -1.65997,1.06701 -3.43376,1.95351 -5.32775,2.66046 -1.89498,0.59397 -3.85221,0.8868 -5.86418,0.8868 -3.19496,0 -6.15649,-0.59062 -8.87842,-1.7736 -2.72697,-1.17993 -5.09396,-2.83574 -7.10593,-4.96475 -2.01597,-2.24593 -3.6119,-4.78858 -4.79588,-7.62861 -1.06601,-2.95694 -1.59787,-6.14908 -1.59787,-9.57801 0,-3.313 0.47251,-6.44522 1.41748,-9.40222 1.06701,-2.95694 2.54712,-5.55847 4.44212,-7.80441 1.89394,-2.36391 4.08612,-4.19998 6.57407,-5.50001 2.60594,-1.30097 5.4445,-1.94939 8.52348,-1.94939 z"
-       style="fill:#041922;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999851"
-       inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/policies/rudderc/docs/src/syntax.md b/policies/rudderc/docs/src/syntax.md
index 2cd98f9c573..49eccc751a7 100644
--- a/policies/rudderc/docs/src/syntax.md
+++ b/policies/rudderc/docs/src/syntax.md
@@ -78,9 +78,6 @@ Each parameter contains the following fields:
     * `md5-crypt`: md5-crypt hash.
     * `sha256-crypt`: sha256-crypt hash.
     * `sha512-crypt`: sha512-crypt hash.
-    * `md5-crypt-aix`: md5-crypt hash for AIX.
-    * `sha256-crypt-aix`: sha256-crypt hash for AIX.
-    * `sha512-crypt-aix`: sha512-crypt hash for AIX.
 
 Example:
 
diff --git a/policies/rudderc/docs/src/usage.md b/policies/rudderc/docs/src/usage.md
index bfb7041988d..743f07245c7 100644
--- a/policies/rudderc/docs/src/usage.md
+++ b/policies/rudderc/docs/src/usage.md
@@ -8,7 +8,7 @@ It is especially important as techniques are not run as YAML, but compiled into
 an executable policy file depending on the target platform.
 There are currently two possible targets, which are the platforms Rudder has agents for:
 
-* Linux/AIX
+* Linux
 * Windows
 
 These platforms use different agent technology, but the YAML policies
diff --git a/policies/rudderc/src/backends/unix.rs b/policies/rudderc/src/backends/unix.rs
index f88bac3a42a..8cf5eb86318 100644
--- a/policies/rudderc/src/backends/unix.rs
+++ b/policies/rudderc/src/backends/unix.rs
@@ -45,18 +45,16 @@ impl Unix {
         // Static content including parts of the system techniques required to run most techniques,
         // i.e. lib loading and global vars (`g.X`).
         let static_prelude = include_str!("unix/prelude.cf");
-        let init = Promise::usebundle("rudder_test_init", None, None, vec![]);
+        let init = Promise::usebundle("rudder_test_init", None, vec![]);
         let policy_mode = Promise::usebundle(
             "set_dry_run_mode",
             None,
-            None,
             vec!["${rudder_test_init.dry_run}".to_string()],
         );
         //   "CIS audit/CIS 9.1 configure cron"  usebundle => set_dry_run_mode("true");
         let technique_call = Promise::usebundle(
             technique_id.to_string(),
             None,
-            None,
             params
                 .iter()
                 .map(|p| cfengine::quoted(&format!("${{rudder_test_init.test_case[params][{p}]}}")))
@@ -82,10 +80,7 @@ impl Backend for Unix {
             match r {
                 ItemKind::Block(r) => {
                     let mut calls: Vec<(Promise, Option<Bundle>)> = vec![];
-                    if let Some(x) = dry_run_mode::push_policy_mode(
-                        r.policy_mode_override,
-                        format!("push_policy_mode_for_block_{}", r.id),
-                    ) {
+                    if let Some(x) = dry_run_mode::push_policy_mode(r.policy_mode_override) {
                         calls.push((x, None))
                     }
                     for inner in r.items {
@@ -95,10 +90,7 @@ impl Backend for Unix {
                             technique_id,
                         )?);
                     }
-                    if let Some(x) = dry_run_mode::pop_policy_mode(
-                        r.policy_mode_override,
-                        format!("pop_policy_mode_for_block_{}", r.id),
-                    ) {
+                    if let Some(x) = dry_run_mode::pop_policy_mode(r.policy_mode_override) {
                         calls.push((x, None))
                     }
                     Ok(calls)
diff --git a/policies/rudderc/src/backends/unix/cfengine/bundle.rs b/policies/rudderc/src/backends/unix/cfengine/bundle.rs
index b7805d69c38..4400a2dccf0 100644
--- a/policies/rudderc/src/backends/unix/cfengine/bundle.rs
+++ b/policies/rudderc/src/backends/unix/cfengine/bundle.rs
@@ -5,16 +5,11 @@ use std::{collections::HashMap, fmt};
 
 use crate::backends::unix::cfengine::promise::{Promise, PromiseType, LONGEST_ATTRIBUTE_LEN};
 
-const NORMAL_ORDERING: [PromiseType; 2] = [PromiseType::Vars, PromiseType::Methods];
-
-/// ID that must be unique for each technique instance. Combined with a simple index,
-/// it allows enforcing all methods are called, even with identical parameters.
-/// This has no semantic meaning and can almost be considered syntactic sugar.
-pub const UNIQUE_ID: &str = "${report_data.directive_id}";
-/// Indexes over three chars
-const INDEX_LEN: usize = 3;
-/// Length of directive id + _ + index
-pub const UNIQUE_ID_LEN: usize = UNIQUE_ID.len() + 1 + INDEX_LEN;
+const NORMAL_ORDERING: [PromiseType; 3] = [
+    PromiseType::Vars,
+    PromiseType::Classes,
+    PromiseType::Methods,
+];
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub enum BundleType {
@@ -50,12 +45,28 @@ pub struct Bundle {
 
 impl Bundle {
     pub fn agent<T: Into<String>>(name: T) -> Self {
-        Self {
+        let mut r = Self {
             name: name.into(),
             bundle_type: BundleType::Agent,
             parameters: Vec::new(),
             promises: HashMap::new(),
-        }
+        };
+
+        // Global index increment, once per bundle call
+        let guard_class = "rudder_increment_guard";
+        let increment = Promise::int(
+            "report_data.index",
+            "int(eval(\"${report_data.index}+1\", \"math\", \"infix\"))",
+        )
+        .unless_condition(guard_class);
+        // take a snapshot of the index for local use, as it will be incremented by methods
+        let local =
+            Promise::int("local_index", "${report_data.index}").unless_condition(guard_class);
+        // equivalent to pass1 but don't mess with business logic
+        let guard = Promise::class_expression(guard_class, "any");
+        r.add_promise_group(vec![increment, local]);
+        r.add_promise_group(vec![guard]);
+        r
     }
 
     pub fn parameters(self, parameters: Vec<String>) -> Self {
@@ -96,18 +107,20 @@ impl fmt::Display for Bundle {
             },
         )?;
 
+        let mut index = 0;
+
         for (promise_type, promises) in NORMAL_ORDERING
             .iter()
             .filter_map(|t| self.promises.get(t).map(|p| (t, p)))
         {
             writeln!(f, "  {}:", promise_type)?;
 
-            for (index, group) in promises.iter().enumerate() {
+            for group in promises {
                 // Align promise groups
                 let mut max_promiser = group.iter().map(|p| p.promiser.len()).max().unwrap_or(0);
                 // Take special method promiser into account
                 if *promise_type == PromiseType::Methods {
-                    max_promiser = std::cmp::max(max_promiser, UNIQUE_ID_LEN);
+                    max_promiser = std::cmp::max(max_promiser, Promise::unique_id(index).len());
                 }
 
                 for promise in group {
@@ -116,6 +129,10 @@ impl fmt::Display for Bundle {
                         "{}",
                         promise.format(index, max_promiser + LONGEST_ATTRIBUTE_LEN + 3)
                     )?;
+                    // Avoid useless increment for readability
+                    if *promise_type == PromiseType::Methods {
+                        index += 1;
+                    }
                 }
                 writeln!(f)?;
             }
@@ -135,17 +152,37 @@ mod tests {
     fn format_bundle() {
         assert_eq!(
             Bundle::agent("test").to_string(),
-            "bundle agent test {\n\n}"
+            r#"bundle agent test {
+
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
+}"#
         );
         assert_eq!(
             Bundle::agent("test")
                 .parameters(vec!["file".to_string(), "lines".to_string()])
-                .promise_group(vec![Promise::usebundle("test", None, None, vec![])])
+                .promise_group(vec![Promise::usebundle("test", None, vec![])])
                 .to_string(),
             r#"bundle agent test(file, lines) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "${report_data.directive_id}_0"   usebundle => test();
+    "index_${local_index}_0" usebundle => test();
 
 }"#
         );
diff --git a/policies/rudderc/src/backends/unix/cfengine/promise.rs b/policies/rudderc/src/backends/unix/cfengine/promise.rs
index 32a69f483ec..12abb4bed74 100644
--- a/policies/rudderc/src/backends/unix/cfengine/promise.rs
+++ b/policies/rudderc/src/backends/unix/cfengine/promise.rs
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // SPDX-FileCopyrightText: 2019-2022 Normation SAS
 
+use crate::backends::unix::cfengine::quoted;
 use std::{collections::HashMap, fmt};
 
-use crate::backends::unix::cfengine::{bundle::UNIQUE_ID, quoted};
-
 #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
 pub enum PromiseType {
     Vars,
+    Classes,
     Methods,
 }
 
@@ -18,6 +18,7 @@ impl fmt::Display for PromiseType {
             "{}",
             match self {
                 PromiseType::Vars => "vars",
+                PromiseType::Classes => "classes",
                 PromiseType::Methods => "methods",
             }
         )
@@ -31,11 +32,15 @@ pub enum AttributeType {
     If,
     String,
     Slist,
+    Int,
+    Expression,
 }
 
-const ATTRIBUTES_ORDERING: [AttributeType; 5] = [
+const ATTRIBUTES_ORDERING: [AttributeType; 7] = [
     AttributeType::UseBundle,
     AttributeType::String,
+    AttributeType::Int,
+    AttributeType::Expression,
     AttributeType::Slist,
     AttributeType::Unless,
     AttributeType::If,
@@ -52,6 +57,12 @@ impl PromiseType {
                 AttributeType::If,
                 AttributeType::String,
                 AttributeType::Slist,
+                AttributeType::Int,
+            ],
+            PromiseType::Classes => vec![
+                AttributeType::Unless,
+                AttributeType::If,
+                AttributeType::Expression,
             ],
             PromiseType::Methods => vec![
                 AttributeType::Unless,
@@ -75,6 +86,8 @@ impl fmt::Display for AttributeType {
                 AttributeType::If => "if",
                 AttributeType::String => "string",
                 AttributeType::Slist => "slist",
+                AttributeType::Int => "int",
+                AttributeType::Expression => "expression",
             }
         )
     }
@@ -86,7 +99,6 @@ pub struct Promise {
     comments: Option<String>,
     /// Module/state the promise calls
     component: Option<String>,
-    id: Option<String>,
     /// Type of the promise
     pub promise_type: PromiseType,
     /// Target of the promise
@@ -100,13 +112,11 @@ impl Promise {
     pub fn new<T: Into<String>>(
         promise_type: PromiseType,
         component: Option<String>,
-        id: Option<String>,
         promiser: T,
     ) -> Self {
         Self {
             promise_type,
             component,
-            id,
             promiser: promiser.into(),
             attributes: HashMap::new(),
             comments: None,
@@ -129,13 +139,17 @@ impl Promise {
 
     /// Shortcut for building a string variable with a raw value
     pub fn string_raw<T: Into<String>, S: AsRef<str>>(name: T, value: S) -> Self {
-        Promise::new(PromiseType::Vars, None, None, name)
-            .attribute(AttributeType::String, value.as_ref())
+        Promise::new(PromiseType::Vars, None, name).attribute(AttributeType::String, value.as_ref())
+    }
+
+    /// Shortcut for building an int variable with a raw value
+    pub fn int<T: Into<String>, S: AsRef<str>>(name: T, value: S) -> Self {
+        Promise::new(PromiseType::Vars, None, name).attribute(AttributeType::Int, value.as_ref())
     }
 
     /// Shortcut for building an slist variable with a list of values to be quoted
     pub fn slist<T: Into<String>, S: AsRef<str>>(name: T, values: Vec<S>) -> Self {
-        Promise::new(PromiseType::Vars, None, None, name).attribute(
+        Promise::new(PromiseType::Vars, None, name).attribute(
             AttributeType::Slist,
             format!(
                 "{{{}}}",
@@ -148,18 +162,24 @@ impl Promise {
         )
     }
 
+    /// Shortcut for building a class expression
+    pub fn class_expression<T: Into<String>, S: AsRef<str>>(name: T, value: S) -> Self {
+        Promise::new(PromiseType::Classes, None, name)
+            .attribute(AttributeType::Expression, quoted(value.as_ref()))
+    }
+
     /// Shortcut for calling a bundle with parameters
+    ///
+    /// The promiser is automatically set to a unique value.
     pub fn usebundle<T: AsRef<str>>(
         bundle: T,
         component: Option<&str>,
-        id: Option<&str>,
         parameters: Vec<String>,
     ) -> Self {
         Promise::new(
             PromiseType::Methods,
             component.map(String::from),
-            id.map(String::from),
-            "${report_data.method_id}",
+            "placeholder",
         )
         .attribute(
             AttributeType::UseBundle,
@@ -170,14 +190,16 @@ impl Promise {
     /// Shortcut to add a condition expression
     pub fn if_condition<T: AsRef<str>>(mut self, condition: T) -> Self {
         self.attributes
-            .insert(AttributeType::If, format!("\"{}\"", condition.as_ref()));
+            .insert(AttributeType::If, quoted(condition.as_ref()).to_string());
         self
     }
 
     /// Shortcut for adding a condition expression
     pub fn unless_condition<T: AsRef<str>>(mut self, condition: T) -> Self {
-        self.attributes
-            .insert(AttributeType::Unless, format!("\"{}\"", condition.as_ref()));
+        self.attributes.insert(
+            AttributeType::Unless,
+            quoted(condition.as_ref()).to_string(),
+        );
         self
     }
 
@@ -194,24 +216,21 @@ impl Promise {
         self
     }
 
+    pub fn unique_id(index: usize) -> String {
+        format!("index_${{local_index}}_{}", index)
+    }
+
     /// Index is used to make methods promises unique
     /// It is ignored in other cases
     //
     // padding for arrows is promiser len + max attribute name
     pub fn format(&self, index: usize, padding: usize) -> String {
-        let promiser = match self.id.clone() {
-            Some(id) if !id.is_empty() => id,
-            _ => {
-                if self.promise_type == PromiseType::Methods {
-                    // Methods need to be unique
-                    match self.component.clone() {
-                        Some(method) => format!("{}_{}_{}", method, UNIQUE_ID, index),
-                        None => format!("{}_{}", UNIQUE_ID, index),
-                    }
-                } else {
-                    self.promiser.clone()
-                }
-            }
+        let promiser = if self.promise_type == PromiseType::Methods {
+            // Always override the promiser for methods
+            // It is not used by CFEngine
+            quoted(&Self::unique_id(index))
+        } else {
+            quoted(&self.promiser)
         };
 
         let mut first = true;
@@ -226,7 +245,7 @@ impl Promise {
         };
 
         if self.attributes.is_empty() {
-            format!("{}\"{}\";", comment, self.promiser)
+            format!("{}{};", comment, promiser)
         } else {
             format!(
                 "{}{};",
@@ -239,7 +258,7 @@ impl Promise {
                             first = false;
                             format!(
                                 "    {:<promiser_width$} {:>width$} => {}",
-                                quoted(&promiser),
+                                promiser,
                                 k,
                                 v,
                                 promiser_width = padding - LONGEST_ATTRIBUTE_LEN - 1,
@@ -261,32 +280,37 @@ mod tests {
     use pretty_assertions::assert_eq;
 
     use super::*;
-    use crate::backends::unix::cfengine::bundle::UNIQUE_ID_LEN;
 
     #[test]
     fn format_promise() {
+        let len = Promise::unique_id(0).len();
+
         assert_eq!(
-            Promise::new(PromiseType::Vars, None, None, "test")
-                .format(0, LONGEST_ATTRIBUTE_LEN + 3 + UNIQUE_ID_LEN),
+            Promise::new(PromiseType::Vars, None, "test")
+                .format(0, LONGEST_ATTRIBUTE_LEN + 3 + len),
             "\"test\";"
         );
         assert_eq!(
-            Promise::new(PromiseType::Vars, None, None, "test")
+            Promise::new(PromiseType::Vars, None, "test")
                 .comment("test")
-                .format(0, LONGEST_ATTRIBUTE_LEN + 3 + UNIQUE_ID_LEN),
+                .format(0, LONGEST_ATTRIBUTE_LEN + 3 + len),
             "    # test\n\"test\";"
         );
         assert_eq!(
             Promise::string("test", "plop")
                 .if_condition("debian")
-                .format(0, LONGEST_ATTRIBUTE_LEN + 3 + UNIQUE_ID_LEN),
-            "    \"test\"                            string => \"plop\",\n                                             if => \"debian\";"
+                .format(0,  LONGEST_ATTRIBUTE_LEN + 3 + len),
+            "    \"test\"                   string => \"plop\",\n                                    if => \"debian\";"
         );
         assert_eq!(
             Promise::string("test", "plop")
                 .if_condition("debian.${my.var}")
-                .format(0, LONGEST_ATTRIBUTE_LEN + 3 + UNIQUE_ID_LEN),
-            "    \"test\"                            string => \"plop\",\n                                             if => \"debian.${my.var}\";"
+                .format( 0,LONGEST_ATTRIBUTE_LEN + 3 + len),
+            "    \"test\"                   string => \"plop\",\n                                    if => \"debian.${my.var}\";"
+        );
+        assert_eq!(
+            Promise::int("test", "24").format(0, LONGEST_ATTRIBUTE_LEN + 3 + len),
+            "    \"test\"                   int => 24;"
         );
     }
 }
diff --git a/policies/rudderc/src/backends/unix/ncf/dry_run_mode.rs b/policies/rudderc/src/backends/unix/ncf/dry_run_mode.rs
index 6d4700f2c0b..d9957ecd0db 100644
--- a/policies/rudderc/src/backends/unix/ncf/dry_run_mode.rs
+++ b/policies/rudderc/src/backends/unix/ncf/dry_run_mode.rs
@@ -2,12 +2,11 @@ use rudder_commons::PolicyMode;
 
 use crate::backends::unix::cfengine::{promise::Promise, quoted};
 
-pub fn push_policy_mode(op: Option<PolicyMode>, promiser: String) -> Option<Promise> {
+pub fn push_policy_mode(op: Option<PolicyMode>) -> Option<Promise> {
     op.map(|p| {
         Promise::usebundle(
             "push_dry_run_mode",
             None,
-            Some(&promiser),
             vec![match p {
                 PolicyMode::Enforce => quoted("false").to_string(),
                 PolicyMode::Audit => quoted("true").to_string(),
@@ -15,14 +14,9 @@ pub fn push_policy_mode(op: Option<PolicyMode>, promiser: String) -> Option<Prom
         )
     })
 }
-pub fn pop_policy_mode(op: Option<PolicyMode>, promiser: String) -> Option<Promise> {
+pub fn pop_policy_mode(op: Option<PolicyMode>) -> Option<Promise> {
     if op.is_some() {
-        Some(Promise::usebundle(
-            "pop_dry_run_mode",
-            None,
-            Some(&promiser),
-            vec![],
-        ))
+        Some(Promise::usebundle("pop_dry_run_mode", None, vec![]))
     } else {
         None
     }
diff --git a/policies/rudderc/src/backends/unix/ncf/method_call.rs b/policies/rudderc/src/backends/unix/ncf/method_call.rs
index c798d3898d4..d15f00063b0 100644
--- a/policies/rudderc/src/backends/unix/ncf/method_call.rs
+++ b/policies/rudderc/src/backends/unix/ncf/method_call.rs
@@ -42,12 +42,6 @@ pub fn method_call(
 
     let info = m.info.unwrap();
     let id = m.id.as_ref();
-    // Uniqueness for re-execution.
-    // method_id is not enough due to iterators.
-    // It also needs to be evaluated at run time to get the maximal variability.
-    // WARN: this may be non-evaluated if the resulting string is too long.
-    let unique = &format!("{}_${{report_data.directive_id}}", m.id.as_ref());
-    let very_unique = &format!("{}_${{report_data.directive_id}}_${{c_key}}", m.id.as_ref());
     let c_id = canonify(id);
 
     let condition = condition.and(&m.condition);
@@ -76,23 +70,12 @@ pub fn method_call(
         })
     }
 
-    let enable_report = Promise::usebundle(
-        "enable_reporting",
-        Some(&report_component),
-        Some(very_unique),
-        vec![],
-    );
-    let disable_report = Promise::usebundle(
-        "disable_reporting",
-        Some(&report_component),
-        Some(very_unique),
-        vec![],
-    );
+    let enable_report = Promise::usebundle("enable_reporting", Some(&report_component), vec![]);
+    let disable_report = Promise::usebundle("disable_reporting", Some(&report_component), vec![]);
 
     let reporting_context = Promise::usebundle(
         "_method_reporting_context_v4",
         Some(&report_component),
-        Some(very_unique),
         vec![expanded("c_name"), expanded("c_key"), expanded("report_id")],
     );
 
@@ -100,7 +83,6 @@ pub fn method_call(
     let method = Promise::usebundle(
         &info.bundle_name,
         Some(&report_component),
-        Some(very_unique),
         parameters_names
             .iter()
             .map(|p| expanded(p.as_str()))
@@ -111,61 +93,59 @@ pub fn method_call(
         info.bundle_name
     );
 
-    let push_policy_mode =
-        dry_run_mode::push_policy_mode(m.policy_mode_override, very_unique.clone());
-    let pop_policy_mode =
-        dry_run_mode::pop_policy_mode(m.policy_mode_override, very_unique.clone());
+    let push_policy_mode = dry_run_mode::push_policy_mode(m.policy_mode_override);
+    let pop_policy_mode = dry_run_mode::pop_policy_mode(m.policy_mode_override);
     let incall_condition = "${method_call_condition}".to_string();
 
     let mut promises = match (&condition, is_supported) {
-            (Condition::Expression(_), true) => vec![
-                    Some(reporting_context),
-                    push_policy_mode,
-                    Some(method.if_condition(incall_condition.clone())),
-                    pop_policy_mode,
-                    Some(Promise::usebundle("_classes_noop", Some(&report_component), Some(very_unique), vec![na_condition.clone()]).unless_condition(incall_condition.clone())),
-                    Some(Promise::usebundle("log_rudder", Some(&report_component),  Some(very_unique), vec![
-                        quoted(&format!("Skipping method '{}' with key parameter '{}' since condition '{}' is not reached", &method_name, &report_parameter, condition)),
-                        quoted(&report_parameter),
-                        na_condition.clone(),
-                        na_condition,
-                        "@{args}".to_string()
-                    ]).unless_condition(incall_condition))
-            ].into_iter().flatten().collect(),
-            (Condition::NotDefined, true) => vec![
-                reporting_context,
-                Promise::usebundle("_classes_noop", Some(&report_component), Some(very_unique), vec![na_condition.clone()]),
-                Promise::usebundle("log_rudder", Some(&report_component),  Some(very_unique), vec![
-                    quoted(&format!("Skipping method '{}' with key parameter '{}' since condition '{}' is not reached", &method_name, &report_parameter, condition)),
+        (Condition::Expression(_), true) => vec![
+            Some(reporting_context),
+            push_policy_mode,
+            Some(method.if_condition(incall_condition.clone())),
+            pop_policy_mode,
+            Some(Promise::usebundle("_classes_noop", Some(&report_component), vec![na_condition.clone()]).unless_condition(incall_condition.clone())),
+            Some(Promise::usebundle("log_rudder", Some(&report_component), vec![
+                quoted(&format!("Skipping method '{}' with key parameter '{}' since condition '{}' is not reached", &method_name, &report_parameter, condition)),
+                quoted(&report_parameter),
+                na_condition.clone(),
+                na_condition,
+                "@{args}".to_string()
+            ]).unless_condition(incall_condition))
+        ].into_iter().flatten().collect(),
+        (Condition::NotDefined, true) => vec![
+            reporting_context,
+            Promise::usebundle("_classes_noop", Some(&report_component), vec![na_condition.clone()]),
+            Promise::usebundle("log_rudder", Some(&report_component),  vec![
+                quoted(&format!("Skipping method '{}' with key parameter '{}' since condition '{}' is not reached", &method_name, &report_parameter, condition)),
+                quoted(&report_parameter),
+                na_condition.clone(),
+                na_condition,
+                "@{args}".to_string()
+            ])
+        ],
+        (Condition::Defined, true) => vec![
+            Some(reporting_context),
+            push_policy_mode,
+            Some(method),
+            pop_policy_mode,
+        ].into_iter().flatten().collect(),
+        (_, false) => vec![
+            reporting_context,
+            Promise::usebundle(
+                "log_na_rudder",
+                Some(&report_component),
+                vec![
+                    quoted(&format!(
+                        "'{}' method is not available on classic Rudder agent, skip",
+                        report_parameter,
+                    )),
                     quoted(&report_parameter),
-                    na_condition.clone(),
-                    na_condition,
-                    "@{args}".to_string()
-                ])
-            ],
-            (Condition::Defined, true) => vec![
-                Some(reporting_context),
-                push_policy_mode,
-                Some(method),
-                pop_policy_mode,
-            ].into_iter().flatten().collect(),
-            (_, false) => vec![
-                reporting_context,
-                Promise::usebundle(
-                    "log_na_rudder",
-                    Some(&report_component), Some(very_unique),
-                    vec![
-                        quoted(&format!(
-                            "'{}' method is not available on classic Rudder agent, skip",
-                            report_parameter,
-                        )),
-                        quoted(&report_parameter),
-                        quoted(very_unique),
-                        "@{args}".to_string(),
-                    ],
-                )
-            ],
-        };
+                    "@{args}".to_string(),
+                ],
+            )
+        ],
+    };
+
     let bundle_content = match m.reporting.mode {
         LeafReportingMode::Disabled => {
             let mut res = vec![disable_report];
@@ -198,7 +178,7 @@ pub fn method_call(
     }
 
     call_parameters.append(&mut parameters);
-    let bundle_call = Promise::usebundle(bundle_name.clone(), None, Some(unique), call_parameters);
+    let bundle_call = Promise::usebundle(bundle_name.clone(), None, call_parameters);
 
     // Get everything together
     let mut specific_parameters = parameters_names;
diff --git a/policies/rudderc/src/backends/unix/ncf/technique.rs b/policies/rudderc/src/backends/unix/ncf/technique.rs
index 50b829d875f..c442d2bdba5 100644
--- a/policies/rudderc/src/backends/unix/ncf/technique.rs
+++ b/policies/rudderc/src/backends/unix/ncf/technique.rs
@@ -101,7 +101,22 @@ mod tests {
                 .version("1.0")
                 .bundle(Bundle::agent("test"))
                 .to_string(),
-            "# @name test\n# @version 1.0\n\nbundle agent test {\n\n}\n"
+            r#"# @name test
+# @version 1.0
+
+bundle agent test {
+
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
+}
+"#
         );
     }
 }
diff --git a/policies/rudderc/src/ir/technique.rs b/policies/rudderc/src/ir/technique.rs
index 87dece9ff7b..106c6355c11 100644
--- a/policies/rudderc/src/ir/technique.rs
+++ b/policies/rudderc/src/ir/technique.rs
@@ -237,8 +237,6 @@ impl PasswordType {
             // https://fedoraproject.org/wiki/Changes/yescrypt_as_default_hashing_method_for_shadow
             PasswordType::Sha256Crypt,
             PasswordType::Sha512Crypt,
-            PasswordType::Sha256CryptAix,
-            PasswordType::Sha512CryptAix,
         ]
     }
 }
@@ -255,10 +253,6 @@ pub enum PasswordType {
     Md5Crypt,
     Sha256Crypt,
     Sha512Crypt,
-    // AIX uses specific variants of those crypt hashes
-    Md5CryptAix,
-    Sha256CryptAix,
-    Sha512CryptAix,
     UnixCryptDes,
 }
 
@@ -277,9 +271,6 @@ impl Display for PasswordType {
                 PasswordType::Md5Crypt => "linux-shadow-md5",
                 PasswordType::Sha256Crypt => "linux-shadow-sha256",
                 PasswordType::Sha512Crypt => "linux-shadow-sha512",
-                PasswordType::Md5CryptAix => "aix-smd5",
-                PasswordType::Sha256CryptAix => "aix-ssha256",
-                PasswordType::Sha512CryptAix => "aix-ssha512",
                 PasswordType::UnixCryptDes => "unix-crypt-des",
             }
         )
diff --git a/policies/rudderc/src/technique.schema.json b/policies/rudderc/src/technique.schema.json
index 631e7d809ee..933effd8751 100644
--- a/policies/rudderc/src/technique.schema.json
+++ b/policies/rudderc/src/technique.schema.json
@@ -124,10 +124,7 @@
                   "sha512",
                   "md5-crypt",
                   "sha256-crypt",
-                  "sha512-crypt",
-                  "md5-crypt-aix",
-                  "sha256-crypt-aix",
-                  "sha512-crypt-aix"
+                  "sha512-crypt"
                 ]
               }
             },
diff --git a/policies/rudderc/tests/cases/general/escaping/metadata.xml b/policies/rudderc/tests/cases/general/escaping/metadata.xml
index 541e4cb7c8f..977499975d5 100644
--- a/policies/rudderc/tests/cases/general/escaping/metadata.xml
+++ b/policies/rudderc/tests/cases/general/escaping/metadata.xml
@@ -41,26 +41,20 @@
     <SECTION name="${sys.host} . | / ${sys.${host}} &apos; &apos;&apos; &apos;&apos;&apos; $ $$ &quot; &quot;&quot; \ \\😋aà3
 	" id="a86ce2e5-d5b6-45cc-87e8-c11cca71d966" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="a86ce2e5-d5b6-45cc-87e8-c11cca71d966">
-          ${sys.host} . | / ${sys.${host}} &apos; &apos;&apos; &apos;&apos;&apos; $ $$ &quot; &quot;&quot; \ \\😋aà3
-	
-        </VALUE>
+        <VALUE id="a86ce2e5-d5b6-45cc-87e8-c11cca71d966">${sys.host} . | / ${sys.${host}} &apos; &apos;&apos; &apos;&apos;&apos; $ $$ &quot; &quot;&quot; \ \\😋aà3
+	</VALUE>
       </REPORTKEYS>
     </SECTION>
     <SECTION name="${sys.host} . | / ${sys.${host}} &apos; &apos;&apos; &apos;&apos;&apos; $ $$ &quot; &quot;&quot; \ \\😋aà3
 	" id="a86ce2e5-d5b6-45cc-87e8-c11cca71d977" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="a86ce2e5-d5b6-45cc-87e8-c11cca71d977">
-          ${sys.host} . | / ${sys.${host}} &apos; &apos;&apos; &apos;&apos;&apos; $ $$ &quot; &quot;&quot; \ \\😋aà3
-	
-        </VALUE>
+        <VALUE id="a86ce2e5-d5b6-45cc-87e8-c11cca71d977">${sys.host} . | / ${sys.${host}} &apos; &apos;&apos; &apos;&apos;&apos; $ $$ &quot; &quot;&quot; \ \\😋aà3
+	</VALUE>
       </REPORTKEYS>
     </SECTION>
     <SECTION name="cache_prefix=&quot;zapache-$UID-${STATUS_URL//[^a-zA-Z0-9_-]/_}&quot; " id="a86ce2e5-d5b6-45cc-87e8-c11cca71d978" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="a86ce2e5-d5b6-45cc-87e8-c11cca71d978">
-          cache_prefix=&quot;zapache-$UID-${STATUS_URL//[^a-zA-Z0-9_-]/_}&quot; 
-        </VALUE>
+        <VALUE id="a86ce2e5-d5b6-45cc-87e8-c11cca71d978">cache_prefix=&quot;zapache-$UID-${STATUS_URL//[^a-zA-Z0-9_-]/_}&quot; </VALUE>
       </REPORTKEYS>
     </SECTION>
   </SECTIONS>
diff --git a/policies/rudderc/tests/cases/general/escaping/technique.cf b/policies/rudderc/tests/cases/general/escaping/technique.cf
index d4bc1853178..35851b50db9 100644
--- a/policies/rudderc/tests/cases/general/escaping/technique.cf
+++ b/policies/rudderc/tests/cases/general/escaping/technique.cf
@@ -5,50 +5,85 @@
 bundle agent escaping(server) {
 
   vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
     "args"              slist => {"${server}"};
     "report_param"      string => join("_", args);
     "full_class_prefix" string => canonify("escaping_${report_param}");
     "class_prefix"      string => string_head("${full_class_prefix}", "1000");
 
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "a86ce2e5-d5b6-45cc-87e8-c11cca71d966_${report_data.directive_id}" usebundle => call_escaping_a86ce2e5_d5b6_45cc_87e8_c11cca71d966("${sys.host} . | / ${sys.${host}} ' '' ''' $ $$ \" \"\" \\ \\\\😋aà3
+    "index_${local_index}_0" usebundle => call_escaping_a86ce2e5_d5b6_45cc_87e8_c11cca71d966("${sys.host} . | / ${sys.${host}} ' '' ''' $ $$ \" \"\" \\ \\\\😋aà3
 	", "${sys.host} . | / ${sys.${host}} ' '' ''' $ $$ \" \"\" \\ \\\\😋aà3
 	", "a86ce2e5-d5b6-45cc-87e8-c11cca71d966", @{args}, "${class_prefix}", concat("",canonify("${my_cond}"),".debian|",canonify("${sys.${plouf}"),"}"), "${sys.host} . | / ${sys.${host}} ' '' ''' $ $$ \" \"\" \\ \\\\😋aà3
 	", "if(Get-Service \"Zabbix agent\") { write-output \"exists\" }", "", "");
 
-    "a86ce2e5-d5b6-45cc-87e8-c11cca71d977_${report_data.directive_id}" usebundle => call_escaping_a86ce2e5_d5b6_45cc_87e8_c11cca71d977("${sys.host} . | / ${sys.${host}} ' '' ''' $ $$ \" \"\" \\ \\\\😋aà3
+    "index_${local_index}_1" usebundle => call_escaping_a86ce2e5_d5b6_45cc_87e8_c11cca71d977("${sys.host} . | / ${sys.${host}} ' '' ''' $ $$ \" \"\" \\ \\\\😋aà3
 	", "${sys.host} . | / ${sys.${host}} ' '' ''' $ $$ \" \"\" \\ \\\\😋aà3
 	", "a86ce2e5-d5b6-45cc-87e8-c11cca71d977", @{args}, "${class_prefix}", "${sys.host} . | / ${sys.${host}} ' '' ''' $ $$ \" \"\" \\ \\\\😋aà3
 	", "if(Get-Service \"Zabbix agent\") { write-output \"exists\" }", "", "");
 
-    "a86ce2e5-d5b6-45cc-87e8-c11cca71d978_${report_data.directive_id}" usebundle => call_escaping_a86ce2e5_d5b6_45cc_87e8_c11cca71d978("cache_prefix=\"zapache-$UID-${STATUS_URL//[^a-zA-Z0-9_-]/_}\" ", "cache_prefix=\"zapache-$UID-${STATUS_URL//[^a-zA-Z0-9_-]/_}\" ", "a86ce2e5-d5b6-45cc-87e8-c11cca71d978", @{args}, "${class_prefix}", "cache_prefix=\"zapache-$UID-${STATUS_URL//[^a-zA-Z0-9_-]/_}\" ", "plop", "", "");
+    "index_${local_index}_2" usebundle => call_escaping_a86ce2e5_d5b6_45cc_87e8_c11cca71d978("cache_prefix=\"zapache-$UID-${STATUS_URL//[^a-zA-Z0-9_-]/_}\" ", "cache_prefix=\"zapache-$UID-${STATUS_URL//[^a-zA-Z0-9_-]/_}\" ", "a86ce2e5-d5b6-45cc-87e8-c11cca71d978", @{args}, "${class_prefix}", "cache_prefix=\"zapache-$UID-${STATUS_URL//[^a-zA-Z0-9_-]/_}\" ", "plop", "", "");
 
 }
 bundle agent call_escaping_a86ce2e5_d5b6_45cc_87e8_c11cca71d966(c_name, c_key, report_id, args, class_prefix, method_call_condition, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "a86ce2e5-d5b6-45cc-87e8-c11cca71d966_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "a86ce2e5-d5b6-45cc-87e8-c11cca71d966_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}"),
-                                             if => "${method_call_condition}";
-    "a86ce2e5-d5b6-45cc-87e8-c11cca71d966_${report_data.directive_id}_${c_key}" usebundle => _classes_noop(canonify("${class_prefix}_package_present_${c_key}")),
-                                         unless => "${method_call_condition}";
-    "a86ce2e5-d5b6-45cc-87e8-c11cca71d966_${report_data.directive_id}_${c_key}" usebundle => log_rudder("Skipping method 'Package present' with key parameter '${sys.host} . | / ${sys.${host}} ' '' ''' $ $$ \" \"\" \\ \\\\😋aà3
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}"),
+                                    if => "${method_call_condition}";
+    "index_${local_index}_2" usebundle => _classes_noop(canonify("${class_prefix}_package_present_${c_key}")),
+                                unless => "${method_call_condition}";
+    "index_${local_index}_3" usebundle => log_rudder("Skipping method 'Package present' with key parameter '${sys.host} . | / ${sys.${host}} ' '' ''' $ $$ \" \"\" \\ \\\\😋aà3
 	' since condition '${my_cond}.debian|${sys.${plouf}}' is not reached", "${sys.host} . | / ${sys.${host}} ' '' ''' $ $$ \" \"\" \\ \\\\😋aà3
 	", canonify("${class_prefix}_package_present_${c_key}"), canonify("${class_prefix}_package_present_${c_key}"), @{args}),
-                                         unless => "${method_call_condition}";
+                                unless => "${method_call_condition}";
 
 }
 bundle agent call_escaping_a86ce2e5_d5b6_45cc_87e8_c11cca71d977(c_name, c_key, report_id, args, class_prefix, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "a86ce2e5-d5b6-45cc-87e8-c11cca71d977_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "a86ce2e5-d5b6-45cc-87e8-c11cca71d977_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
 
 }
 bundle agent call_escaping_a86ce2e5_d5b6_45cc_87e8_c11cca71d978(c_name, c_key, report_id, args, class_prefix, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "a86ce2e5-d5b6-45cc-87e8-c11cca71d978_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "a86ce2e5-d5b6-45cc-87e8-c11cca71d978_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
 
 }
diff --git a/policies/rudderc/tests/cases/general/form/metadata.xml b/policies/rudderc/tests/cases/general/form/metadata.xml
index 3a2cf1645c1..c5bb9552eef 100644
--- a/policies/rudderc/tests/cases/general/form/metadata.xml
+++ b/policies/rudderc/tests/cases/general/form/metadata.xml
@@ -41,9 +41,7 @@
         <CONSTRAINT>
           <TYPE>textarea</TYPE>
           <MAYBEEMPTY>true</MAYBEEMPTY>
-          <REGEX error="Value should match regex: &apos;\d*&apos;">
-            \d*
-          </REGEX>
+          <REGEX error="Value should match regex: &apos;\d*&apos;">\d*</REGEX>
         </CONSTRAINT>
       </INPUT>
       <SELECT1>
@@ -93,7 +91,7 @@
         <DESCRIPTION>server_g</DESCRIPTION>
         <CONSTRAINT>
           <TYPE>password</TYPE>
-          <PASSWORDHASH>pre-hashed,linux-shadow-sha256,linux-shadow-sha512,aix-ssha256,aix-ssha512</PASSWORDHASH>
+          <PASSWORDHASH>pre-hashed,linux-shadow-sha256,linux-shadow-sha512</PASSWORDHASH>
         </CONSTRAINT>
       </INPUT>
       <INPUT>
@@ -157,9 +155,7 @@
     </SECTION>
     <SECTION name="Ensure correct ntp configuration" id="d86ce2e5-d5b6-45cc-87e8-c11cca71d907" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="d86ce2e5-d5b6-45cc-87e8-c11cca71d907">
-          htop
-        </VALUE>
+        <VALUE id="d86ce2e5-d5b6-45cc-87e8-c11cca71d907">htop</VALUE>
       </REPORTKEYS>
     </SECTION>
   </SECTIONS>
diff --git a/policies/rudderc/tests/cases/general/form/technique.cf b/policies/rudderc/tests/cases/general/form/technique.cf
index d8dd66fe6ee..2bc4c11e24f 100644
--- a/policies/rudderc/tests/cases/general/form/technique.cf
+++ b/policies/rudderc/tests/cases/general/form/technique.cf
@@ -4,24 +4,41 @@
 bundle agent form(server_a, server_b, server_c, server_d, server_e, server_f, server_g, server_h, server_i, server_j, server_k, server_l, server_m, server_n) {
 
   vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
     "args"              slist => {"${server_a}", "${server_b}", "${server_c}", "${server_d}", "${server_e}", "${server_f}", "${server_g}", "${server_h}", "${server_i}", "${server_j}", "${server_k}", "${server_l}", "${server_m}", "${server_n}"};
     "report_param"      string => join("_", args);
     "full_class_prefix" string => canonify("form_${report_param}");
     "class_prefix"      string => string_head("${full_class_prefix}", "1000");
 
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}" usebundle => call_form_d86ce2e5_d5b6_45cc_87e8_c11cca71d907("Ensure correct ntp configuration", "htop", "d86ce2e5-d5b6-45cc-87e8-c11cca71d907", @{args}, "${class_prefix}", "debian", "htop", "2.3.4", "", "");
+    "index_${local_index}_0" usebundle => call_form_d86ce2e5_d5b6_45cc_87e8_c11cca71d907("Ensure correct ntp configuration", "htop", "d86ce2e5-d5b6-45cc-87e8-c11cca71d907", @{args}, "${class_prefix}", "debian", "htop", "2.3.4", "", "");
 
 }
 bundle agent call_form_d86ce2e5_d5b6_45cc_87e8_c11cca71d907(c_name, c_key, report_id, args, class_prefix, method_call_condition, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}"),
-                                             if => "${method_call_condition}";
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => _classes_noop(canonify("${class_prefix}_package_present_${c_key}")),
-                                         unless => "${method_call_condition}";
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => log_rudder("Skipping method 'Package present' with key parameter 'htop' since condition 'debian' is not reached", "htop", canonify("${class_prefix}_package_present_${c_key}"), canonify("${class_prefix}_package_present_${c_key}"), @{args}),
-                                         unless => "${method_call_condition}";
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}"),
+                                    if => "${method_call_condition}";
+    "index_${local_index}_2" usebundle => _classes_noop(canonify("${class_prefix}_package_present_${c_key}")),
+                                unless => "${method_call_condition}";
+    "index_${local_index}_3" usebundle => log_rudder("Skipping method 'Package present' with key parameter 'htop' since condition 'debian' is not reached", "htop", canonify("${class_prefix}_package_present_${c_key}"), canonify("${class_prefix}_package_present_${c_key}"), @{args}),
+                                unless => "${method_call_condition}";
 
 }
diff --git a/policies/rudderc/tests/cases/general/long_method_param_name/metadata.xml b/policies/rudderc/tests/cases/general/long_method_param_name/metadata.xml
index 03ebd45448d..8292fc39b20 100644
--- a/policies/rudderc/tests/cases/general/long_method_param_name/metadata.xml
+++ b/policies/rudderc/tests/cases/general/long_method_param_name/metadata.xml
@@ -26,9 +26,7 @@
   <SECTIONS>
     <SECTION name="Report if condition" id="d86ce2e5-d5b6-45cc-87e8-c11cca71d907" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="d86ce2e5-d5b6-45cc-87e8-c11cca71d907">
-          This should be ReportMessage
-        </VALUE>
+        <VALUE id="d86ce2e5-d5b6-45cc-87e8-c11cca71d907">This should be ReportMessage</VALUE>
       </REPORTKEYS>
     </SECTION>
   </SECTIONS>
diff --git a/policies/rudderc/tests/cases/general/long_method_param_name/technique.cf b/policies/rudderc/tests/cases/general/long_method_param_name/technique.cf
index e48dab78465..0e6a01bc4ac 100644
--- a/policies/rudderc/tests/cases/general/long_method_param_name/technique.cf
+++ b/policies/rudderc/tests/cases/general/long_method_param_name/technique.cf
@@ -4,19 +4,36 @@
 bundle agent Windows_long_param_names {
 
   vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
     "args"              slist => {};
     "report_param"      string => join("_", args);
     "full_class_prefix" string => canonify("Windows_long_param_names_${report_param}");
     "class_prefix"      string => string_head("${full_class_prefix}", "1000");
 
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}" usebundle => call_Windows_long_param_names_d86ce2e5_d5b6_45cc_87e8_c11cca71d907("Report if condition", "This should be ReportMessage", "d86ce2e5-d5b6-45cc-87e8-c11cca71d907", @{args}, "${class_prefix}", "This should be ReportMessage", "it_generates_properly");
+    "index_${local_index}_0" usebundle => call_Windows_long_param_names_d86ce2e5_d5b6_45cc_87e8_c11cca71d907("Report if condition", "This should be ReportMessage", "d86ce2e5-d5b6-45cc-87e8-c11cca71d907", @{args}, "${class_prefix}", "This should be ReportMessage", "it_generates_properly");
 
 }
 bundle agent call_Windows_long_param_names_d86ce2e5_d5b6_45cc_87e8_c11cca71d907(c_name, c_key, report_id, args, class_prefix, report_message, condition) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => report_if_condition("${report_message}", "${condition}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => report_if_condition("${report_message}", "${condition}");
 
 }
diff --git a/policies/rudderc/tests/cases/general/min/metadata.xml b/policies/rudderc/tests/cases/general/min/metadata.xml
index 66f066cd3b3..88c1e620a9e 100644
--- a/policies/rudderc/tests/cases/general/min/metadata.xml
+++ b/policies/rudderc/tests/cases/general/min/metadata.xml
@@ -26,9 +26,7 @@
   <SECTIONS>
     <SECTION name="Package present" id="d86ce2e5-d5b6-45cc-87e8-c11cca71d907" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="d86ce2e5-d5b6-45cc-87e8-c11cca71d907">
-          htop
-        </VALUE>
+        <VALUE id="d86ce2e5-d5b6-45cc-87e8-c11cca71d907">htop</VALUE>
       </REPORTKEYS>
     </SECTION>
   </SECTIONS>
diff --git a/policies/rudderc/tests/cases/general/min/technique.cf b/policies/rudderc/tests/cases/general/min/technique.cf
index 187308a4ca1..cf7346ba3ce 100644
--- a/policies/rudderc/tests/cases/general/min/technique.cf
+++ b/policies/rudderc/tests/cases/general/min/technique.cf
@@ -4,19 +4,36 @@
 bundle agent min {
 
   vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
     "args"              slist => {};
     "report_param"      string => join("_", args);
     "full_class_prefix" string => canonify("min_${report_param}");
     "class_prefix"      string => string_head("${full_class_prefix}", "1000");
 
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}" usebundle => call_min_d86ce2e5_d5b6_45cc_87e8_c11cca71d907("Package present", "htop", "d86ce2e5-d5b6-45cc-87e8-c11cca71d907", @{args}, "${class_prefix}", "htop", "2.3.4", "", "");
+    "index_${local_index}_0" usebundle => call_min_d86ce2e5_d5b6_45cc_87e8_c11cca71d907("Package present", "htop", "d86ce2e5-d5b6-45cc-87e8-c11cca71d907", @{args}, "${class_prefix}", "htop", "2.3.4", "", "");
 
 }
 bundle agent call_min_d86ce2e5_d5b6_45cc_87e8_c11cca71d907(c_name, c_key, report_id, args, class_prefix, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
 
 }
diff --git a/policies/rudderc/tests/cases/general/ntp/metadata.xml b/policies/rudderc/tests/cases/general/ntp/metadata.xml
index 3c689ff3446..80f3bb32b9b 100644
--- a/policies/rudderc/tests/cases/general/ntp/metadata.xml
+++ b/policies/rudderc/tests/cases/general/ntp/metadata.xml
@@ -53,17 +53,13 @@
     </SECTION>
     <SECTION name="Ensure correct ntp configuration" id="d86ce2e5-d5b6-45cc-87e8-c11cca71d907" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="d86ce2e5-d5b6-45cc-87e8-c11cca71d907">
-          htop
-        </VALUE>
+        <VALUE id="d86ce2e5-d5b6-45cc-87e8-c11cca71d907">htop</VALUE>
       </REPORTKEYS>
     </SECTION>
     <SECTION id="b9e259a1-51c5-40b3-98ef-0eeaf52dca98" name="my block" reporting="worst-case-weighted-one" component="true" multivalued="true">
       <SECTION name="NTP service" id="cf06e919-02b7-41a7-a03f-4239592f3c12" component="true" multivalued="true">
         <REPORTKEYS>
-          <VALUE id="cf06e919-02b7-41a7-a03f-4239592f3c12">
-            /bin/true &quot;# ${node.inventory[os][fullName]}&quot;
-          </VALUE>
+          <VALUE id="cf06e919-02b7-41a7-a03f-4239592f3c12">/bin/true &quot;# ${node.inventory[os][fullName]}&quot;</VALUE>
         </REPORTKEYS>
       </SECTION>
     </SECTION>
diff --git a/policies/rudderc/tests/cases/general/ntp/technique.cf b/policies/rudderc/tests/cases/general/ntp/technique.cf
index efa02963aa1..7418a502f33 100644
--- a/policies/rudderc/tests/cases/general/ntp/technique.cf
+++ b/policies/rudderc/tests/cases/general/ntp/technique.cf
@@ -4,6 +4,11 @@
 bundle agent ntp_technique(server) {
 
   vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
     "resources_dir" string => "${this.promise_dirname}/resources";
 
     "args"              slist => {"${server}"};
@@ -11,29 +16,50 @@ bundle agent ntp_technique(server) {
     "full_class_prefix" string => canonify("ntp_technique_${report_param}");
     "class_prefix"      string => string_head("${full_class_prefix}", "1000");
 
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}" usebundle => call_ntp_technique_d86ce2e5_d5b6_45cc_87e8_c11cca71d907("Ensure correct ntp configuration", "htop", "d86ce2e5-d5b6-45cc-87e8-c11cca71d907", @{args}, "${class_prefix}", "htop", "2.3.4", "", "");
+    "index_${local_index}_0" usebundle => call_ntp_technique_d86ce2e5_d5b6_45cc_87e8_c11cca71d907("Ensure correct ntp configuration", "htop", "d86ce2e5-d5b6-45cc-87e8-c11cca71d907", @{args}, "${class_prefix}", "htop", "2.3.4", "", "");
 
-    "cf06e919-02b7-41a7-a03f-4239592f3c12_${report_data.directive_id}" usebundle => call_ntp_technique_cf06e919_02b7_41a7_a03f_4239592f3c12("NTP service", "/bin/true \"# ${node.inventory[os][fullName]}\"", "cf06e919-02b7-41a7-a03f-4239592f3c12", @{args}, "${class_prefix}", "linux.fedora", "/bin/true \"# ${node.inventory[os][fullName]}\"");
+    "index_${local_index}_1" usebundle => call_ntp_technique_cf06e919_02b7_41a7_a03f_4239592f3c12("NTP service", "/bin/true \"# ${node.inventory[os][fullName]}\"", "cf06e919-02b7-41a7-a03f-4239592f3c12", @{args}, "${class_prefix}", "linux.fedora", "/bin/true \"# ${node.inventory[os][fullName]}\"");
 
 }
 bundle agent call_ntp_technique_d86ce2e5_d5b6_45cc_87e8_c11cca71d907(c_name, c_key, report_id, args, class_prefix, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => _classes_noop(canonify("${class_prefix}_package_present_${c_key}"));
-    "d86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => log_rudder("Skipping method 'Package present' with key parameter 'htop' since condition 'false' is not reached", "htop", canonify("${class_prefix}_package_present_${c_key}"), canonify("${class_prefix}_package_present_${c_key}"), @{args});
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => _classes_noop(canonify("${class_prefix}_package_present_${c_key}"));
+    "index_${local_index}_2" usebundle => log_rudder("Skipping method 'Package present' with key parameter 'htop' since condition 'false' is not reached", "htop", canonify("${class_prefix}_package_present_${c_key}"), canonify("${class_prefix}_package_present_${c_key}"), @{args});
 
 }
 bundle agent call_ntp_technique_cf06e919_02b7_41a7_a03f_4239592f3c12(c_name, c_key, report_id, args, class_prefix, method_call_condition, name) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "cf06e919-02b7-41a7-a03f-4239592f3c12_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "cf06e919-02b7-41a7-a03f-4239592f3c12_${report_data.directive_id}_${c_key}" usebundle => package_install("${name}"),
-                                             if => "${method_call_condition}";
-    "cf06e919-02b7-41a7-a03f-4239592f3c12_${report_data.directive_id}_${c_key}" usebundle => _classes_noop(canonify("${class_prefix}_package_install_${c_key}")),
-                                         unless => "${method_call_condition}";
-    "cf06e919-02b7-41a7-a03f-4239592f3c12_${report_data.directive_id}_${c_key}" usebundle => log_rudder("Skipping method 'Package install' with key parameter '/bin/true \"# ${node.inventory[os][fullName]}\"' since condition 'linux.fedora' is not reached", "/bin/true \"# ${node.inventory[os][fullName]}\"", canonify("${class_prefix}_package_install_${c_key}"), canonify("${class_prefix}_package_install_${c_key}"), @{args}),
-                                         unless => "${method_call_condition}";
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => package_install("${name}"),
+                                    if => "${method_call_condition}";
+    "index_${local_index}_2" usebundle => _classes_noop(canonify("${class_prefix}_package_install_${c_key}")),
+                                unless => "${method_call_condition}";
+    "index_${local_index}_3" usebundle => log_rudder("Skipping method 'Package install' with key parameter '/bin/true \"# ${node.inventory[os][fullName]}\"' since condition 'linux.fedora' is not reached", "/bin/true \"# ${node.inventory[os][fullName]}\"", canonify("${class_prefix}_package_install_${c_key}"), canonify("${class_prefix}_package_install_${c_key}"), @{args}),
+                                unless => "${method_call_condition}";
 
 }
diff --git a/policies/rudderc/tests/cases/general/param_in_condition/metadata.xml b/policies/rudderc/tests/cases/general/param_in_condition/metadata.xml
index 98b19a328b0..ad10d5247d6 100644
--- a/policies/rudderc/tests/cases/general/param_in_condition/metadata.xml
+++ b/policies/rudderc/tests/cases/general/param_in_condition/metadata.xml
@@ -36,16 +36,12 @@
     </SECTION>
     <SECTION name="Check if a file exists" id="9e763779-9f33-44bc-ad73-1c5d5732301c" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="9e763779-9f33-44bc-ad73-1c5d5732301c">
-          /tmp/${file}
-        </VALUE>
+        <VALUE id="9e763779-9f33-44bc-ad73-1c5d5732301c">/tmp/${file}</VALUE>
       </REPORTKEYS>
     </SECTION>
     <SECTION name="Execute only if..." id="e8362340-dc50-4231-9b7f-748b51e9fa07" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="e8362340-dc50-4231-9b7f-748b51e9fa07">
-          echo &quot;May be executed or not&quot;
-        </VALUE>
+        <VALUE id="e8362340-dc50-4231-9b7f-748b51e9fa07">echo &quot;May be executed or not&quot;</VALUE>
       </REPORTKEYS>
     </SECTION>
   </SECTIONS>
diff --git a/policies/rudderc/tests/cases/general/param_in_condition/technique.cf b/policies/rudderc/tests/cases/general/param_in_condition/technique.cf
index 41f9ccd595f..f58fc8d34ba 100644
--- a/policies/rudderc/tests/cases/general/param_in_condition/technique.cf
+++ b/policies/rudderc/tests/cases/general/param_in_condition/technique.cf
@@ -4,33 +4,59 @@
 bundle agent param_in_condition(file) {
 
   vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
     "args"              slist => {"${file}"};
     "report_param"      string => join("_", args);
     "full_class_prefix" string => canonify("param_in_condition_${report_param}");
     "class_prefix"      string => string_head("${full_class_prefix}", "1000");
 
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "9e763779-9f33-44bc-ad73-1c5d5732301c_${report_data.directive_id}" usebundle => call_param_in_condition_9e763779_9f33_44bc_ad73_1c5d5732301c("Check if a file exists", "/tmp/${file}", "9e763779-9f33-44bc-ad73-1c5d5732301c", @{args}, "${class_prefix}", "/tmp/${file}");
+    "index_${local_index}_0" usebundle => call_param_in_condition_9e763779_9f33_44bc_ad73_1c5d5732301c("Check if a file exists", "/tmp/${file}", "9e763779-9f33-44bc-ad73-1c5d5732301c", @{args}, "${class_prefix}", "/tmp/${file}");
 
-    "e8362340-dc50-4231-9b7f-748b51e9fa07_${report_data.directive_id}" usebundle => call_param_in_condition_e8362340_dc50_4231_9b7f_748b51e9fa07("Execute only if...", "echo \"May be executed or not\"", "e8362340-dc50-4231-9b7f-748b51e9fa07", @{args}, "${class_prefix}", concat("file_check_exists__tmp_",canonify("${file}"),"_kept"), "echo \"May be executed or not\"");
+    "index_${local_index}_1" usebundle => call_param_in_condition_e8362340_dc50_4231_9b7f_748b51e9fa07("Execute only if...", "echo \"May be executed or not\"", "e8362340-dc50-4231-9b7f-748b51e9fa07", @{args}, "${class_prefix}", concat("file_check_exists__tmp_",canonify("${file}"),"_kept"), "echo \"May be executed or not\"");
 
 }
 bundle agent call_param_in_condition_9e763779_9f33_44bc_ad73_1c5d5732301c(c_name, c_key, report_id, args, class_prefix, path) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "9e763779-9f33-44bc-ad73-1c5d5732301c_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "9e763779-9f33-44bc-ad73-1c5d5732301c_${report_data.directive_id}_${c_key}" usebundle => file_check_exists("${path}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => file_check_exists("${path}");
 
 }
 bundle agent call_param_in_condition_e8362340_dc50_4231_9b7f_748b51e9fa07(c_name, c_key, report_id, args, class_prefix, method_call_condition, command) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "e8362340-dc50-4231-9b7f-748b51e9fa07_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "e8362340-dc50-4231-9b7f-748b51e9fa07_${report_data.directive_id}_${c_key}" usebundle => command_execution("${command}"),
-                                             if => "${method_call_condition}";
-    "e8362340-dc50-4231-9b7f-748b51e9fa07_${report_data.directive_id}_${c_key}" usebundle => _classes_noop(canonify("${class_prefix}_command_execution_${c_key}")),
-                                         unless => "${method_call_condition}";
-    "e8362340-dc50-4231-9b7f-748b51e9fa07_${report_data.directive_id}_${c_key}" usebundle => log_rudder("Skipping method 'Command execution' with key parameter 'echo \"May be executed or not\"' since condition 'file_check_exists__tmp_${file}_kept' is not reached", "echo \"May be executed or not\"", canonify("${class_prefix}_command_execution_${c_key}"), canonify("${class_prefix}_command_execution_${c_key}"), @{args}),
-                                         unless => "${method_call_condition}";
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => command_execution("${command}"),
+                                    if => "${method_call_condition}";
+    "index_${local_index}_2" usebundle => _classes_noop(canonify("${class_prefix}_command_execution_${c_key}")),
+                                unless => "${method_call_condition}";
+    "index_${local_index}_3" usebundle => log_rudder("Skipping method 'Command execution' with key parameter 'echo \"May be executed or not\"' since condition 'file_check_exists__tmp_${file}_kept' is not reached", "echo \"May be executed or not\"", canonify("${class_prefix}_command_execution_${c_key}"), canonify("${class_prefix}_command_execution_${c_key}"), @{args}),
+                                unless => "${method_call_condition}";
 
 }
diff --git a/policies/rudderc/tests/cases/general/policy_mode/metadata.xml b/policies/rudderc/tests/cases/general/policy_mode/metadata.xml
index c12aec0aaa8..408ea6a6d88 100644
--- a/policies/rudderc/tests/cases/general/policy_mode/metadata.xml
+++ b/policies/rudderc/tests/cases/general/policy_mode/metadata.xml
@@ -26,75 +26,55 @@
   <SECTIONS>
     <SECTION name="In audit mode" id="46b8025a-0b06-485c-9127-50e4258ee7e6" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="46b8025a-0b06-485c-9127-50e4258ee7e6">
-          /tmp/1
-        </VALUE>
+        <VALUE id="46b8025a-0b06-485c-9127-50e4258ee7e6">/tmp/1</VALUE>
       </REPORTKEYS>
     </SECTION>
     <SECTION name="In omit mode" id="1eedce7b-3441-4251-bdd6-706fda3ec7a8" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="1eedce7b-3441-4251-bdd6-706fda3ec7a8">
-          /tmp/1
-        </VALUE>
+        <VALUE id="1eedce7b-3441-4251-bdd6-706fda3ec7a8">/tmp/1</VALUE>
       </REPORTKEYS>
     </SECTION>
     <SECTION name="In enforce mode" id="dbd5ba50-8dfc-11ee-a57e-84a938c470d4" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="dbd5ba50-8dfc-11ee-a57e-84a938c470d4">
-          /tmp/1
-        </VALUE>
+        <VALUE id="dbd5ba50-8dfc-11ee-a57e-84a938c470d4">/tmp/1</VALUE>
       </REPORTKEYS>
     </SECTION>
     <SECTION name="In default mode" id="1d809592-808e-4177-8351-8b7b7769af69" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="1d809592-808e-4177-8351-8b7b7769af69">
-          /tmp/1
-        </VALUE>
+        <VALUE id="1d809592-808e-4177-8351-8b7b7769af69">/tmp/1</VALUE>
       </REPORTKEYS>
     </SECTION>
     <SECTION id="57f54359-2b2e-49f9-ab61-a77705615302" name="A block in audit mode" reporting="weighted" component="true" multivalued="true">
       <SECTION name="Resolve to audit" id="ea274579-40fc-4545-b384-8d5576a7c69b" component="true" multivalued="true">
         <REPORTKEYS>
-          <VALUE id="ea274579-40fc-4545-b384-8d5576a7c69b">
-            /tmp/1
-          </VALUE>
+          <VALUE id="ea274579-40fc-4545-b384-8d5576a7c69b">/tmp/1</VALUE>
         </REPORTKEYS>
       </SECTION>
       <SECTION name="Resolve to enforce" id="85659b7e-968c-458c-b566-c90108c50833" component="true" multivalued="true">
         <REPORTKEYS>
-          <VALUE id="85659b7e-968c-458c-b566-c90108c50833">
-            /tmp/1
-          </VALUE>
+          <VALUE id="85659b7e-968c-458c-b566-c90108c50833">/tmp/1</VALUE>
         </REPORTKEYS>
       </SECTION>
       <SECTION name="Resolve to audit" id="d8def455-cd43-441f-8dba-1ebae3a29389" component="true" multivalued="true">
         <REPORTKEYS>
-          <VALUE id="d8def455-cd43-441f-8dba-1ebae3a29389">
-            /tmp/1
-          </VALUE>
+          <VALUE id="d8def455-cd43-441f-8dba-1ebae3a29389">/tmp/1</VALUE>
         </REPORTKEYS>
       </SECTION>
     </SECTION>
     <SECTION id="1ff82fc2-38fc-4324-92ab-3de5fafcdc14" name="A block in enforce mode" reporting="weighted" component="true" multivalued="true">
       <SECTION name="Resolve to audit" id="f9417d97-3a18-4db6-85c3-72e28618bff1" component="true" multivalued="true">
         <REPORTKEYS>
-          <VALUE id="f9417d97-3a18-4db6-85c3-72e28618bff1">
-            /tmp/1
-          </VALUE>
+          <VALUE id="f9417d97-3a18-4db6-85c3-72e28618bff1">/tmp/1</VALUE>
         </REPORTKEYS>
       </SECTION>
       <SECTION name="Resolve to enforce" id="c4b4faa1-85e5-4922-b713-c198bf99226e" component="true" multivalued="true">
         <REPORTKEYS>
-          <VALUE id="c4b4faa1-85e5-4922-b713-c198bf99226e">
-            /tmp/1
-          </VALUE>
+          <VALUE id="c4b4faa1-85e5-4922-b713-c198bf99226e">/tmp/1</VALUE>
         </REPORTKEYS>
       </SECTION>
       <SECTION name="Resolve to enforce" id="cce62a59-bd17-4858-ba06-6ae41f39b15a" component="true" multivalued="true">
         <REPORTKEYS>
-          <VALUE id="cce62a59-bd17-4858-ba06-6ae41f39b15a">
-            /tmp/1
-          </VALUE>
+          <VALUE id="cce62a59-bd17-4858-ba06-6ae41f39b15a">/tmp/1</VALUE>
         </REPORTKEYS>
       </SECTION>
     </SECTION>
@@ -102,17 +82,13 @@
       <SECTION id="9fca6ca8-ccaa-4688-a5fc-e2a0d9d60165" name="A nested block in audit" reporting="weighted" component="true" multivalued="true">
         <SECTION name="Resolve to audit" id="0a4299dd-0902-48b2-85ee-13dfe6fc3af6" component="true" multivalued="true">
           <REPORTKEYS>
-            <VALUE id="0a4299dd-0902-48b2-85ee-13dfe6fc3af6">
-              /tmp/1
-            </VALUE>
+            <VALUE id="0a4299dd-0902-48b2-85ee-13dfe6fc3af6">/tmp/1</VALUE>
           </REPORTKEYS>
         </SECTION>
       </SECTION>
       <SECTION name="Resolve to enforce" id="3b8352df-1329-4956-a019-bb9c072bc830" component="true" multivalued="true">
         <REPORTKEYS>
-          <VALUE id="3b8352df-1329-4956-a019-bb9c072bc830">
-            /tmp/1
-          </VALUE>
+          <VALUE id="3b8352df-1329-4956-a019-bb9c072bc830">/tmp/1</VALUE>
         </REPORTKEYS>
       </SECTION>
     </SECTION>
diff --git a/policies/rudderc/tests/cases/general/policy_mode/technique.cf b/policies/rudderc/tests/cases/general/policy_mode/technique.cf
index fbdebc81325..c4e8310a307 100644
--- a/policies/rudderc/tests/cases/general/policy_mode/technique.cf
+++ b/policies/rudderc/tests/cases/general/policy_mode/technique.cf
@@ -4,146 +4,262 @@
 bundle agent test_audit {
 
   vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
     "args"              slist => {};
     "report_param"      string => join("_", args);
     "full_class_prefix" string => canonify("test_audit_${report_param}");
     "class_prefix"      string => string_head("${full_class_prefix}", "1000");
 
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "46b8025a-0b06-485c-9127-50e4258ee7e6_${report_data.directive_id}" usebundle => call_test_audit_46b8025a_0b06_485c_9127_50e4258ee7e6("In audit mode", "/tmp/1", "46b8025a-0b06-485c-9127-50e4258ee7e6", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
+    "index_${local_index}_0" usebundle => call_test_audit_46b8025a_0b06_485c_9127_50e4258ee7e6("In audit mode", "/tmp/1", "46b8025a-0b06-485c-9127-50e4258ee7e6", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
 
-    "1eedce7b-3441-4251-bdd6-706fda3ec7a8_${report_data.directive_id}" usebundle => call_test_audit_1eedce7b_3441_4251_bdd6_706fda3ec7a8("In omit mode", "/tmp/1", "1eedce7b-3441-4251-bdd6-706fda3ec7a8", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
+    "index_${local_index}_1" usebundle => call_test_audit_1eedce7b_3441_4251_bdd6_706fda3ec7a8("In omit mode", "/tmp/1", "1eedce7b-3441-4251-bdd6-706fda3ec7a8", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
 
-    "dbd5ba50-8dfc-11ee-a57e-84a938c470d4_${report_data.directive_id}" usebundle => call_test_audit_dbd5ba50_8dfc_11ee_a57e_84a938c470d4("In enforce mode", "/tmp/1", "dbd5ba50-8dfc-11ee-a57e-84a938c470d4", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
+    "index_${local_index}_2" usebundle => call_test_audit_dbd5ba50_8dfc_11ee_a57e_84a938c470d4("In enforce mode", "/tmp/1", "dbd5ba50-8dfc-11ee-a57e-84a938c470d4", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
 
-    "1d809592-808e-4177-8351-8b7b7769af69_${report_data.directive_id}" usebundle => call_test_audit_1d809592_808e_4177_8351_8b7b7769af69("In default mode", "/tmp/1", "1d809592-808e-4177-8351-8b7b7769af69", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
+    "index_${local_index}_3" usebundle => call_test_audit_1d809592_808e_4177_8351_8b7b7769af69("In default mode", "/tmp/1", "1d809592-808e-4177-8351-8b7b7769af69", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
 
-    "push_policy_mode_for_block_57f54359-2b2e-49f9-ab61-a77705615302" usebundle => push_dry_run_mode("true");
+    "index_${local_index}_4" usebundle => push_dry_run_mode("true");
 
-    "ea274579-40fc-4545-b384-8d5576a7c69b_${report_data.directive_id}" usebundle => call_test_audit_ea274579_40fc_4545_b384_8d5576a7c69b("Resolve to audit", "/tmp/1", "ea274579-40fc-4545-b384-8d5576a7c69b", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
+    "index_${local_index}_5" usebundle => call_test_audit_ea274579_40fc_4545_b384_8d5576a7c69b("Resolve to audit", "/tmp/1", "ea274579-40fc-4545-b384-8d5576a7c69b", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
 
-    "85659b7e-968c-458c-b566-c90108c50833_${report_data.directive_id}" usebundle => call_test_audit_85659b7e_968c_458c_b566_c90108c50833("Resolve to enforce", "/tmp/1", "85659b7e-968c-458c-b566-c90108c50833", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
+    "index_${local_index}_6" usebundle => call_test_audit_85659b7e_968c_458c_b566_c90108c50833("Resolve to enforce", "/tmp/1", "85659b7e-968c-458c-b566-c90108c50833", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
 
-    "d8def455-cd43-441f-8dba-1ebae3a29389_${report_data.directive_id}" usebundle => call_test_audit_d8def455_cd43_441f_8dba_1ebae3a29389("Resolve to audit", "/tmp/1", "d8def455-cd43-441f-8dba-1ebae3a29389", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
+    "index_${local_index}_7" usebundle => call_test_audit_d8def455_cd43_441f_8dba_1ebae3a29389("Resolve to audit", "/tmp/1", "d8def455-cd43-441f-8dba-1ebae3a29389", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
 
-    "pop_policy_mode_for_block_57f54359-2b2e-49f9-ab61-a77705615302" usebundle => pop_dry_run_mode();
+    "index_${local_index}_8" usebundle => pop_dry_run_mode();
 
-    "push_policy_mode_for_block_1ff82fc2-38fc-4324-92ab-3de5fafcdc14" usebundle => push_dry_run_mode("false");
+    "index_${local_index}_9" usebundle => push_dry_run_mode("false");
 
-    "f9417d97-3a18-4db6-85c3-72e28618bff1_${report_data.directive_id}" usebundle => call_test_audit_f9417d97_3a18_4db6_85c3_72e28618bff1("Resolve to audit", "/tmp/1", "f9417d97-3a18-4db6-85c3-72e28618bff1", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
+    "index_${local_index}_10" usebundle => call_test_audit_f9417d97_3a18_4db6_85c3_72e28618bff1("Resolve to audit", "/tmp/1", "f9417d97-3a18-4db6-85c3-72e28618bff1", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
 
-    "c4b4faa1-85e5-4922-b713-c198bf99226e_${report_data.directive_id}" usebundle => call_test_audit_c4b4faa1_85e5_4922_b713_c198bf99226e("Resolve to enforce", "/tmp/1", "c4b4faa1-85e5-4922-b713-c198bf99226e", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
+    "index_${local_index}_11" usebundle => call_test_audit_c4b4faa1_85e5_4922_b713_c198bf99226e("Resolve to enforce", "/tmp/1", "c4b4faa1-85e5-4922-b713-c198bf99226e", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
 
-    "cce62a59-bd17-4858-ba06-6ae41f39b15a_${report_data.directive_id}" usebundle => call_test_audit_cce62a59_bd17_4858_ba06_6ae41f39b15a("Resolve to enforce", "/tmp/1", "cce62a59-bd17-4858-ba06-6ae41f39b15a", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
+    "index_${local_index}_12" usebundle => call_test_audit_cce62a59_bd17_4858_ba06_6ae41f39b15a("Resolve to enforce", "/tmp/1", "cce62a59-bd17-4858-ba06-6ae41f39b15a", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
 
-    "pop_policy_mode_for_block_1ff82fc2-38fc-4324-92ab-3de5fafcdc14" usebundle => pop_dry_run_mode();
+    "index_${local_index}_13" usebundle => pop_dry_run_mode();
 
-    "push_policy_mode_for_block_7def389a-78d2-4104-b6fc-19c74f14fe93" usebundle => push_dry_run_mode("false");
+    "index_${local_index}_14" usebundle => push_dry_run_mode("false");
 
-    "push_policy_mode_for_block_9fca6ca8-ccaa-4688-a5fc-e2a0d9d60165" usebundle => push_dry_run_mode("true");
+    "index_${local_index}_15" usebundle => push_dry_run_mode("true");
 
-    "0a4299dd-0902-48b2-85ee-13dfe6fc3af6_${report_data.directive_id}" usebundle => call_test_audit_0a4299dd_0902_48b2_85ee_13dfe6fc3af6("Resolve to audit", "/tmp/1", "0a4299dd-0902-48b2-85ee-13dfe6fc3af6", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
+    "index_${local_index}_16" usebundle => call_test_audit_0a4299dd_0902_48b2_85ee_13dfe6fc3af6("Resolve to audit", "/tmp/1", "0a4299dd-0902-48b2-85ee-13dfe6fc3af6", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
 
-    "pop_policy_mode_for_block_9fca6ca8-ccaa-4688-a5fc-e2a0d9d60165" usebundle => pop_dry_run_mode();
+    "index_${local_index}_17" usebundle => pop_dry_run_mode();
 
-    "3b8352df-1329-4956-a019-bb9c072bc830_${report_data.directive_id}" usebundle => call_test_audit_3b8352df_1329_4956_a019_bb9c072bc830("Resolve to enforce", "/tmp/1", "3b8352df-1329-4956-a019-bb9c072bc830", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
+    "index_${local_index}_18" usebundle => call_test_audit_3b8352df_1329_4956_a019_bb9c072bc830("Resolve to enforce", "/tmp/1", "3b8352df-1329-4956-a019-bb9c072bc830", @{args}, "${class_prefix}", "/tmp/1", "foobar", "true");
 
-    "pop_policy_mode_for_block_7def389a-78d2-4104-b6fc-19c74f14fe93" usebundle => pop_dry_run_mode();
+    "index_${local_index}_19" usebundle => pop_dry_run_mode();
 
 }
 bundle agent call_test_audit_46b8025a_0b06_485c_9127_50e4258ee7e6(c_name, c_key, report_id, args, class_prefix, path, lines, enforce) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "46b8025a-0b06-485c-9127-50e4258ee7e6_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "46b8025a-0b06-485c-9127-50e4258ee7e6_${report_data.directive_id}_${c_key}" usebundle => push_dry_run_mode("true");
-    "46b8025a-0b06-485c-9127-50e4258ee7e6_${report_data.directive_id}_${c_key}" usebundle => file_content("${path}", "${lines}", "${enforce}");
-    "46b8025a-0b06-485c-9127-50e4258ee7e6_${report_data.directive_id}_${c_key}" usebundle => pop_dry_run_mode();
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => push_dry_run_mode("true");
+    "index_${local_index}_2" usebundle => file_content("${path}", "${lines}", "${enforce}");
+    "index_${local_index}_3" usebundle => pop_dry_run_mode();
 
 }
 bundle agent call_test_audit_1eedce7b_3441_4251_bdd6_706fda3ec7a8(c_name, c_key, report_id, args, class_prefix, path, lines, enforce) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "1eedce7b-3441-4251-bdd6-706fda3ec7a8_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "1eedce7b-3441-4251-bdd6-706fda3ec7a8_${report_data.directive_id}_${c_key}" usebundle => file_content("${path}", "${lines}", "${enforce}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => file_content("${path}", "${lines}", "${enforce}");
 
 }
 bundle agent call_test_audit_dbd5ba50_8dfc_11ee_a57e_84a938c470d4(c_name, c_key, report_id, args, class_prefix, path, lines, enforce) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "dbd5ba50-8dfc-11ee-a57e-84a938c470d4_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "dbd5ba50-8dfc-11ee-a57e-84a938c470d4_${report_data.directive_id}_${c_key}" usebundle => push_dry_run_mode("false");
-    "dbd5ba50-8dfc-11ee-a57e-84a938c470d4_${report_data.directive_id}_${c_key}" usebundle => file_content("${path}", "${lines}", "${enforce}");
-    "dbd5ba50-8dfc-11ee-a57e-84a938c470d4_${report_data.directive_id}_${c_key}" usebundle => pop_dry_run_mode();
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => push_dry_run_mode("false");
+    "index_${local_index}_2" usebundle => file_content("${path}", "${lines}", "${enforce}");
+    "index_${local_index}_3" usebundle => pop_dry_run_mode();
 
 }
 bundle agent call_test_audit_1d809592_808e_4177_8351_8b7b7769af69(c_name, c_key, report_id, args, class_prefix, path, lines, enforce) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "1d809592-808e-4177-8351-8b7b7769af69_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "1d809592-808e-4177-8351-8b7b7769af69_${report_data.directive_id}_${c_key}" usebundle => file_content("${path}", "${lines}", "${enforce}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => file_content("${path}", "${lines}", "${enforce}");
 
 }
 bundle agent call_test_audit_ea274579_40fc_4545_b384_8d5576a7c69b(c_name, c_key, report_id, args, class_prefix, path, lines, enforce) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "ea274579-40fc-4545-b384-8d5576a7c69b_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "ea274579-40fc-4545-b384-8d5576a7c69b_${report_data.directive_id}_${c_key}" usebundle => push_dry_run_mode("true");
-    "ea274579-40fc-4545-b384-8d5576a7c69b_${report_data.directive_id}_${c_key}" usebundle => file_content("${path}", "${lines}", "${enforce}");
-    "ea274579-40fc-4545-b384-8d5576a7c69b_${report_data.directive_id}_${c_key}" usebundle => pop_dry_run_mode();
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => push_dry_run_mode("true");
+    "index_${local_index}_2" usebundle => file_content("${path}", "${lines}", "${enforce}");
+    "index_${local_index}_3" usebundle => pop_dry_run_mode();
 
 }
 bundle agent call_test_audit_85659b7e_968c_458c_b566_c90108c50833(c_name, c_key, report_id, args, class_prefix, path, lines, enforce) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "85659b7e-968c-458c-b566-c90108c50833_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "85659b7e-968c-458c-b566-c90108c50833_${report_data.directive_id}_${c_key}" usebundle => push_dry_run_mode("false");
-    "85659b7e-968c-458c-b566-c90108c50833_${report_data.directive_id}_${c_key}" usebundle => file_content("${path}", "${lines}", "${enforce}");
-    "85659b7e-968c-458c-b566-c90108c50833_${report_data.directive_id}_${c_key}" usebundle => pop_dry_run_mode();
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => push_dry_run_mode("false");
+    "index_${local_index}_2" usebundle => file_content("${path}", "${lines}", "${enforce}");
+    "index_${local_index}_3" usebundle => pop_dry_run_mode();
 
 }
 bundle agent call_test_audit_d8def455_cd43_441f_8dba_1ebae3a29389(c_name, c_key, report_id, args, class_prefix, path, lines, enforce) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "d8def455-cd43-441f-8dba-1ebae3a29389_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "d8def455-cd43-441f-8dba-1ebae3a29389_${report_data.directive_id}_${c_key}" usebundle => file_content("${path}", "${lines}", "${enforce}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => file_content("${path}", "${lines}", "${enforce}");
 
 }
 bundle agent call_test_audit_f9417d97_3a18_4db6_85c3_72e28618bff1(c_name, c_key, report_id, args, class_prefix, path, lines, enforce) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "f9417d97-3a18-4db6-85c3-72e28618bff1_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "f9417d97-3a18-4db6-85c3-72e28618bff1_${report_data.directive_id}_${c_key}" usebundle => push_dry_run_mode("true");
-    "f9417d97-3a18-4db6-85c3-72e28618bff1_${report_data.directive_id}_${c_key}" usebundle => file_content("${path}", "${lines}", "${enforce}");
-    "f9417d97-3a18-4db6-85c3-72e28618bff1_${report_data.directive_id}_${c_key}" usebundle => pop_dry_run_mode();
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => push_dry_run_mode("true");
+    "index_${local_index}_2" usebundle => file_content("${path}", "${lines}", "${enforce}");
+    "index_${local_index}_3" usebundle => pop_dry_run_mode();
 
 }
 bundle agent call_test_audit_c4b4faa1_85e5_4922_b713_c198bf99226e(c_name, c_key, report_id, args, class_prefix, path, lines, enforce) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "c4b4faa1-85e5-4922-b713-c198bf99226e_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "c4b4faa1-85e5-4922-b713-c198bf99226e_${report_data.directive_id}_${c_key}" usebundle => push_dry_run_mode("false");
-    "c4b4faa1-85e5-4922-b713-c198bf99226e_${report_data.directive_id}_${c_key}" usebundle => file_content("${path}", "${lines}", "${enforce}");
-    "c4b4faa1-85e5-4922-b713-c198bf99226e_${report_data.directive_id}_${c_key}" usebundle => pop_dry_run_mode();
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => push_dry_run_mode("false");
+    "index_${local_index}_2" usebundle => file_content("${path}", "${lines}", "${enforce}");
+    "index_${local_index}_3" usebundle => pop_dry_run_mode();
 
 }
 bundle agent call_test_audit_cce62a59_bd17_4858_ba06_6ae41f39b15a(c_name, c_key, report_id, args, class_prefix, path, lines, enforce) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "cce62a59-bd17-4858-ba06-6ae41f39b15a_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "cce62a59-bd17-4858-ba06-6ae41f39b15a_${report_data.directive_id}_${c_key}" usebundle => file_content("${path}", "${lines}", "${enforce}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => file_content("${path}", "${lines}", "${enforce}");
 
 }
 bundle agent call_test_audit_0a4299dd_0902_48b2_85ee_13dfe6fc3af6(c_name, c_key, report_id, args, class_prefix, path, lines, enforce) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "0a4299dd-0902-48b2-85ee-13dfe6fc3af6_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "0a4299dd-0902-48b2-85ee-13dfe6fc3af6_${report_data.directive_id}_${c_key}" usebundle => file_content("${path}", "${lines}", "${enforce}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => file_content("${path}", "${lines}", "${enforce}");
 
 }
 bundle agent call_test_audit_3b8352df_1329_4956_a019_bb9c072bc830(c_name, c_key, report_id, args, class_prefix, path, lines, enforce) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "3b8352df-1329-4956-a019-bb9c072bc830_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "3b8352df-1329-4956-a019-bb9c072bc830_${report_data.directive_id}_${c_key}" usebundle => file_content("${path}", "${lines}", "${enforce}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => file_content("${path}", "${lines}", "${enforce}");
 
 }
diff --git a/policies/rudderc/tests/cases/general/reporting/metadata.xml b/policies/rudderc/tests/cases/general/reporting/metadata.xml
index 61371022a96..a12e3cbbb26 100644
--- a/policies/rudderc/tests/cases/general/reporting/metadata.xml
+++ b/policies/rudderc/tests/cases/general/reporting/metadata.xml
@@ -26,33 +26,25 @@
   <SECTIONS>
     <SECTION name="No block without condition" id="a86ce2e5-d5b6-45cc-87e8-c11cca71d908" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="a86ce2e5-d5b6-45cc-87e8-c11cca71d908">
-          htop
-        </VALUE>
+        <VALUE id="a86ce2e5-d5b6-45cc-87e8-c11cca71d908">htop</VALUE>
       </REPORTKEYS>
     </SECTION>
     <SECTION name="No block with condition" id="b86ce2e5-d5b6-45cc-87e8-c11cca71d907" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="b86ce2e5-d5b6-45cc-87e8-c11cca71d907">
-          htop
-        </VALUE>
+        <VALUE id="b86ce2e5-d5b6-45cc-87e8-c11cca71d907">htop</VALUE>
       </REPORTKEYS>
     </SECTION>
     <SECTION id="c9e259a1-51c5-40b3-98ef-0eeaf52dca99" name="A simpl block" reporting="worst-case-weighted-one" component="true" multivalued="true">
       <SECTION name="NTP service" id="df06e919-02b7-41a7-a03f-4239592f3c12" component="true" multivalued="true">
         <REPORTKEYS>
-          <VALUE id="df06e919-02b7-41a7-a03f-4239592f3c12">
-            ntp
-          </VALUE>
+          <VALUE id="df06e919-02b7-41a7-a03f-4239592f3c12">ntp</VALUE>
         </REPORTKEYS>
       </SECTION>
     </SECTION>
     <SECTION id="c9e259a1-51c5-40b3-98ef-0eeaf52dca98" name="A simple block" reporting="worst-case-weighted-one" component="true" multivalued="true">
       <SECTION name="NTP service" id="df06e919-02b7-41a7-a03f-4239592f3c45" component="true" multivalued="true">
         <REPORTKEYS>
-          <VALUE id="df06e919-02b7-41a7-a03f-4239592f3c45">
-            ntp
-          </VALUE>
+          <VALUE id="df06e919-02b7-41a7-a03f-4239592f3c45">ntp</VALUE>
         </REPORTKEYS>
       </SECTION>
     </SECTION>
@@ -60,36 +52,28 @@
       <SECTION id="b9e259a1-51c5-40b3-98ef-0eeaf52dca96" name="A simple block inside" reporting="worst-case-weighted-one" component="true" multivalued="true">
         <SECTION name="NTP service" id="cf06e919-02b7-41a7-a03f-4239592f3c14" component="true" multivalued="true">
           <REPORTKEYS>
-            <VALUE id="cf06e919-02b7-41a7-a03f-4239592f3c14">
-              ntp
-            </VALUE>
+            <VALUE id="cf06e919-02b7-41a7-a03f-4239592f3c14">ntp</VALUE>
           </REPORTKEYS>
         </SECTION>
       </SECTION>
       <SECTION id="b9e259a1-51c5-40b3-98ef-0eeaf52dca97" name="Another block inside" reporting="worst-case-weighted-sum" component="true" multivalued="true">
         <SECTION name="NTP service" id="cf06e919-02b7-41a7-a03f-4239592f3c13" component="true" multivalued="true">
           <REPORTKEYS>
-            <VALUE id="cf06e919-02b7-41a7-a03f-4239592f3c13">
-              ntp
-            </VALUE>
+            <VALUE id="cf06e919-02b7-41a7-a03f-4239592f3c13">ntp</VALUE>
           </REPORTKEYS>
         </SECTION>
       </SECTION>
       <SECTION id="074d64ca-10ec-4c50-b0e1-4c85903f8b4c" name="Another block inside" reporting="focus:cf06e919-02b7-41a7-a03f-4239592f3c21" component="true" multivalued="true">
         <SECTION name="Enabled reporting" id="cf06e919-02b7-41a7-a03f-4239592f3c21" component="true" multivalued="true">
           <REPORTKEYS>
-            <VALUE id="cf06e919-02b7-41a7-a03f-4239592f3c21">
-              ntp
-            </VALUE>
+            <VALUE id="cf06e919-02b7-41a7-a03f-4239592f3c21">ntp</VALUE>
           </REPORTKEYS>
         </SECTION>
       </SECTION>
       <SECTION id="344d64ca-10ec-4c50-b0e1-4c85903f8b4c" name="Yet another block inside" reporting="focus-worst" component="true" multivalued="true">
         <SECTION name="Enabled reporting" id="df06e919-02b7-41a7-a03f-4239592f3c21" component="true" multivalued="true">
           <REPORTKEYS>
-            <VALUE id="df06e919-02b7-41a7-a03f-4239592f3c21">
-              ntp
-            </VALUE>
+            <VALUE id="df06e919-02b7-41a7-a03f-4239592f3c21">ntp</VALUE>
           </REPORTKEYS>
         </SECTION>
       </SECTION>
diff --git a/policies/rudderc/tests/cases/general/reporting/technique.cf b/policies/rudderc/tests/cases/general/reporting/technique.cf
index d0a90e78862..341ffab583a 100644
--- a/policies/rudderc/tests/cases/general/reporting/technique.cf
+++ b/policies/rudderc/tests/cases/general/reporting/technique.cf
@@ -4,109 +4,207 @@
 bundle agent reporting {
 
   vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
     "args"              slist => {};
     "report_param"      string => join("_", args);
     "full_class_prefix" string => canonify("reporting_${report_param}");
     "class_prefix"      string => string_head("${full_class_prefix}", "1000");
 
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "a86ce2e5-d5b6-45cc-87e8-c11cca71d908_${report_data.directive_id}" usebundle => call_reporting_a86ce2e5_d5b6_45cc_87e8_c11cca71d908("No block without condition", "htop", "a86ce2e5-d5b6-45cc-87e8-c11cca71d908", @{args}, "${class_prefix}", "htop", "", "", "");
+    "index_${local_index}_0" usebundle => call_reporting_a86ce2e5_d5b6_45cc_87e8_c11cca71d908("No block without condition", "htop", "a86ce2e5-d5b6-45cc-87e8-c11cca71d908", @{args}, "${class_prefix}", "htop", "", "", "");
 
-    "b86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}" usebundle => call_reporting_b86ce2e5_d5b6_45cc_87e8_c11cca71d907("No block with condition", "htop", "b86ce2e5-d5b6-45cc-87e8-c11cca71d907", @{args}, "${class_prefix}", "debian", "htop", "", "", "");
+    "index_${local_index}_1" usebundle => call_reporting_b86ce2e5_d5b6_45cc_87e8_c11cca71d907("No block with condition", "htop", "b86ce2e5-d5b6-45cc-87e8-c11cca71d907", @{args}, "${class_prefix}", "debian", "htop", "", "", "");
 
-    "df06e919-02b7-41a7-a03f-4239592f3c12_${report_data.directive_id}" usebundle => call_reporting_df06e919_02b7_41a7_a03f_4239592f3c12("NTP service", "ntp", "df06e919-02b7-41a7-a03f-4239592f3c12", @{args}, "${class_prefix}", "ntp", "", "", "");
+    "index_${local_index}_2" usebundle => call_reporting_df06e919_02b7_41a7_a03f_4239592f3c12("NTP service", "ntp", "df06e919-02b7-41a7-a03f-4239592f3c12", @{args}, "${class_prefix}", "ntp", "", "", "");
 
-    "df06e919-02b7-41a7-a03f-4239592f3c45_${report_data.directive_id}" usebundle => call_reporting_df06e919_02b7_41a7_a03f_4239592f3c45("NTP service", "ntp", "df06e919-02b7-41a7-a03f-4239592f3c45", @{args}, "${class_prefix}", "ntp", "", "", "");
+    "index_${local_index}_3" usebundle => call_reporting_df06e919_02b7_41a7_a03f_4239592f3c45("NTP service", "ntp", "df06e919-02b7-41a7-a03f-4239592f3c45", @{args}, "${class_prefix}", "ntp", "", "", "");
 
-    "cf06e919-02b7-41a7-a03f-4239592f3c14_${report_data.directive_id}" usebundle => call_reporting_cf06e919_02b7_41a7_a03f_4239592f3c14("NTP service", "ntp", "cf06e919-02b7-41a7-a03f-4239592f3c14", @{args}, "${class_prefix}", "ntp", "", "", "");
+    "index_${local_index}_4" usebundle => call_reporting_cf06e919_02b7_41a7_a03f_4239592f3c14("NTP service", "ntp", "cf06e919-02b7-41a7-a03f-4239592f3c14", @{args}, "${class_prefix}", "ntp", "", "", "");
 
-    "cf06e919-02b7-41a7-a03f-4239592f3c13_${report_data.directive_id}" usebundle => call_reporting_cf06e919_02b7_41a7_a03f_4239592f3c13("NTP service", "ntp", "cf06e919-02b7-41a7-a03f-4239592f3c13", @{args}, "${class_prefix}", "ntp", "", "", "");
+    "index_${local_index}_5" usebundle => call_reporting_cf06e919_02b7_41a7_a03f_4239592f3c13("NTP service", "ntp", "cf06e919-02b7-41a7-a03f-4239592f3c13", @{args}, "${class_prefix}", "ntp", "", "", "");
 
-    "cf06e919-02b7-41a7-a03f-4239592f3c21_${report_data.directive_id}" usebundle => call_reporting_cf06e919_02b7_41a7_a03f_4239592f3c21("Enabled reporting", "ntp", "cf06e919-02b7-41a7-a03f-4239592f3c21", @{args}, "${class_prefix}", "ntp", "", "", "");
+    "index_${local_index}_6" usebundle => call_reporting_cf06e919_02b7_41a7_a03f_4239592f3c21("Enabled reporting", "ntp", "cf06e919-02b7-41a7-a03f-4239592f3c21", @{args}, "${class_prefix}", "ntp", "", "", "");
 
-    "c76686bb-79ab-4ae5-b45f-108492ab4101_${report_data.directive_id}" usebundle => call_reporting_c76686bb_79ab_4ae5_b45f_108492ab4101("Disabled reporting", "ntp", "c76686bb-79ab-4ae5-b45f-108492ab4101", @{args}, "${class_prefix}", "ntp", "", "", "");
+    "index_${local_index}_7" usebundle => call_reporting_c76686bb_79ab_4ae5_b45f_108492ab4101("Disabled reporting", "ntp", "c76686bb-79ab-4ae5-b45f-108492ab4101", @{args}, "${class_prefix}", "ntp", "", "", "");
 
-    "df06e919-02b7-41a7-a03f-4239592f3c21_${report_data.directive_id}" usebundle => call_reporting_df06e919_02b7_41a7_a03f_4239592f3c21("Enabled reporting", "ntp", "df06e919-02b7-41a7-a03f-4239592f3c21", @{args}, "${class_prefix}", "ntp", "", "", "");
+    "index_${local_index}_8" usebundle => call_reporting_df06e919_02b7_41a7_a03f_4239592f3c21("Enabled reporting", "ntp", "df06e919-02b7-41a7-a03f-4239592f3c21", @{args}, "${class_prefix}", "ntp", "", "", "");
 
-    "d76686bb-79ab-4ae5-b45f-108492ab4101_${report_data.directive_id}" usebundle => call_reporting_d76686bb_79ab_4ae5_b45f_108492ab4101("Disabled reporting", "ntp", "d76686bb-79ab-4ae5-b45f-108492ab4101", @{args}, "${class_prefix}", "ntp", "", "", "");
+    "index_${local_index}_9" usebundle => call_reporting_d76686bb_79ab_4ae5_b45f_108492ab4101("Disabled reporting", "ntp", "d76686bb-79ab-4ae5-b45f-108492ab4101", @{args}, "${class_prefix}", "ntp", "", "", "");
 
 }
 bundle agent call_reporting_a86ce2e5_d5b6_45cc_87e8_c11cca71d908(c_name, c_key, report_id, args, class_prefix, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "a86ce2e5-d5b6-45cc-87e8-c11cca71d908_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "a86ce2e5-d5b6-45cc-87e8-c11cca71d908_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
 
 }
 bundle agent call_reporting_b86ce2e5_d5b6_45cc_87e8_c11cca71d907(c_name, c_key, report_id, args, class_prefix, method_call_condition, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "b86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "b86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}"),
-                                             if => "${method_call_condition}";
-    "b86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => _classes_noop(canonify("${class_prefix}_package_present_${c_key}")),
-                                         unless => "${method_call_condition}";
-    "b86ce2e5-d5b6-45cc-87e8-c11cca71d907_${report_data.directive_id}_${c_key}" usebundle => log_rudder("Skipping method 'Package present' with key parameter 'htop' since condition 'debian' is not reached", "htop", canonify("${class_prefix}_package_present_${c_key}"), canonify("${class_prefix}_package_present_${c_key}"), @{args}),
-                                         unless => "${method_call_condition}";
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}"),
+                                    if => "${method_call_condition}";
+    "index_${local_index}_2" usebundle => _classes_noop(canonify("${class_prefix}_package_present_${c_key}")),
+                                unless => "${method_call_condition}";
+    "index_${local_index}_3" usebundle => log_rudder("Skipping method 'Package present' with key parameter 'htop' since condition 'debian' is not reached", "htop", canonify("${class_prefix}_package_present_${c_key}"), canonify("${class_prefix}_package_present_${c_key}"), @{args}),
+                                unless => "${method_call_condition}";
 
 }
 bundle agent call_reporting_df06e919_02b7_41a7_a03f_4239592f3c12(c_name, c_key, report_id, args, class_prefix, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "df06e919-02b7-41a7-a03f-4239592f3c12_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "df06e919-02b7-41a7-a03f-4239592f3c12_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
 
 }
 bundle agent call_reporting_df06e919_02b7_41a7_a03f_4239592f3c45(c_name, c_key, report_id, args, class_prefix, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "df06e919-02b7-41a7-a03f-4239592f3c45_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "df06e919-02b7-41a7-a03f-4239592f3c45_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
 
 }
 bundle agent call_reporting_cf06e919_02b7_41a7_a03f_4239592f3c14(c_name, c_key, report_id, args, class_prefix, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "cf06e919-02b7-41a7-a03f-4239592f3c14_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "cf06e919-02b7-41a7-a03f-4239592f3c14_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
 
 }
 bundle agent call_reporting_cf06e919_02b7_41a7_a03f_4239592f3c13(c_name, c_key, report_id, args, class_prefix, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "cf06e919-02b7-41a7-a03f-4239592f3c13_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "cf06e919-02b7-41a7-a03f-4239592f3c13_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
 
 }
 bundle agent call_reporting_cf06e919_02b7_41a7_a03f_4239592f3c21(c_name, c_key, report_id, args, class_prefix, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "cf06e919-02b7-41a7-a03f-4239592f3c21_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "cf06e919-02b7-41a7-a03f-4239592f3c21_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
 
 }
 bundle agent call_reporting_c76686bb_79ab_4ae5_b45f_108492ab4101(c_name, c_key, report_id, args, class_prefix, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "c76686bb-79ab-4ae5-b45f-108492ab4101_${report_data.directive_id}_${c_key}" usebundle => disable_reporting();
-    "c76686bb-79ab-4ae5-b45f-108492ab4101_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "c76686bb-79ab-4ae5-b45f-108492ab4101_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
-    "c76686bb-79ab-4ae5-b45f-108492ab4101_${report_data.directive_id}_${c_key}" usebundle => enable_reporting();
+    "index_${local_index}_0" usebundle => disable_reporting();
+    "index_${local_index}_1" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_2" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
+    "index_${local_index}_3" usebundle => enable_reporting();
 
 }
 bundle agent call_reporting_df06e919_02b7_41a7_a03f_4239592f3c21(c_name, c_key, report_id, args, class_prefix, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "df06e919-02b7-41a7-a03f-4239592f3c21_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "df06e919-02b7-41a7-a03f-4239592f3c21_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
 
 }
 bundle agent call_reporting_d76686bb_79ab_4ae5_b45f_108492ab4101(c_name, c_key, report_id, args, class_prefix, name, version, architecture, provider) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "d76686bb-79ab-4ae5-b45f-108492ab4101_${report_data.directive_id}_${c_key}" usebundle => disable_reporting();
-    "d76686bb-79ab-4ae5-b45f-108492ab4101_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "d76686bb-79ab-4ae5-b45f-108492ab4101_${report_data.directive_id}_${c_key}" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
-    "d76686bb-79ab-4ae5-b45f-108492ab4101_${report_data.directive_id}_${c_key}" usebundle => enable_reporting();
+    "index_${local_index}_0" usebundle => disable_reporting();
+    "index_${local_index}_1" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_2" usebundle => package_present("${name}", "${version}", "${architecture}", "${provider}");
+    "index_${local_index}_3" usebundle => enable_reporting();
 
 }
diff --git a/policies/rudderc/tests/cases/general/variables/metadata.xml b/policies/rudderc/tests/cases/general/variables/metadata.xml
index 42381c9c676..f6672d2a7fb 100644
--- a/policies/rudderc/tests/cases/general/variables/metadata.xml
+++ b/policies/rudderc/tests/cases/general/variables/metadata.xml
@@ -36,9 +36,7 @@
     </SECTION>
     <SECTION name="File content" id="d982a7e6-494a-40a5-aea1-7d9a185eed61" component="true" multivalued="true">
       <REPORTKEYS>
-        <VALUE id="d982a7e6-494a-40a5-aea1-7d9a185eed61">
-          /some/path
-        </VALUE>
+        <VALUE id="d982a7e6-494a-40a5-aea1-7d9a185eed61">/some/path</VALUE>
       </REPORTKEYS>
     </SECTION>
   </SECTIONS>
diff --git a/policies/rudderc/tests/cases/general/variables/technique.cf b/policies/rudderc/tests/cases/general/variables/technique.cf
index 363054cf3fc..dd63abbed42 100644
--- a/policies/rudderc/tests/cases/general/variables/technique.cf
+++ b/policies/rudderc/tests/cases/general/variables/technique.cf
@@ -4,13 +4,21 @@
 bundle agent test_windows(content) {
 
   vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
     "args"              slist => {"${content}"};
     "report_param"      string => join("_", args);
     "full_class_prefix" string => canonify("test_windows_${report_param}");
     "class_prefix"      string => string_head("${full_class_prefix}", "1000");
 
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "d982a7e6-494a-40a5-aea1-7d9a185eed61_${report_data.directive_id}" usebundle => call_test_windows_d982a7e6_494a_40a5_aea1_7d9a185eed61("File content", "/some/path", "d982a7e6-494a-40a5-aea1-7d9a185eed61", @{args}, "${class_prefix}", "/some/path", "# Raw string
+    "index_${local_index}_0" usebundle => call_test_windows_d982a7e6_494a_40a5_aea1_7d9a185eed61("File content", "/some/path", "d982a7e6-494a-40a5-aea1-7d9a185eed61", @{args}, "${class_prefix}", "/some/path", "# Raw string
 foo foobar
 # With parameter
 foo ${content} foobar
@@ -24,8 +32,17 @@ ${node.properties[name][key]}", "true");
 }
 bundle agent call_test_windows_d982a7e6_494a_40a5_aea1_7d9a185eed61(c_name, c_key, report_id, args, class_prefix, path, lines, enforce) {
 
+  vars:
+    "report_data.index" int => int(eval("${report_data.index}+1", "math", "infix")),
+                           unless => "rudder_increment_guard";
+    "local_index"       int => ${report_data.index},
+                           unless => "rudder_increment_guard";
+
+  classes:
+    "rudder_increment_guard" expression => "any";
+
   methods:
-    "d982a7e6-494a-40a5-aea1-7d9a185eed61_${report_data.directive_id}_${c_key}" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
-    "d982a7e6-494a-40a5-aea1-7d9a185eed61_${report_data.directive_id}_${c_key}" usebundle => file_content("${path}", "${lines}", "${enforce}");
+    "index_${local_index}_0" usebundle => _method_reporting_context_v4("${c_name}", "${c_key}", "${report_id}");
+    "index_${local_index}_1" usebundle => file_content("${path}", "${lines}", "${enforce}");
 
 }
diff --git a/policies/rudderc/tests/metadata/serialized.xml b/policies/rudderc/tests/metadata/serialized.xml
index 9d6eb277b8b..fef414e68ef 100644
--- a/policies/rudderc/tests/metadata/serialized.xml
+++ b/policies/rudderc/tests/metadata/serialized.xml
@@ -28,9 +28,7 @@
     <SECTION id="6dc261b7-606b-43a7-8797-cd353763f50c" name="Variable string match" reporting="weighted" component="true" multivalued="true">
       <SECTION name="Variable dict" id="f6810347-f367-4465-96be-3a50860f4cb1" component="true" multivalued="true">
         <REPORTKEYS>
-          <VALUE id="5dbfb761-f15f-40b5-9f75-b3d88b81483e">
-            key
-          </VALUE>
+          <VALUE id="5dbfb761-f15f-40b5-9f75-b3d88b81483e">key</VALUE>
         </REPORTKEYS>
       </SECTION>
       <SECTION name="Technique parameters">
diff --git a/relay/sources/api-doc/openapi.src.yml b/relay/sources/api-doc/openapi.src.yml
index aab8fb4251e..4c84ff5a1eb 100644
--- a/relay/sources/api-doc/openapi.src.yml
+++ b/relay/sources/api-doc/openapi.src.yml
@@ -6,7 +6,7 @@ info:
   version: "1"
   description: introduction.yml
   x-logo:
-    url: "assets/rudder.svg"
+    url: "assets/rudder-logo-rect-black.svg"
   contact:
     email: dev@rudder.io
     name: Rudder developers
diff --git a/relay/sources/relayd/Cargo.toml b/relay/sources/relayd/Cargo.toml
index 02c917179b3..b32e5c0a9b9 100644
--- a/relay/sources/relayd/Cargo.toml
+++ b/relay/sources/relayd/Cargo.toml
@@ -28,7 +28,7 @@ futures = { version = "0.3", default-features = false }
 hex = "0.4"
 humantime = "2"
 hyper = { version = "0.14", default-features = false }
-inotify = "0.10"
+inotify = "0.11"
 lazy_static = "1"
 nom = "7"
 openssl = "0.10"
@@ -37,11 +37,12 @@ prometheus = { version = "0.13", default-features = false, features = ["process"
 regex = "1"
 # Use openssl for TLS to be consistent
 reqwest = { version = "0.11.1", default-features = false, features = ["stream", "blocking", "native-tls"] }
-secrecy = { version = "0.8", features = ["serde"] }
+secrecy = { version = "0.10", features = ["serde"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
+serde-inline-default = "0.2"
 sha2 = "0.10"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", default-features = false, features = [ "rt-multi-thread", "process", "macros", "signal", "fs"] }
 tokio-stream = { version = "0.1", default-features = false, features = ["io-util"] }
 toml = "0.8.8"
diff --git a/relay/sources/relayd/Dockerfile b/relay/sources/relayd/Dockerfile
index 7a72f45dbfd..90553a9d927 100644
--- a/relay/sources/relayd/Dockerfile
+++ b/relay/sources/relayd/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.81.0-bookworm
+FROM rust:1.83.0-bookworm
 LABEL ci=rudder/relay/sources/relayd/Dockerfile
 
 ARG USER_ID=1000
diff --git a/relay/sources/relayd/benches/benches.rs b/relay/sources/relayd/benches/benches.rs
index f415fe3343d..1bb1ee6c185 100644
--- a/relay/sources/relayd/benches/benches.rs
+++ b/relay/sources/relayd/benches/benches.rs
@@ -21,7 +21,6 @@ use rudder_relayd::{
         *,
     },
 };
-use secrecy::SecretString;
 
 fn bench_nodeslist(c: &mut Criterion) {
     c.bench_function("parse nodes list", move |b| {
@@ -98,7 +97,7 @@ fn bench_uncompress_runlog(c: &mut Criterion) {
 pub fn db() -> PgPool {
     let db_config = DatabaseConfig {
         url: "postgres://rudderreports@127.0.0.1/rudder".to_string(),
-        password: SecretString::new("PASSWORD".to_string()),
+        password: Some("PASSWORD".into()),
         max_pool_size: 10,
     };
     pg_pool(&db_config).unwrap()
diff --git a/relay/sources/relayd/src/configuration/main.rs b/relay/sources/relayd/src/configuration/main.rs
index 0756a8900bb..b808c656ab1 100644
--- a/relay/sources/relayd/src/configuration/main.rs
+++ b/relay/sources/relayd/src/configuration/main.rs
@@ -11,12 +11,13 @@ use std::{
     time::Duration,
 };
 
-use anyhow::{anyhow, Context, Error};
+use anyhow::{anyhow, bail, Context, Error};
 use secrecy::SecretString;
 use serde::{
     de::{Deserializer, Error as SerdeError, Unexpected, Visitor},
     Deserialize,
 };
+use serde_inline_default::serde_inline_default;
 use tracing::{debug, warn};
 
 use crate::data::node::NodeId;
@@ -33,7 +34,7 @@ where
 {
     struct V;
 
-    impl<'de2> Visitor<'de2> for V {
+    impl Visitor<'_> for V {
         type Value = Duration;
 
         fn expecting(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
@@ -75,6 +76,8 @@ pub struct Configuration {
     pub shared_files: SharedFiles,
     #[serde(default)]
     pub shared_folder: SharedFolder,
+    #[serde(default)]
+    pub rsync: RsyncConfig,
 }
 
 impl Configuration {
@@ -113,7 +116,28 @@ impl Configuration {
                 .map(|u| u.is_empty())
                 .unwrap_or(true))
         {
-            return Err(anyhow!("missing upstream server configuration"));
+            bail!("missing upstream server configuration");
+        }
+
+        // When upstream is selected, it must have a password
+        if (matches!(
+            self.processing.reporting.output,
+            ReportingOutputSelect::Upstream
+        ) || matches!(
+            self.processing.inventory.output,
+            InventoryOutputSelect::Upstream
+        )) && self.output.upstream.password.is_none()
+        {
+            bail!("missing upstream password configuration");
+        }
+
+        // When database is selected, it must have a password
+        if matches!(
+            self.processing.reporting.output,
+            ReportingOutputSelect::Database
+        ) && self.output.database.password.is_none()
+        {
+            bail!("missing database password configuration");
         }
 
         Ok(self)
@@ -183,88 +207,52 @@ impl FromStr for Configuration {
     }
 }
 
+impl Default for Configuration {
+    fn default() -> Self {
+        toml::from_str::<Self>("").unwrap()
+    }
+}
+
 /// Strategy for default values:
 ///
 /// * `#[serde(default)]` when section is not there
 /// * `#[serde(default)]` or `#[serde(default = ...)]` when a value is missing in a section
 
+#[serde_inline_default]
 #[derive(Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct GeneralConfig {
-    #[serde(default = "GeneralConfig::default_nodes_list_file")]
+    #[serde_inline_default(PathBuf::from("/var/rudder/lib/relay/nodeslist.json"))]
     pub nodes_list_file: NodesListFile,
-    #[serde(default = "GeneralConfig::default_nodes_certs_file")]
+    #[serde_inline_default(PathBuf::from("/var/rudder/lib/ssl/allnodescerts.pem"))]
     // needs to be /var/rudder/lib/ssl/nodescerts.pem on simple relays
     pub nodes_certs_file: NodesCertsFile,
     /// Has priority over node_id_file, use the
     /// `Configuration::node_id()` method to get correct value
     node_id: Option<NodeId>,
     /// File containing the node id
-    #[serde(default = "GeneralConfig::default_node_id_file")]
+    #[serde_inline_default(PathBuf::from("/opt/rudder/etc/uuid.hive"))]
     node_id_file: PathBuf,
-    #[serde(default = "GeneralConfig::default_listen")]
+    #[serde_inline_default("127.0.0.1:3030".to_string())]
     pub listen: String,
     /// None means using the number of available CPUs
     pub core_threads: Option<usize>,
     /// Max number of threads for the blocking operations
     pub blocking_threads: Option<usize>,
     /// Port to use for communication
-    #[serde(default = "GeneralConfig::default_https_port")]
+    #[serde_inline_default(443)]
     pub https_port: u16,
     /// Timeout for idle connections being kept-alive
     #[serde(deserialize_with = "compat_humantime")]
-    #[serde(default = "GeneralConfig::default_https_idle_timeout")]
+    #[serde_inline_default(Duration::from_secs(2))]
     pub https_idle_timeout: Duration,
     /// Which certificate validation model to use
-    #[serde(default = "GeneralConfig::default_peer_authentication")]
+    #[serde_inline_default(PeerAuthentication::SystemRootCerts)]
     peer_authentication: PeerAuthentication,
 }
 
-impl GeneralConfig {
-    fn default_nodes_list_file() -> PathBuf {
-        PathBuf::from("/var/rudder/lib/relay/nodeslist.json")
-    }
-
-    fn default_nodes_certs_file() -> PathBuf {
-        // config for root servers
-        PathBuf::from("/var/rudder/lib/ssl/allnodescerts.pem")
-    }
-
-    fn default_node_id_file() -> PathBuf {
-        PathBuf::from("/opt/rudder/etc/uuid.hive")
-    }
-
-    fn default_listen() -> String {
-        "127.0.0.1:3030".to_string()
-    }
-
-    fn default_https_port() -> u16 {
-        443
-    }
-
-    fn default_https_idle_timeout() -> Duration {
-        Duration::from_secs(2)
-    }
-
-    fn default_peer_authentication() -> PeerAuthentication {
-        // For compatibility
-        PeerAuthentication::SystemRootCerts
-    }
-}
-
 impl Default for GeneralConfig {
     fn default() -> Self {
-        Self {
-            nodes_list_file: Self::default_nodes_list_file(),
-            nodes_certs_file: Self::default_nodes_certs_file(),
-            node_id_file: Self::default_node_id_file(),
-            node_id: None,
-            listen: Self::default_listen(),
-            core_threads: None,
-            blocking_threads: None,
-            https_port: Self::default_https_port(),
-            https_idle_timeout: Self::default_https_idle_timeout(),
-            peer_authentication: Self::default_peer_authentication(),
-        }
+        toml::from_str::<Self>("").unwrap()
     }
 }
 
@@ -276,62 +264,36 @@ pub enum PeerAuthentication {
     DangerousNone,
 }
 
+#[serde_inline_default]
 #[derive(Deserialize, Debug, PartialEq, Eq, Copy, Clone)]
 pub struct CatchupConfig {
     #[serde(deserialize_with = "compat_humantime")]
-    #[serde(default = "CatchupConfig::default_catchup_frequency")]
+    #[serde_inline_default(Duration::from_secs(10))]
     pub frequency: Duration,
-    #[serde(default = "CatchupConfig::default_catchup_limit")]
+    #[serde_inline_default(50)]
     pub limit: u64,
 }
 
-impl CatchupConfig {
-    fn default_catchup_frequency() -> Duration {
-        Duration::from_secs(10)
-    }
-
-    fn default_catchup_limit() -> u64 {
-        50
-    }
-}
-
 impl Default for CatchupConfig {
     fn default() -> Self {
-        Self {
-            frequency: Self::default_catchup_frequency(),
-            limit: Self::default_catchup_limit(),
-        }
+        toml::from_str::<Self>("").unwrap()
     }
 }
 
+#[serde_inline_default]
 #[derive(Deserialize, Debug, PartialEq, Eq, Copy, Clone)]
 pub struct CleanupConfig {
     #[serde(deserialize_with = "compat_humantime")]
-    #[serde(default = "CleanupConfig::default_cleanup_frequency")]
+    #[serde_inline_default(Duration::from_secs(3600))]
     pub frequency: Duration,
     #[serde(deserialize_with = "compat_humantime")]
-    #[serde(default = "CleanupConfig::default_cleanup_retention")]
+    #[serde_inline_default(Duration::from_secs(3600 * 24 * 7))]
     pub retention: Duration,
 }
 
-impl CleanupConfig {
-    /// 1 hour
-    fn default_cleanup_frequency() -> Duration {
-        Duration::from_secs(3600)
-    }
-
-    /// 1 week
-    fn default_cleanup_retention() -> Duration {
-        Duration::from_secs(3600 * 24 * 7)
-    }
-}
-
 impl Default for CleanupConfig {
     fn default() -> Self {
-        Self {
-            frequency: Self::default_cleanup_frequency(),
-            retention: Self::default_cleanup_retention(),
-        }
+        toml::from_str::<Self>("").unwrap()
     }
 }
 
@@ -343,9 +305,10 @@ pub struct ProcessingConfig {
     pub reporting: ReportingConfig,
 }
 
+#[serde_inline_default]
 #[derive(Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct InventoryConfig {
-    #[serde(default = "InventoryConfig::default_directory")]
+    #[serde_inline_default(PathBuf::from("/var/rudder/inventories/"))]
     pub directory: BaseDirectory,
     #[serde(default)]
     pub output: InventoryOutputSelect,
@@ -355,20 +318,9 @@ pub struct InventoryConfig {
     pub cleanup: CleanupConfig,
 }
 
-impl InventoryConfig {
-    fn default_directory() -> PathBuf {
-        PathBuf::from("/var/rudder/inventories/")
-    }
-}
-
 impl Default for InventoryConfig {
     fn default() -> Self {
-        Self {
-            directory: Self::default_directory(),
-            output: InventoryOutputSelect::default(),
-            catchup: Default::default(),
-            cleanup: Default::default(),
-        }
+        toml::from_str::<Self>("").unwrap()
     }
 }
 
@@ -385,9 +337,10 @@ impl Default for InventoryOutputSelect {
     }
 }
 
+#[serde_inline_default]
 #[derive(Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct ReportingConfig {
-    #[serde(default = "ReportingConfig::default_directory")]
+    #[serde_inline_default(PathBuf::from("/var/rudder/reports/"))]
     pub directory: BaseDirectory,
     #[serde(default)]
     pub output: ReportingOutputSelect,
@@ -399,21 +352,9 @@ pub struct ReportingConfig {
     pub skip_event_types: HashSet<String>,
 }
 
-impl ReportingConfig {
-    fn default_directory() -> PathBuf {
-        PathBuf::from("/var/rudder/reports/")
-    }
-}
-
 impl Default for ReportingConfig {
     fn default() -> Self {
-        Self {
-            directory: Self::default_directory(),
-            output: ReportingOutputSelect::default(),
-            catchup: Default::default(),
-            cleanup: Default::default(),
-            skip_event_types: Default::default(),
-        }
+        toml::from_str::<Self>("").unwrap()
     }
 }
 
@@ -447,103 +388,63 @@ impl OutputSelect for InventoryOutputSelect {
     }
 }
 
+#[serde_inline_default]
 #[derive(Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct RemoteRun {
     /// Enable remote-run feature
-    #[serde(default = "RemoteRun::default_enabled")]
+    #[serde_inline_default(true)]
     pub enabled: bool,
-    #[serde(default = "RemoteRun::default_command")]
+    #[serde_inline_default(PathBuf::from("/opt/rudder/bin/rudder"))]
     pub command: PathBuf,
-    #[serde(default = "RemoteRun::default_use_sudo")]
+    #[serde_inline_default(true)]
     pub use_sudo: bool,
 }
 
-impl RemoteRun {
-    fn default_command() -> PathBuf {
-        PathBuf::from("/opt/rudder/bin/rudder")
-    }
-
-    fn default_use_sudo() -> bool {
-        true
-    }
-
-    fn default_enabled() -> bool {
-        true
-    }
-}
-
 impl Default for RemoteRun {
     fn default() -> Self {
-        Self {
-            enabled: Self::default_enabled(),
-            command: Self::default_command(),
-            use_sudo: Self::default_use_sudo(),
-        }
+        toml::from_str::<Self>("").unwrap()
     }
 }
 
+#[serde_inline_default]
 #[derive(Deserialize, Debug, PartialEq, Eq, Copy, Clone)]
 pub struct SharedFilesCleanupConfig {
     #[serde(deserialize_with = "compat_humantime")]
-    #[serde(default = "CleanupConfig::default_cleanup_frequency")]
+    #[serde_inline_default(Duration::from_secs(600))]
     pub frequency: Duration,
 }
 
-impl SharedFilesCleanupConfig {
-    /// 10 minutes
-    fn default_cleanup_frequency() -> Duration {
-        Duration::from_secs(600)
-    }
-}
-
 impl Default for SharedFilesCleanupConfig {
     fn default() -> Self {
-        Self {
-            frequency: Self::default_cleanup_frequency(),
-        }
+        toml::from_str::<Self>("").unwrap()
     }
 }
 
+#[serde_inline_default]
 #[derive(Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct SharedFiles {
-    #[serde(default = "SharedFiles::default_path")]
+    #[serde_inline_default(PathBuf::from("/var/rudder/shared-files/"))]
     pub path: PathBuf,
     #[serde(default)]
     pub cleanup: SharedFilesCleanupConfig,
 }
 
-impl SharedFiles {
-    fn default_path() -> PathBuf {
-        PathBuf::from("/var/rudder/shared-files/")
-    }
-}
-
 impl Default for SharedFiles {
     fn default() -> Self {
-        Self {
-            path: Self::default_path(),
-            cleanup: SharedFilesCleanupConfig::default(),
-        }
+        toml::from_str::<Self>("").unwrap()
     }
 }
 
+#[serde_inline_default]
 #[derive(Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct SharedFolder {
-    #[serde(default = "SharedFolder::default_path")]
+    #[serde_inline_default(PathBuf::from("/var/rudder/configuration-repository/shared-files/"))]
     pub path: PathBuf,
 }
 
-impl SharedFolder {
-    fn default_path() -> PathBuf {
-        PathBuf::from("/var/rudder/configuration-repository/shared-files/")
-    }
-}
-
 impl Default for SharedFolder {
     fn default() -> Self {
-        Self {
-            path: Self::default_path(),
-        }
+        toml::from_str::<Self>("").unwrap()
     }
 }
 
@@ -555,14 +456,15 @@ pub struct OutputConfig {
     pub upstream: UpstreamConfig,
 }
 
+#[serde_inline_default]
 #[derive(Deserialize, Debug, Clone)]
 pub struct DatabaseConfig {
     /// URL without the password
-    #[serde(default = "DatabaseConfig::default_url")]
+    #[serde_inline_default("postgres://rudder@127.0.0.1/rudder".to_string())]
     pub url: String,
-    /// When the section is there, password is mandatory
-    pub password: SecretString,
-    #[serde(default = "DatabaseConfig::default_max_pool_size")]
+    #[serde(default)]
+    pub password: Option<SecretString>,
+    #[serde_inline_default(10)]
     pub max_pool_size: u32,
 }
 
@@ -574,26 +476,13 @@ impl PartialEq for DatabaseConfig {
 
 impl Eq for DatabaseConfig {}
 
-impl DatabaseConfig {
-    fn default_url() -> String {
-        "postgres://rudder@127.0.0.1/rudder".to_string()
-    }
-
-    fn default_max_pool_size() -> u32 {
-        10
-    }
-}
-
 impl Default for DatabaseConfig {
     fn default() -> Self {
-        Self {
-            url: Self::default_url(),
-            password: SecretString::new("".to_string()),
-            max_pool_size: Self::default_max_pool_size(),
-        }
+        toml::from_str::<Self>("").unwrap()
     }
 }
 
+#[serde_inline_default]
 #[derive(Deserialize, Debug, Clone)]
 pub struct UpstreamConfig {
     /// DEPRECATED: use host and global.https_port
@@ -602,25 +491,25 @@ pub struct UpstreamConfig {
     /// When the section is there, host is mandatory
     #[serde(default)]
     host: String,
-    #[serde(default = "UpstreamConfig::default_user")]
+    #[serde_inline_default("rudder".to_string())]
     pub user: String,
-    /// When the section is there, password is mandatory
-    pub password: SecretString,
+    #[serde(default)]
+    pub password: Option<SecretString>,
     /// Default password, to be used for new inventories
-    #[serde(default = "UpstreamConfig::default_default_password")]
+    #[serde_inline_default(SecretString::new("rudder".into()))]
     pub default_password: SecretString,
-    #[serde(default = "UpstreamConfig::default_verify_certificates")]
     /// Allows to completely disable certificate validation.
     ///
     /// If true, https is required for all connections
     ///
     /// This preserves compatibility with 6.X configs
     /// DEPRECATED: replaced by certificate_verification_mode = DangerousNone
+    #[serde_inline_default(true)]
     pub verify_certificates: bool,
     /// Allows specifying the root certificate path
     /// Used for our Rudder PKI
     /// Not used if the verification model is not `Rudder`.
-    #[serde(default = "UpstreamConfig::default_server_certificate_file")]
+    #[serde_inline_default(PathBuf::from("/var/rudder/lib/ssl/policy_server.pem"))]
     pub server_certificate_file: PathBuf,
     // TODO timeout?
 }
@@ -637,35 +526,27 @@ impl PartialEq for UpstreamConfig {
 
 impl Eq for UpstreamConfig {}
 
-impl UpstreamConfig {
-    fn default_user() -> String {
-        "rudder".to_string()
-    }
-
-    fn default_verify_certificates() -> bool {
-        true
+impl Default for UpstreamConfig {
+    fn default() -> Self {
+        toml::from_str::<Self>("").unwrap()
     }
+}
 
-    fn default_default_password() -> SecretString {
-        SecretString::new("rudder".into())
-    }
+#[serde_inline_default]
+#[derive(Deserialize, Debug, PartialEq, Eq, Clone)]
+pub struct RsyncConfig {
+    // where to listen on
+    #[serde_inline_default("localhost:5310".into())]
+    listen: String,
 
-    fn default_server_certificate_file() -> PathBuf {
-        PathBuf::from("/var/rudder/lib/ssl/policy_server.pem")
-    }
+    // False to allow non authenticated clients
+    #[serde_inline_default(true)]
+    authentication: bool,
 }
 
-impl Default for UpstreamConfig {
+impl Default for RsyncConfig {
     fn default() -> Self {
-        Self {
-            url: Default::default(),
-            host: Default::default(),
-            user: Self::default_user(),
-            password: SecretString::new("".to_string()),
-            default_password: SecretString::new("".to_string()),
-            verify_certificates: Self::default_verify_certificates(),
-            server_certificate_file: Self::default_server_certificate_file(),
-        }
+        toml::from_str::<Self>("").unwrap()
     }
 }
 
@@ -753,14 +634,14 @@ mod tests {
                     url: None,
                     host: "".to_string(),
                     user: "rudder".to_string(),
-                    password: SecretString::new("".to_string()),
-                    default_password: SecretString::new("".to_string()),
+                    password: None,
+                    default_password: "".into(),
                     verify_certificates: true,
                     server_certificate_file: PathBuf::from("/var/rudder/lib/ssl/policy_server.pem"),
                 },
                 database: DatabaseConfig {
                     url: "postgres://rudder@127.0.0.1/rudder".to_string(),
-                    password: SecretString::new("".to_string()),
+                    password: None,
                     max_pool_size: 10,
                 },
             },
@@ -778,6 +659,10 @@ mod tests {
             shared_folder: SharedFolder {
                 path: PathBuf::from("/var/rudder/configuration-repository/shared-files/"),
             },
+            rsync: RsyncConfig {
+                listen: "localhost:5310".to_string(),
+                authentication: true,
+            },
         };
 
         assert_eq!(config, reference);
@@ -787,12 +672,15 @@ mod tests {
 
     #[test]
     fn it_fails_when_password_is_missing() {
-        let default = "[general]\n\
+        let missing_password = "[general]\n\
                        node_id = \"root\"\n\
+                       [processing.reporting]\n\
+                       directory = \"target/tmp/reporting/\"\n\
+                       output = \"database\"\n\
                        [output.database]\n";
-        let with_password = format!("{}\npassword = \"test\"", default);
-        assert!(default.parse::<Configuration>().is_err());
-        assert!(with_password.parse::<Configuration>().is_ok());
+        let conf = missing_password.parse::<Configuration>();
+        assert!(conf.is_ok());
+        assert!(conf.unwrap().validate().is_err());
     }
 
     #[test]
@@ -852,8 +740,8 @@ mod tests {
                     url: None,
                     host: "rudder.example.com".to_string(),
                     user: "rudder".to_string(),
-                    password: SecretString::new("password".to_string()),
-                    default_password: SecretString::new("rudder".to_string()),
+                    password: Some("password".into()),
+                    default_password: "rudder".into(),
                     verify_certificates: true,
                     server_certificate_file: PathBuf::from(
                         "tests/files/keys/e745a140-40bc-4b86-b6dc-084488fc906b.cert",
@@ -861,7 +749,7 @@ mod tests {
                 },
                 database: DatabaseConfig {
                     url: "postgres://rudderreports@postgres/rudder".to_string(),
-                    password: SecretString::new("PASSWORD".to_string()),
+                    password: Some("PASSWORD".into()),
                     max_pool_size: 5,
                 },
             },
@@ -879,6 +767,10 @@ mod tests {
             shared_folder: SharedFolder {
                 path: PathBuf::from("tests/api_shared_folder"),
             },
+            rsync: RsyncConfig {
+                listen: "localhost:1234".to_string(),
+                authentication: false,
+            },
         };
         assert_eq!(config, reference);
         assert_eq!(config.node_id().unwrap(), "root".to_string());
diff --git a/relay/sources/relayd/src/output/database.rs b/relay/sources/relayd/src/output/database.rs
index 414b802b3c0..ec1a5e9b3f4 100644
--- a/relay/sources/relayd/src/output/database.rs
+++ b/relay/sources/relayd/src/output/database.rs
@@ -68,7 +68,13 @@ pub fn pg_pool(configuration: &DatabaseConfig) -> Result<PgPool, Error> {
             "?"
         },
         percent_encoding::percent_encode(
-            configuration.password.expose_secret().as_bytes(),
+            // database is selected at this point, so validation must have detected None password
+            configuration
+                .password
+                .as_ref()
+                .unwrap()
+                .expose_secret()
+                .as_bytes(),
             NON_ALPHANUMERIC
         )
     ));
@@ -171,7 +177,6 @@ pub fn insert_runlog(pool: &PgPool, runlog: &RunLog) -> Result<RunlogInsertion,
 #[cfg(test)]
 mod tests {
     use diesel::dsl::count;
-    use secrecy::SecretString;
 
     use super::*;
     use crate::{
@@ -182,7 +187,7 @@ mod tests {
     pub fn db() -> PgPool {
         let db_config = DatabaseConfig {
             url: "postgres://rudderreports:@postgres/rudder".to_string(),
-            password: SecretString::new("PASSWORD".to_string()),
+            password: Some("PASSWORD".into()),
             max_pool_size: 5,
         };
         pg_pool(&db_config).unwrap()
diff --git a/relay/sources/relayd/src/output/upstream.rs b/relay/sources/relayd/src/output/upstream.rs
index 3c3daf27e15..b0ca323e8a6 100644
--- a/relay/sources/relayd/src/output/upstream.rs
+++ b/relay/sources/relayd/src/output/upstream.rs
@@ -15,7 +15,15 @@ pub async fn send_report(job_config: Arc<JobConfig>, path: PathBuf) -> Result<()
         job_config.clone(),
         "reports",
         path,
-        job_config.cfg.output.upstream.password.clone(),
+        // upstream is selected at this point, so validation must have detected None password
+        job_config
+            .cfg
+            .output
+            .upstream
+            .password
+            .as_ref()
+            .unwrap()
+            .clone(),
     )
     .await
 }
@@ -35,7 +43,15 @@ pub async fn send_inventory(
         path,
         match inventory_type {
             InventoryType::New => job_config.cfg.output.upstream.default_password.clone(),
-            InventoryType::Update => job_config.cfg.output.upstream.password.clone(),
+            // upstream is selected at this point, so validation must have detected None password
+            InventoryType::Update => job_config
+                .cfg
+                .output
+                .upstream
+                .password
+                .as_ref()
+                .unwrap()
+                .clone(),
         },
     )
     .await
diff --git a/relay/sources/relayd/tests/files/config/main.conf b/relay/sources/relayd/tests/files/config/main.conf
index 145e3dac963..0ff537adfbf 100644
--- a/relay/sources/relayd/tests/files/config/main.conf
+++ b/relay/sources/relayd/tests/files/config/main.conf
@@ -65,3 +65,6 @@ frequency = "43s"
 [shared_folder]
 path = "tests/api_shared_folder"
 
+[rsync]
+listen = "localhost:1234"
+authentication = false
\ No newline at end of file
diff --git a/relay/sources/rudder-package/Cargo.toml b/relay/sources/rudder-package/Cargo.toml
index f413922ea1d..fb7b0b3e414 100644
--- a/relay/sources/rudder-package/Cargo.toml
+++ b/relay/sources/rudder-package/Cargo.toml
@@ -18,7 +18,7 @@ clap = { version = "4.5.11", features = ["derive"] }
 clap_complete = "4.5.10"
 chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "serde"] }
 lzma-rs = "0.3.0"
-quick-xml = "0.36.0"
+quick-xml = "0.37.0"
 reqwest = { version = "0.12", default-features = false, features = ["blocking", "native-tls"] }
 regex = "1.10.2"
 secrecy = { version = "0.10.3", features = ["serde"] }
@@ -31,7 +31,7 @@ tempfile = "3.8.0"
 # Compile dev and release with trace logs enabled
 tracing = { version = "0.1", features = ["max_level_trace", "release_max_level_trace"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
-which = "6.0.1"
+which = "7"
 flate2 = "1.0.28"
 cli-table = "0.4.7"
 spinners = "4.1.1"
@@ -43,7 +43,7 @@ clap = { version = "4.5.11", features = ["derive"] }
 clap_complete = "4.5.10"
 
 [dev-dependencies]
-rstest = "0.22.0"
+rstest = "0.23.0"
 assert-json-diff = "2.0.2"
 dir-diff = "0.3.2"
 pretty_assertions = "1.4.0"
diff --git a/relay/sources/rudder-package/Dockerfile b/relay/sources/rudder-package/Dockerfile
index a2cfabbbae8..f1efa709eac 100644
--- a/relay/sources/rudder-package/Dockerfile
+++ b/relay/sources/rudder-package/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.81.0-bookworm
+FROM rust:1.83.0-bookworm
 LABEL ci=rudder/relay/sources/rudder-package/Dockerfile
 
 ARG USER_ID=1000
diff --git a/relay/sources/rudder-package/src/archive.rs b/relay/sources/rudder-package/src/archive.rs
index da03236e6d4..df6049b37a6 100644
--- a/relay/sources/rudder-package/src/archive.rs
+++ b/relay/sources/rudder-package/src/archive.rs
@@ -89,7 +89,7 @@ impl Rpkg {
         if txz_name == PACKAGE_SCRIPTS_ARCHIVE {
             return PathBuf::from(PACKAGES_FOLDER).join(self.metadata.name.clone());
         }
-        return PathBuf::from(self.metadata.content.get(txz_name).unwrap().to_string());
+        PathBuf::from(self.metadata.content.get(txz_name).unwrap().to_string())
     }
 
     fn get_archive_installed_files(&self) -> Result<Vec<String>> {
diff --git a/relay/sources/rudder-package/tools/rudder-pkg.conf b/relay/sources/rudder-package/tools/rudder-pkg.conf
index 7d9584a8a90..ffc91dcc17a 100644
--- a/relay/sources/rudder-package/tools/rudder-pkg.conf
+++ b/relay/sources/rudder-package/tools/rudder-pkg.conf
@@ -1,7 +1,9 @@
 [Rudder]
-url = https://download.rudder.io/plugins
-username = username
-password = password
-proxy_url = 
-proxy_user = 
-proxy_password = 
+# The default values are commented below
+# 
+#url = https://download.rudder.io/plugins
+#username =
+#password =
+#proxy_url = 
+#proxy_user = 
+#proxy_password = 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 1de01fa45c4..0193dee3606 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.81.0"
+channel = "1.83.0"
diff --git a/rust.makefile b/rust.makefile
index 54f70a1ce46..fa3240ca601 100644
--- a/rust.makefile
+++ b/rust.makefile
@@ -18,7 +18,7 @@ version:
 # https://matklad.github.io/2021/09/04/fast-rust-builds.html#ci-workflow
 build: CARGO_INCREMENTAL=0
 build: version
-	cargo install --locked cargo-auditable@0.6.1
+	cargo install --locked cargo-auditable@0.6.4
 	cargo auditable build --features=${CARGO_FEATURES} --release --locked --jobs 2
 
 dev-doc:
diff --git a/sbom/Dockerfile b/sbom/Dockerfile
index 87e734ff85f..86e4060f0fd 100644
--- a/sbom/Dockerfile
+++ b/sbom/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.81.0-bookworm
+FROM rust:1.83.0-bookworm
 LABEL ci=rudder/policies/Dockerfile
 
 ARG USER_ID=1000
diff --git a/webapp/sources/api-doc/openapi.src.yml b/webapp/sources/api-doc/openapi.src.yml
index e3f23f9b480..d7d13b5c677 100644
--- a/webapp/sources/api-doc/openapi.src.yml
+++ b/webapp/sources/api-doc/openapi.src.yml
@@ -7,7 +7,7 @@ info:
   # Will be substituted by content of the file at build
   description: "introduction.md"
   x-logo:
-    url: "assets/rudder.svg"
+    url: "assets/rudder-logo-rect-black.svg"
   contact:
     email: dev@rudder.io
     name: Rudder developers
diff --git a/webapp/sources/ldap-inventory/inventory-api/pom.xml b/webapp/sources/ldap-inventory/inventory-api/pom.xml
index dfe0c335a74..29619f6b1d9 100644
--- a/webapp/sources/ldap-inventory/inventory-api/pom.xml
+++ b/webapp/sources/ldap-inventory/inventory-api/pom.xml
@@ -34,7 +34,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation.inventory</groupId>
     <artifactId>inventory-parent</artifactId>
-    <version>8.2.4-SNAPSHOT</version>
+    <version>8.3.0~alpha1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>inventory-api</artifactId>
diff --git a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/AgentTypes.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/AgentTypes.scala
index 3ee4c45b9f0..9ecd97672bb 100644
--- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/AgentTypes.scala
+++ b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/AgentTypes.scala
@@ -37,10 +37,8 @@
 
 package com.normation.inventory.domain
 
-import com.normation.errors.*
 import enumeratum.*
-import zio.*
-import zio.syntax.*
+import zio.json.*
 
 /**
  * The enumeration holding the values for the agent
@@ -48,8 +46,8 @@ import zio.syntax.*
 sealed trait AgentType extends EnumEntry {
   /*
    * this is the default agent identifier, the main name, used in:
-   * - in hooks: RUDDER_AGENT_TYPE: dsc (cfengine-community, cfengine-nova)
-   * - in technique metadata: <AGENT type="dsc">...</AGENT> (cfengine-community, cfengine-nova)
+   * - in hooks: RUDDER_AGENT_TYPE: dsc (cfengine-community)
+   * - in technique metadata: <AGENT type="dsc">...</AGENT> (cfengine-community)
    * - in serialisation
    */
   def id: String
@@ -59,7 +57,7 @@ sealed trait AgentType extends EnumEntry {
 
   /*
    * This is the old, short name, which used to be used in LDAP "agentName"
-   * attribute and in (very old) fusion inventories (i.e: community, nova).
+   * attribute and in (very old) fusion inventories (i.e: community, ...).
    */
   def oldShortName: String
 
@@ -69,14 +67,14 @@ sealed trait AgentType extends EnumEntry {
   def displayName: String
 
   /*
-   * - for policy generation: /var/rudder/share/xxxx/rules/dsc (/rules/cfengine-community, /rules/cfengine-nova)
+   * - for policy generation: /var/rudder/share/xxxx/rules/dsc (/rules/cfengine-community, ...)
    */
   def toRulesPath: String
 
   /*
    * This is the list of <AGENTNAME> to look for in inventory and in LDAP
    * to choose the agent type.
-   * - in inventory file: <AGENTNAME>dsc</AGENTNAME> ("Community" => "cfengine-community", "Nova" => "cfengine-nova")
+   * - in inventory file: <AGENTNAME>dsc</AGENTNAME> ("Community" => "cfengine-community", ...)
    * - in LDAP agentName attribute
    * This is a set, because we want to accept renaming along the way.
    * Everything must be lower case in it.
@@ -86,7 +84,7 @@ sealed trait AgentType extends EnumEntry {
 
   /*
    *  the name to look for in the inventory to know the agent version (when not reported in <AGENT><VERSION>)
-   *  - for inventory software name (i.e package name in software): rudder-agent-dsc ("rudder-agent", "cfengine nova")
+   *  - for inventory software name (i.e package name in software): rudder-agent-dsc ("rudder-agent", ...)
    */
   def inventorySoftwareName: String
   // and a transformation function from reported software version name to agent version name, internal use only
@@ -97,17 +95,8 @@ sealed trait AgentType extends EnumEntry {
 }
 
 object AgentType extends Enum[AgentType] {
-
-  case object CfeEnterprise extends AgentType {
-    override def id           = "cfengine-nova"
-    override def oldShortName = "nova"
-    override def displayName  = "CFEngine Enterprise"
-    override def toRulesPath  = "/cfengine-nova"
-    override def inventoryAgentNames: Set[String] = Set("cfengine-nova", "nova")
-    override val inventorySoftwareName = "cfengine nova"
-    override def toAgentVersionName(softwareVersionName: String): String = s"cfe-${softwareVersionName}"
-    override val defaultPolicyExtension = ".cf"
-  }
+  implicit val codecAgentType: JsonCodec[AgentType] =
+    JsonCodec.string.transformOrFail[AgentType](s => AgentType.fromValue(s).left.map(_.fullMsg), _.id)
 
   case object CfeCommunity extends AgentType {
     override def id           = "cfengine-community"
@@ -152,6 +141,10 @@ object AgentType extends Enum[AgentType] {
  */
 final case class AgentVersion(value: String) extends AnyVal
 
+object AgentVersion {
+  implicit val agentVersionCodec: JsonCodec[AgentVersion] = JsonCodec[String].transform(AgentVersion.apply, _.value)
+}
+
 final case class AgentInfo(
     agentType:     AgentType,
     // for now, the version must be an option, because we don't add it in the inventory
@@ -159,108 +152,12 @@ final case class AgentInfo(
     version:       Option[AgentVersion],
     securityToken: SecurityToken,
     // agent capabilities are lower case string used as tags giving information about what agent can do
-    capabilities:  Set[AgentCapability]
+    capabilities:  Set[AgentCapability] = Set() // default value is needed for JSON decoding when "capabilities" is missing
 )
 
-object AgentInfoSerialisation {
-  import net.liftweb.json.*
-  import net.liftweb.json.JsonDSL.*
-
-  implicit class ToJson(val agent: AgentInfo) extends AnyVal {
-
-    def toJsonString: String = {
-      compactRender(
-        ("agentType"       -> agent.agentType.id)
-        ~ ("version"       -> agent.version.map(_.value))
-        ~ ("securityToken" ->
-        ("value"           -> agent.securityToken.key)
-        ~ ("type"          -> SecurityToken.kind(agent.securityToken)))
-        ~ ("capabilities"  -> JArray(agent.capabilities.map(_.value).toList.sorted.map(JString(_))))
-      )
-    }
-  }
-
-  def parseSecurityToken(
-      agentType:    AgentType,
-      tokenJson:    JValue,
-      tokenDefault: Option[String]
-  ): Either[InventoryError.SecurityToken, SecurityToken] = {
-    import net.liftweb.json.compactRender
-
-    def extractValue(tokenJson: JValue): Option[String] = {
-      tokenJson \ "value" match {
-        case JString(s) => Some(s)
-        case _          => None
-      }
-    }
-    def error(kind: String) =
-      s"""Bad value defined for security token. Expected format is: "securityToken: {"type":"${kind}","value":"...."} """
-
-    tokenJson \ "type" match {
-      case JString(Certificate.kind) =>
-        extractValue(tokenJson) match {
-          case Some(token) => Right(Certificate(token))
-          case None        => Left(InventoryError.SecurityToken(error(Certificate.kind)))
-        }
-      case JString(PublicKey.kind)   =>
-        Left(
-          InventoryError.SecurityToken(
-            "since Rudder 7.0, public key are not supported anymore for agent authentication: please use a certificate"
-          )
-        )
-      case invalidJson               =>
-        tokenDefault match {
-          case Some(default) => Right(PublicKey(default))
-          case None          =>
-            val error = invalidJson match {
-              case JNothing => "no value define for security token"
-              case x        => compactRender(invalidJson)
-            }
-            Left(InventoryError.SecurityToken(s"Invalid value for security token: ${error}, and no public key were stored"))
-        }
-    }
-  }
-
-  /*
-   * Retrieve the agent information from JSON. "agentType" is mandatory,
-   * but version isn't, and even if we don't parse it correctly, we
-   * successfully return an agent (without version).
-   */
-  def parseJson(s: String, optToken: Option[String]): IOResult[AgentInfo] = {
-    for {
-      json         <- ZIO.attempt(parse(s)) mapError { ex =>
-                        InventoryError.Deserialisation(s"Can not parse agent info: ${ex.getMessage}", ex)
-                      }
-      agentType    <- (json \ "agentType") match {
-                        case JString(tpe) => AgentType.fromValue(tpe).toIO
-                        case JNothing     => InventoryError.SecurityToken("No value defined for security token").fail
-                        case invalidJson  =>
-                          InventoryError
-                            .AgentType(
-                              s"Error when trying to parse string as JSON Agent Info (missing required field 'agentType'): ${compactRender(invalidJson)}"
-                            )
-                            .fail
-                      }
-      agentVersion  = json \ "version" match {
-                        case JString(version) => Some(AgentVersion(version))
-                        case _                => None
-                      }
-      token        <- (json \ "securityToken" match {
-                        case JObject(json) => parseSecurityToken(agentType, json, optToken)
-                        case _             => parseSecurityToken(agentType, JNothing, optToken)
-                      }).toIO
-      capabilities <- IOResult.attempt(json \ "capabilities" match {
-                        case JArray(capa) =>
-                          capa.flatMap(c => {
-                            c match {
-                              case JString(s) => Some(AgentCapability(s))
-                              case _          => None
-                            }
-                          })
-                        case _            => Nil
-                      })
-    } yield {
-      AgentInfo(agentType, agentVersion, token, capabilities.toSet)
-    }
-  }
+object AgentInfo {
+  // make capabilities sorted when written
+  implicit val encoderSetAgentCapability: JsonEncoder[Set[AgentCapability]] =
+    JsonEncoder.list[AgentCapability].contramap(_.toList.sortBy(_.value))
+  implicit val codecAgentInfo:            JsonCodec[AgentInfo]              = DeriveJsonCodec.gen
 }
diff --git a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/DataTypes.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/DataTypes.scala
index 71034b1b8d9..432f2b26bd5 100644
--- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/DataTypes.scala
+++ b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/DataTypes.scala
@@ -42,12 +42,11 @@ import com.normation.errors.*
 import com.normation.inventory.domain.InventoryError.CryptoEx
 import com.normation.inventory.services.provisioning.ParsedSecurityToken
 import java.io.StringReader
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo
 import org.bouncycastle.cert.X509CertificateHolder
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter
 import org.bouncycastle.openssl.PEMParser
-import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter
 import zio.*
+import zio.json.*
 import zio.syntax.*
 
 /**
@@ -66,25 +65,32 @@ final case class Manufacturer(name: String) extends AnyVal
  */
 final case class SoftwareEditor(val name: String) extends AnyVal
 
-sealed trait SecurityToken {
-  def key: String
+// this class is used to decode JSON "securityToken" before key validation and typing
+// (the alias is because at some point, it was named "token" in NodeFact)
+final case class JsonDecSecurityToken(@jsonAliases("token") value: String)
+final case class JsonEncSecurityToken(@jsonField("type") @jsonAliases("kind") kind: String, value: String)
+
+sealed abstract class SecurityToken(val kind: String) {
+  def key:   String
+  def value: String
 }
 
 object SecurityToken {
+  implicit val securityTokenEncoder: JsonEncoder[SecurityToken] =
+    DeriveJsonEncoder.gen[JsonEncSecurityToken].contramap(t => JsonEncSecurityToken(t.kind, t.value))
+  implicit val securityTokenDecoder: JsonDecoder[SecurityToken] =
+    DeriveJsonDecoder.gen[JsonDecSecurityToken].map(t => Certificate(t.value))
+
   def kind(token: SecurityToken): String = {
-    token match {
-      case _: PublicKey   => PublicKey.kind
-      case _: Certificate => Certificate.kind
-    }
+    token.kind
   }
 
   def token(kind: String, value: String): Either[String, SecurityToken] = {
     kind match {
-      case PublicKey.kind   => Right(PublicKey(value))
       case Certificate.kind => Right(Certificate(value))
       case _                =>
         Left(
-          s"Value '${kind}' is not recognized as a valid security token, expecting '${PublicKey.kind}' or '${Certificate.kind}'"
+          s"Value '${kind}' is not recognized as a valid security token, expecting '${Certificate.kind}'"
         )
     }
   }
@@ -139,16 +145,22 @@ object SecurityToken {
           .readObject()
       )
       .left
-      .map(ex => InventoryError.CryptoEx(s"Key '${key}' cannot be parsed as a public key", ex.cause): InventoryError)
+      .map(ex => InventoryError.CryptoEx(s"Key '${key}' cannot be parsed as a PEM certificate", ex.cause): InventoryError)
       .flatMap { obj =>
         obj match {
-          case _: SubjectPublicKeyInfo  => Right(PublicKey(key))
           case _: X509CertificateHolder => Right(Certificate(key))
-          case _ =>
+          case null =>
+            Left(
+              InventoryError
+                .Crypto(
+                  s"Provided agent key cannot be parsed a certificate. Please use a certificate in PEM format"
+                )
+            )
+          case _    =>
             Left(
               InventoryError
                 .Crypto(
-                  s"Provided agent key is in an unknown format. Please use a certificate or public key in PEM format"
+                  s"Provided agent key is in an unknown format. Please use a certificate in PEM format"
                 )
             )
         }
@@ -156,42 +168,11 @@ object SecurityToken {
   }
 }
 
-object PublicKey   {
-  val kind = "publicKey"
-}
 object Certificate {
   val kind = "certificate"
 }
 
-/**
- * A simple class to denote a software cryptographic public key
- */
-final case class PublicKey(value: String) extends SecurityToken {
-
-  // Value of the key may be stored (with old fusion inventory version) as one line and without rsa header and footer, we should add them if missing and format the key
-  val key:       String                            = {
-    if (value.startsWith("-----BEGIN RSA PUBLIC KEY-----")) {
-      value
-    } else {
-      s"""-----BEGIN RSA PUBLIC KEY-----
-         |${value.grouped(80).mkString("\n")}
-         |-----END RSA PUBLIC KEY-----""".stripMargin
-    }
-  }
-  def publicKey: IOResult[java.security.PublicKey] = {
-    ZIO.attempt {
-      (new PEMParser(new StringReader(key))).readObject()
-    }.mapError(ex => InventoryError.CryptoEx(s"Key '${key}' cannot be parsed as a public key", ex)).flatMap { obj =>
-      obj match {
-        case a: SubjectPublicKeyInfo =>
-          (new JcaPEMKeyConverter().getPublicKey(a)).succeed
-        case _ => InventoryError.Crypto(s"Key '${key}' cannot be parsed as a public key").fail
-      }
-    }
-  }
-}
-
-final case class Certificate(value: String) extends SecurityToken {
+final case class Certificate(value: String) extends SecurityToken(Certificate.kind) {
 
   // Value of the key may be stored (with old fusion inventory version) as one line and without rsa header and footer, we should add them if missing and format the key
   val key:  String                                    = {
diff --git a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/MachineInventory.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/MachineInventory.scala
index 85736367c6c..b25428148a4 100644
--- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/MachineInventory.scala
+++ b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/MachineInventory.scala
@@ -66,7 +66,7 @@ final case class Controller(
 ) extends PhysicalElement
 
 final case class MemorySlot(
-    slotNumber: String, // string, because sometime it looks like: RAM slot #0
+    slotNumber: String, // string, because sometimes it looks like: RAM slot #0
 
     name:                                               Option[String] = None,
     description:                                        Option[String] = None,
diff --git a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/NodeInventory.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/NodeInventory.scala
index dde3bddf711..4b3eca5ba0f 100644
--- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/NodeInventory.scala
+++ b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/domain/NodeInventory.scala
@@ -39,9 +39,9 @@ package com.normation.inventory.domain
 
 import enumeratum.*
 import java.net.InetAddress
-import net.liftweb.json.JsonAST.JValue
 import org.joda.time.DateTime
 import zio.json.*
+import zio.json.ast.*
 
 sealed trait NodeElement {
   def description: Option[String]
@@ -100,6 +100,10 @@ final case class Process(
     description:                                                Option[String] = None
 ) extends NodeElement
 
+object Process {
+  implicit val codecProcess: JsonCodec[Process] = DeriveJsonCodec.gen
+}
+
 final case class VirtualMachine(
     @jsonField("type") @jsonAliases("vmtype") vmtype: Option[String] = None,
     subsystem:                                        Option[String] = None,
@@ -114,10 +118,16 @@ final case class VirtualMachine(
 ) extends NodeElement
 
 final case class EnvironmentVariable(
-    name:        String,
-    value:       Option[String] = None,
-    description: Option[String] = None
-) extends NodeElement
+    name:  String,
+    value: Option[String] = None
+) extends NodeElement {
+  // description is never present in Environment Variable, and we don't store it if it was
+  val description: Option[String] = None
+}
+
+object EnvironmentVariable {
+  implicit val codecEnvironmentVariable: JsonCodec[EnvironmentVariable] = DeriveJsonCodec.gen
+}
 
 object InetAddressUtils {
 
@@ -470,9 +480,13 @@ final case class NodeTimezone(
 
 final case class CustomProperty(
     name:  String,
-    value: JValue
+    value: Json
 )
 
+object CustomProperty {
+  implicit val codecCustomProperty: JsonCodec[CustomProperty] = DeriveJsonCodec.gen
+}
+
 sealed abstract class SoftwareUpdateKind(override val entryName: String) extends EnumEntry {
   def name: String = entryName
 }
@@ -548,6 +562,10 @@ object KeyStatus {
 
 final case class AgentCapability(value: String) extends AnyVal
 
+object AgentCapability {
+  implicit val codecAgentCapability: JsonCodec[AgentCapability] = JsonCodec.string.transform(AgentCapability.apply, _.value)
+}
+
 final case class NodeInventory(
     main:                 NodeSummary,
     name:                 Option[String] = None,
diff --git a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/CheckInventoryDigest.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/CheckInventoryDigest.scala
index 54d6768804f..abb7c10cff3 100644
--- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/CheckInventoryDigest.scala
+++ b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/CheckInventoryDigest.scala
@@ -38,7 +38,7 @@ package com.normation.inventory.services.provisioning
 
 import com.normation.errors.*
 import com.normation.errors.IOResult
-import com.normation.inventory.domain.{PublicKey as AgentKey, *}
+import com.normation.inventory.domain.*
 import java.io.InputStream
 import java.security.PublicKey
 import java.security.Signature
@@ -155,7 +155,6 @@ trait GetKey {
 
   def parseSecurityToken(token: SecurityToken): IOResult[ParsedSecurityToken] = {
     token match {
-      case x: AgentKey    => x.publicKey.map(pk => ParsedSecurityToken(pk, None))
       case x: Certificate =>
         SecurityToken.parseCertificate(x).map { case (p, s) => ParsedSecurityToken(p, Some(s)) }
     }
diff --git a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/GenericIdFinder.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/GenericIdFinder.scala
index 5f5f592f734..74a61d5e817 100644
--- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/GenericIdFinder.scala
+++ b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/GenericIdFinder.scala
@@ -39,7 +39,6 @@ package com.normation.inventory.services.provisioning
 
 import com.normation.errors.*
 import com.normation.inventory.domain.*
-import net.liftweb.common.*
 import zio.*
 import zio.syntax.*
 
@@ -79,7 +78,7 @@ class NodeInventoryDNFinderService(actions: Seq[NamedNodeInventoryDNFinderAction
  */
 sealed case class NamedMachineDNFinderAction(val name: String, val action: MachineDNFinderAction)
 
-class MachineDNFinderService(actions: Seq[NamedMachineDNFinderAction]) extends MachineDNFinderAction with Loggable {
+class MachineDNFinderService(actions: Seq[NamedMachineDNFinderAction]) extends MachineDNFinderAction {
 
   override def tryWith(entity: MachineInventory): IOResult[Option[(MachineUuid, InventoryStatus)]] = {
     ZIO
diff --git a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/InventorySaver.scala b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/InventorySaver.scala
index c2f423f8f27..96984c41727 100644
--- a/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/InventorySaver.scala
+++ b/webapp/sources/ldap-inventory/inventory-api/src/main/scala/com/normation/inventory/services/provisioning/InventorySaver.scala
@@ -41,7 +41,6 @@ import com.normation.errors.*
 import com.normation.inventory.domain.Inventory
 import com.normation.inventory.domain.InventoryProcessingLogger
 import com.normation.zio.*
-import net.liftweb.common.Loggable
 import zio.*
 
 /**
@@ -75,7 +74,7 @@ trait InventorySaver[R] {
  * middle
  */
 
-trait PipelinedInventorySaver[R] extends InventorySaver[R] with Loggable {
+trait PipelinedInventorySaver[R] extends InventorySaver[R] {
 
   val preCommitPipeline: Seq[PreCommit]
   val basePostPipeline:  Seq[PostCommit[R]]
diff --git a/webapp/sources/ldap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/AgentTypeEnumTest.scala b/webapp/sources/ldap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/AgentTypeEnumTest.scala
index 3591f0bc5c3..2cddf98e622 100644
--- a/webapp/sources/ldap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/AgentTypeEnumTest.scala
+++ b/webapp/sources/ldap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/AgentTypeEnumTest.scala
@@ -11,8 +11,7 @@ object AgentTypeEnumTest extends ZIOSpecDefault {
   override def spec: Spec[TestEnvironment & Scope, Any] = suite("AgentType")(
     test("should never remove existing type for backward compatibility") {
       assertTrue(
-        AgentType.values ==
-        IndexedSeq(AgentType.CfeEnterprise, AgentType.CfeCommunity, AgentType.Dsc)
+        AgentType.values == IndexedSeq(AgentType.CfeCommunity, AgentType.Dsc)
       )
     }
   )
diff --git a/webapp/sources/ldap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/AgentTypesTest.scala b/webapp/sources/ldap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/AgentTypesTest.scala
index 2c829d1754d..0aeefcf9698 100644
--- a/webapp/sources/ldap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/AgentTypesTest.scala
+++ b/webapp/sources/ldap-inventory/inventory-api/src/test/scala/com/normation/inventory/domain/AgentTypesTest.scala
@@ -37,10 +37,10 @@
 
 package com.normation.inventory.domain
 
-import com.normation.zio.ZioRuntime
 import org.junit.runner.*
 import org.specs2.mutable.*
 import org.specs2.runner.*
+import zio.json.*
 
 /**
  * Test properties about agent type, especially regarding serialisation
@@ -51,7 +51,7 @@ class AgentTypesTest extends Specification {
   // test serialisation of agent type and security token.
 
   /*
-   * In 4.1 and before, we add two seperated attribute:
+   * In 4.1 and before, we add two separated attribute:
    * - agentType for agent type and version
    * - publicKey to store node RSA public key in pkcs1 format
    *
@@ -70,29 +70,46 @@ class AgentTypesTest extends Specification {
    *
    */
 
-  val key =
-    "-----BEGIN RSA PUBLIC KEY-----\nMIIBCgKCAQEAtDTtbfw2ic1pcUludrs1I+HGGdRL0r5dKjMzLhUGahCrVaH7H3ND\n/py+XPZKY/Iolttgf1RriQAazEVbFEWXozistMTXtWJu/5IxV47QNqbS82KrhQNp\ns4abfqraGOlYbYS5BXCaHYrKI2VzvAwwvCsE7vmhnO1Br4AueagrFU+itjr/0gMd\nu58xYDiAADXqGDzES75NIxCZelv5vefMfpEMlBmztKmgY+iT+Q8lhf42WUsZ9OBl\nRDRfQ9VCW+8336C1JEpcHAcSElF4mn4D0GN7RvxNOSGpuLjxAvp5qFVbp4Xtd+4q\n8DaGe+w8MplwMVCFTyEMS3E1pS4DdctdLwIDAQAB\n-----END RSA PUBLIC KEY-----"
+  "Parsing agent type" should {
+    "works for an agent without capabilities in 8.0 format" in {
+      val cert = {
+        """-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUfa0+S+CyJahRzuwNNOFLNQQjIH8wDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MB4XDTI0MDMwMTExMDIxM1oXDTM0\nMDIyNzExMDIxM1owFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAsmBUYI1A5vqkOTCW24m/mQhBaRu4WaAUXDAr\nArdIAAMN0KyHhEXP1/X32Flw90E0VjtUH4P+DYLBozXYWhJrUxdWLyn3TRSbv3Kr\npXoCWhMhMp8OK2s/mG+rfiMpTXIwaMhPnBaJFNV3c+bkijGAMHtFjl3+leXJvNZ7\nw3bIg4cA3e77kz7EWMyqxOUvvLMyY6wpd03ahe/By+iLgtOkgUwl9hMqMU8tJeaz\nNIeUporsHk5rrk8bSf6Mxxdknm43Sk6oflnueNCIUFdd4rS2JLieMugsTh8n/oH+\nk29ZyirE3ikhftmZ3vY8GQ3IcIzaXwiAOGnCKcze79zVx5jmOTGSZitGZaU/cZc6\nLjzEp+ZDmE8caVIksiA+hIlaZeBXNHB+YRv/gV1Rbt7kS1am+XUZJSfVFf+99YqE\nlZ5p0hqJsczkBb2RuMxWxxsWO3pesPUNCuL/yaeggTIp7eK06tQWi1EfXr40ctrf\noimbzMAKNBpRKWruL7652SlF75Usaq+PaPi1TtqYQjLRZmbpr+IR4uMeKnEMIZPw\n3dLDKBV6d71XkTAalCmcJU+fgYrRmgz1dEnaZDIXY+f+fYR15hsFpDrZ0avHgkzJ\nca/nT/rKeX7136BttxVSbZaTU9hnmjAvl+v0BF+JUWPQ3VPTcrmyUNAICt8xdVae\nuo1tsvkCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSRG0uHQRIA\ngl91YqzSjaeaw+F7PDBSBgNVHSMESzBJgBSRG0uHQRIAgl91YqzSjaeaw+F7PKEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3ghR9rT5L4LIlqFHO7A004Us1BCMg\nfzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBABR2vTH/6WlqjaTZ/hQc\nB+crqRlFimqCiVTRdX6qfkt0tLX2dK6scHNTBT04ORLjLTAn0KbcOUz3k6i0mIqB\nnG5UjqCFEQR+i2V4Hz7aK6+7LBQuwXWRhDhvO5xMn7MxjvP0LGgNf5iiA4r/N22L\nEMc1prDESIOGmWdKg9XlfLxd877R2d8/3hXyT82Y2uJHO25b53skj4pbUOWLsGSw\nd4FBNnWqM+7Hbg2v9xFvmtfs2G2Inqk4Xjtjnj8qkVk3ft6KzClUIMXGXQ8QqaRp\nYPkTJm5g2UBYDiguD/tlz3VmbsNYU6fkap7DKqhttbaseIx1zDwdAv4jtVOWDyjx\nWq4b7pljYiczfRa84X/9v1x05pT3raELy5udY+Pxmnz+hOXOM+jY5bzSKS24b8rS\n5Sklmutm0IdflMKd5vNrXd9yPFLu3QzN50ArzHHXczwBLgjaMlZsPAp1wITlqM7+\nWCjy3qM5/KgAjH3L24MPTq23o9PokBVh1NH7lesZqgJPgsj+OG7FMQDvKzg7ytrs\nQlIDF1c8Ko+9/RrnRVAS8C4GZOqbmMmfJjMp09GBz2d0ixlTusF6m6iwfIVMf/nI\nP/V0D7STRiV62cfnZ3e0w8kIeZwWAgXI7RMHJU3skLyurUu8yxkp635IQyzQsW2A\nYo7t7O7fxjqD9yVI2QfkERZ7\n-----END CERTIFICATE-----\n"""
+      }
 
-  val json61: String = s"""
-    {
-       "agentType":"cfengine-community"
-      ,"version"  :"6.1.0"
-      ,"securityToken": { "value":"$key","type":"certificate"}
-      , "capabilities": ["https", "very", "good"]
-    }"""
+      val json80 =
+        s"""{"agentType":"cfengine-community","version":"8.0.0","securityToken":{"type":"certificate","value":"${cert}"}}"""
+      val res    = json80.fromJson[AgentInfo]
+      res must beRight(
+        AgentInfo(
+          AgentType.CfeCommunity,
+          Some(AgentVersion("8.0.0")),
+          Certificate(cert.replaceAll("""\\n""", "\n")), // this is needed because the json format writes the \n literaly
+          Set()
+        )
+      )
+    }
 
-  "Parsing agent type" should {
+    "works for an agent with capabilities in 8.0 format" in {
+      val cert = {
+        """-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUfa0+S+CyJahRzuwNNOFLNQQjIH8wDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MB4XDTI0MDMwMTExMDIxM1oXDTM0\nMDIyNzExMDIxM1owFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAsmBUYI1A5vqkOTCW24m/mQhBaRu4WaAUXDAr\nArdIAAMN0KyHhEXP1/X32Flw90E0VjtUH4P+DYLBozXYWhJrUxdWLyn3TRSbv3Kr\npXoCWhMhMp8OK2s/mG+rfiMpTXIwaMhPnBaJFNV3c+bkijGAMHtFjl3+leXJvNZ7\nw3bIg4cA3e77kz7EWMyqxOUvvLMyY6wpd03ahe/By+iLgtOkgUwl9hMqMU8tJeaz\nNIeUporsHk5rrk8bSf6Mxxdknm43Sk6oflnueNCIUFdd4rS2JLieMugsTh8n/oH+\nk29ZyirE3ikhftmZ3vY8GQ3IcIzaXwiAOGnCKcze79zVx5jmOTGSZitGZaU/cZc6\nLjzEp+ZDmE8caVIksiA+hIlaZeBXNHB+YRv/gV1Rbt7kS1am+XUZJSfVFf+99YqE\nlZ5p0hqJsczkBb2RuMxWxxsWO3pesPUNCuL/yaeggTIp7eK06tQWi1EfXr40ctrf\noimbzMAKNBpRKWruL7652SlF75Usaq+PaPi1TtqYQjLRZmbpr+IR4uMeKnEMIZPw\n3dLDKBV6d71XkTAalCmcJU+fgYrRmgz1dEnaZDIXY+f+fYR15hsFpDrZ0avHgkzJ\nca/nT/rKeX7136BttxVSbZaTU9hnmjAvl+v0BF+JUWPQ3VPTcrmyUNAICt8xdVae\nuo1tsvkCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSRG0uHQRIA\ngl91YqzSjaeaw+F7PDBSBgNVHSMESzBJgBSRG0uHQRIAgl91YqzSjaeaw+F7PKEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3ghR9rT5L4LIlqFHO7A004Us1BCMg\nfzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBABR2vTH/6WlqjaTZ/hQc\nB+crqRlFimqCiVTRdX6qfkt0tLX2dK6scHNTBT04ORLjLTAn0KbcOUz3k6i0mIqB\nnG5UjqCFEQR+i2V4Hz7aK6+7LBQuwXWRhDhvO5xMn7MxjvP0LGgNf5iiA4r/N22L\nEMc1prDESIOGmWdKg9XlfLxd877R2d8/3hXyT82Y2uJHO25b53skj4pbUOWLsGSw\nd4FBNnWqM+7Hbg2v9xFvmtfs2G2Inqk4Xjtjnj8qkVk3ft6KzClUIMXGXQ8QqaRp\nYPkTJm5g2UBYDiguD/tlz3VmbsNYU6fkap7DKqhttbaseIx1zDwdAv4jtVOWDyjx\nWq4b7pljYiczfRa84X/9v1x05pT3raELy5udY+Pxmnz+hOXOM+jY5bzSKS24b8rS\n5Sklmutm0IdflMKd5vNrXd9yPFLu3QzN50ArzHHXczwBLgjaMlZsPAp1wITlqM7+\nWCjy3qM5/KgAjH3L24MPTq23o9PokBVh1NH7lesZqgJPgsj+OG7FMQDvKzg7ytrs\nQlIDF1c8Ko+9/RrnRVAS8C4GZOqbmMmfJjMp09GBz2d0ixlTusF6m6iwfIVMf/nI\nP/V0D7STRiV62cfnZ3e0w8kIeZwWAgXI7RMHJU3skLyurUu8yxkp635IQyzQsW2A\nYo7t7O7fxjqD9yVI2QfkERZ7\n-----END CERTIFICATE-----\n"""
+      }
 
-    "works for 6_1 format" in {
-      val res = ZioRuntime.runNow(AgentInfoSerialisation.parseJson(json61, None))
+      val json80 =
+        s"""{"agentType":"cfengine-community","version":"8.0.0","securityToken":{"type":"certificate","value":"${cert}"},"capabilities":["acl","cfengine","curl","http_reporting","jq","xml","yaml"]}"""
+      val res    = json80.fromJson[AgentInfo] match {
+        case Left(err) => throw new RuntimeException(s"bad result: ${err}")
+        case Right(x)  => x
+      }
+      val ser    = res.toJson
       res must beEqualTo(
         AgentInfo(
           AgentType.CfeCommunity,
-          Some(AgentVersion("6.1.0")),
-          Certificate(key),
-          Set("https", "very", "good").map(AgentCapability.apply)
+          Some(AgentVersion("8.0.0")),
+          Certificate(cert.replaceAll("""\\n""", "\n")), // this is needed because the json format writes the \n literaly
+          Set("acl", "cfengine", "curl", "http_reporting", "jq", "xml", "yaml").map(AgentCapability.apply)
         )
-      )
+      ) and ser === json80
     }
   }
+
 }
diff --git a/webapp/sources/ldap-inventory/inventory-fusion/pom.xml b/webapp/sources/ldap-inventory/inventory-fusion/pom.xml
index 532c4e432a8..00e3ef7d824 100644
--- a/webapp/sources/ldap-inventory/inventory-fusion/pom.xml
+++ b/webapp/sources/ldap-inventory/inventory-fusion/pom.xml
@@ -35,7 +35,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation.inventory</groupId>
     <artifactId>inventory-parent</artifactId>
-    <version>8.2.4-SNAPSHOT</version>
+    <version>8.3.0~alpha1-SNAPSHOT</version>
   </parent>
 
   <artifactId>inventory-fusion</artifactId>
diff --git a/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/FusionInventoryParser.scala b/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/FusionInventoryParser.scala
index b9a9c894dbd..24049c9906c 100644
--- a/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/FusionInventoryParser.scala
+++ b/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/FusionInventoryParser.scala
@@ -48,12 +48,13 @@ import com.normation.utils.StringUuidGenerator
 import com.softwaremill.quicklens.*
 import java.net.InetAddress
 import java.util.Locale
-import net.liftweb.json.JsonAST.JString
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
 import org.joda.time.format.DateTimeFormatter
 import scala.xml.*
 import zio.*
+import zio.json.*
+import zio.json.ast.*
 import zio.syntax.*
 
 class FusionInventoryParser(
@@ -283,19 +284,17 @@ class FusionInventoryParser(
 
   // the whole content of the CUSTOM_PROPERTIES attribute should be valid JSON Array
   def processCustomProperties(xml: NodeSeq): List[CustomProperty] = {
-    import net.liftweb.json.*
-
-    parseOpt(xml.text) match {
-      case None       => Nil
-      case Some(json) =>
+    xml.text.fromJson[Json] match {
+      case Left(err)   => Nil
+      case Right(json) =>
         json match { // only Json Array is OK
-          case JArray(values) =>
+          case Json.Arr(values) =>
             // each values must be an object, with each key a property name (and values... it depends :)
             values.flatMap {
-              case JObject(fields) => fields.map(f => CustomProperty(f.name, f.value))
-              case _               => Nil
-            }
-          case x              => Nil
+              case Json.Obj(fields) => fields.map(f => CustomProperty(f._1, f._2))
+              case _                => Nil
+            }.toList
+          case x                => Nil
         }
     }
   }
@@ -328,10 +327,10 @@ class FusionInventoryParser(
     val origHostname = sortedAlternatives.collectFirst { case Some(fqdn) if validHostname(fqdn) => fqdn }
 
     customProperties.collectFirst {
-      case CustomProperty(CUSTOM_PROPERTY_OVERRIDE_HOSTNAME, JString(x)) if validHostname(x) => x
+      case CustomProperty(CUSTOM_PROPERTY_OVERRIDE_HOSTNAME, Json.Str(x)) if validHostname(x) => x
     } match {
       case Some(x) =>
-        val orig = CustomProperty(CUSTOM_PROPERTY_ORIGINAL_HOSTNAME, JString(origHostname.getOrElse("none")))
+        val orig = CustomProperty(CUSTOM_PROPERTY_ORIGINAL_HOSTNAME, Json.Str(origHostname.getOrElse("none")))
         (x, orig :: customProperties).succeed
       case None    =>
         origHostname match {
@@ -414,16 +413,10 @@ class FusionInventoryParser(
      */
     val agentList = ZIO.foreach((xml \\ "AGENT").toList) { agentXML =>
       val agent = for {
-        agentName    <- optText(agentXML \ "AGENT_NAME").notOptional(
-                          "could not parse agent name (tag AGENT_NAME) from Rudder specific inventory"
-                        )
-        rawAgentType <- ZIO.fromEither(AgentType.fromValue(agentName))
-        agentType    <- if (rawAgentType == AgentType.CfeEnterprise) {
-                          Inconsistency(
-                            "CFEngine Enterprise/Nova agents are not supported anymore"
-                          ).fail
-                        } else { rawAgentType.succeed }
-
+        agentName      <- optText(agentXML \ "AGENT_NAME").notOptional(
+                            "could not parse agent name (tag AGENT_NAME) from Rudder specific inventory"
+                          )
+        agentType      <- ZIO.fromEither(AgentType.fromValue(agentName))
         rootUser       <-
           optText(agentXML \\ "OWNER").notOptional("could not parse rudder user (tag OWNER) from rudder specific inventory")
         policyServerId <- optText(agentXML \\ "POLICY_SERVER_UUID").notOptional(
diff --git a/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/PreInventoryParserCheckConsistency.scala b/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/PreInventoryParserCheckConsistency.scala
index be27454b847..2f57eada0ac 100644
--- a/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/PreInventoryParserCheckConsistency.scala
+++ b/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/PreInventoryParserCheckConsistency.scala
@@ -58,8 +58,8 @@ class PreInventoryParserCheckConsistency extends PreInventoryParser {
 
   /**
    * There is a list of variables that MUST be set at that point:
-   * - an id for the node (it is ok that it may be change latter on the process, for ex. for unusal changes)
-   * - an hostname
+   * - an id for the node (it is ok that it may be change later on the process, for ex. for unusual changes)
+   * - a hostname
    * - an admin (root user on the node)
    * - a policy server id
    * - an OS name
@@ -85,7 +85,7 @@ class PreInventoryParserCheckConsistency extends PreInventoryParser {
     ZIO.foldLeft(checks)(inventory)((currentInventory, check) => check(currentInventory))
   }
 
-  // Utilitary method to get only once the RUDDER and the AGENT
+  // Utility method to get only once the RUDDER and the AGENT
   private def getInTags(xml: NodeSeq, tag: String): NodeSeq = {
     xml \\ tag
   }
@@ -200,7 +200,7 @@ class PreInventoryParserCheckConsistency extends PreInventoryParser {
 
   /**
    * Kernel version: either
-   * - non empty OPERATINGSYSTEM > KERNEL_VERSION
+   * - non-empty OPERATINGSYSTEM > KERNEL_VERSION
    * or
    * - (on AIX and non empty HARDWARE > OSVERSION )
    * Other cases are failure (missing required info)
diff --git a/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/PreInventoryParserCheckInventoryAge.scala b/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/PreInventoryParserCheckInventoryAge.scala
new file mode 100644
index 00000000000..58f48e8fec6
--- /dev/null
+++ b/webapp/sources/ldap-inventory/inventory-fusion/src/main/scala/com/normation/inventory/provisioning/fusion/PreInventoryParserCheckInventoryAge.scala
@@ -0,0 +1,131 @@
+/*
+ *************************************************************************************
+ * Copyright 2024 Normation SAS
+ *************************************************************************************
+ *
+ * This file is part of Rudder.
+ *
+ * Rudder is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In accordance with the terms of section 7 (7. Additional Terms.) of
+ * the GNU General Public License version 3, the copyright holders add
+ * the following Additional permissions:
+ * Notwithstanding to the terms of section 5 (5. Conveying Modified Source
+ * Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
+ * Public License version 3, when you create a Related Module, this
+ * Related Module is not considered as a part of the work and may be
+ * distributed under the license agreement of your choice.
+ * A "Related Module" means a set of sources files including their
+ * documentation that, without modification of the Source Code, enables
+ * supplementary functions or services in addition to those offered by
+ * the Software.
+ *
+ * Rudder is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
+
+ *
+ *************************************************************************************
+ */
+
+package com.normation.inventory.provisioning.fusion
+
+import com.normation.errors.*
+import com.normation.inventory.provisioning.fusion.OptText.optText
+import com.normation.inventory.services.provisioning.*
+import java.time.*
+import java.time.format.DateTimeFormatter
+import scala.xml.NodeSeq
+import zio.*
+
+class PreInventoryParserCheckInventoryAge(maxBeforeNow: Duration, maxAfterNow: Duration) extends PreInventoryParser {
+  override val name = "post_process_inventory:check_inventory_age"
+
+  /**
+   * We don't want to accept inventories;
+   * - older than maxBeforeNow
+   * - more in the future than maxAfterNow
+   *
+   * Age is deducted from the attribute:
+   * - ACCESSLOG > LOGDATE, which is a datetime in local server time, without timezone.
+   * - OPERATINGSYSTEM > TIMEZONE > TIMEZONE that may not be there, for more fun.
+   *
+   * If we are not able to parse the timezone, then assume UTC because it's at least a known error.
+   * If logdate is missing or not parsable, assume the inventory is out of range (it will likely
+   * be refused further one).
+   */
+  override def apply(inventory: NodeSeq): IOResult[NodeSeq] = {
+    val now  = OffsetDateTime.now()
+    val date = PreInventoryParserCheckInventoryAge.extracDateValue(inventory)
+
+    (for {
+      d <- PreInventoryParserCheckInventoryAge.parseInventoryDate(date)
+      _ <- PreInventoryParserCheckInventoryAge.checkDate(d, now, maxBeforeNow, maxAfterNow)
+    } yield inventory).toIO
+  }
+
+}
+
+object PreInventoryParserCheckInventoryAge {
+
+  val dateTimeFormat       = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+  val offsetDateTimeFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ")
+
+  def extracDateValue(inventory: NodeSeq): String = {
+    val logdate  = optText(inventory \\ "ACCESSLOG" \ "LOGDATE").getOrElse("")
+    val timezone = optText(inventory \\ "OPERATINGSYSTEM" \ "TIMEZONE" \ "OFFSET").getOrElse("")
+
+    logdate + timezone
+  }
+
+  // try to parse the inventory date in format YYYY-MM-dd HH:mm:ssZ
+  // ex UTC: 2023-11-16 10:46:35+0000
+  // ex Europe/Paris: 2023-11-16 11:46:12+0100
+  def parseOffsetDateTime(date: String): PureResult[OffsetDateTime] = {
+    PureResult.attempt(s"Error when parsing date '${date}' as a time-zoned date with offset")(
+      OffsetDateTime.parse(date, offsetDateTimeFormat)
+    )
+  }
+
+  // try to parse the inventory date in format: YYYY-MM-dd HH:mm:ss
+  // Since in that case, we don't have timezone information, we need to chose arbitrary,
+  // and we chose UTC so that it's easier to identify problem when they arise.
+  def parseLocalDateTime(date: String): PureResult[OffsetDateTime] = {
+    PureResult
+      .attempt(s"Error when parsing date '${date}' as a local date time")(
+        LocalDateTime.parse(date, dateTimeFormat)
+      )
+      .map(OffsetDateTime.of(_, ZoneOffset.UTC))
+  }
+
+  def parseInventoryDate(date: String): PureResult[OffsetDateTime] = {
+    parseOffsetDateTime(date) match {
+      case Left(_)  => parseLocalDateTime(date)
+      case Right(d) => Right(d)
+    }
+  }
+
+  // check that date is in window between [now-maxBeforeNow, now+maxAfterNow]
+  def checkDate(date: OffsetDateTime, now: OffsetDateTime, maxBeforeNow: Duration, maxAfterNow: Duration): PureResult[Unit] = {
+    val pastLimit   = now.minus(maxBeforeNow)
+    val futureLimit = now.plus(maxAfterNow)
+
+    val beforePastLimit  = Inconsistency(s"Inventory is too old, refusing (inventory date is before '${pastLimit.toString}')")
+    val afterFutureLimit = Inconsistency(
+      s"Inventory is too far in the future, refusing (inventory date is after '${futureLimit.toString}')"
+    )
+
+    (date.isBefore(pastLimit), date.isAfter(futureLimit)) match {
+      case (false, false) => Right(())
+      case (true, _)      => Left(beforePastLimit)
+      case (_, true)      => Left(afterFutureLimit)
+    }
+  }
+}
diff --git a/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/WIN-2017-rudder-4-1.ocs b/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/WIN-2017-rudder-4-1.ocs
deleted file mode 100644
index 44b1c0f1852..00000000000
--- a/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/WIN-2017-rudder-4-1.ocs
+++ /dev/null
@@ -1,548 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<REQUEST>
-  <CONTENT>
-<VMS>
-</VMS>
-<USERSLIST>
-<USER>Invité</USER>
-<USER>demo</USER>
-<USER>Administrateur</USER>
-</USERSLIST>
-    <ACCESSLOG>
-      <LOGDATE>2017-05-09 18:15:19</LOGDATE>
-    </ACCESSLOG>
-    <BIOS>
-      <ASSETTAG />  <BDATE>12/01/2006</BDATE>
-      <BMANUFACTURER>innotek GmbH</BMANUFACTURER>
-      <BVERSION>VirtualBox</BVERSION>
-      <MMANUFACTURER>Oracle Corporation</MMANUFACTURER>
-      <MMODEL>VirtualBox</MMODEL>
-      <MSN>0</MSN>
-      <SKUNUMBER />  <SMANUFACTURER>innotek GmbH</SMANUFACTURER>
-      <SMODEL>VirtualBox</SMODEL>
-      <SSN>0</SSN>
-    </BIOS>
-    <CONTROLLERS>
-      <CAPTION>82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [AHCI mode]</CAPTION>
-      <MANUFACTURER>Intel Corporation</MANUFACTURER>
-      <NAME>82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [AHCI mode]</NAME>
-      <PCISUBSYSTEMID>0000:0000</PCISUBSYSTEMID>
-      <PRODUCTID>2829</PRODUCTID>
-      <TYPE>Contrôleur Serial ATA standard AHCI 1.0</TYPE>
-      <VENDORID>8086</VENDORID>
-    </CONTROLLERS>
-    <CONTROLLERS>
-      <CAPTION>KeyLargo/Intrepid USB</CAPTION>
-      <MANUFACTURER>Apple Inc.</MANUFACTURER>
-      <NAME>KeyLargo/Intrepid USB</NAME>
-      <PCISUBSYSTEMID>0000:0000</PCISUBSYSTEMID>
-      <PRODUCTID>003f</PRODUCTID>
-      <TYPE>Contrôleur hôte USB OpenHCD standard</TYPE>
-      <VENDORID>106b</VENDORID>
-    </CONTROLLERS>
-    <CONTROLLERS>
-      <CAPTION>82540EM Gigabit Ethernet Controller</CAPTION>
-      <MANUFACTURER>Intel Corporation</MANUFACTURER>
-      <NAME>PRO/1000 MT Desktop Adapter</NAME>
-      <PCISUBSYSTEMID>8086:001e</PCISUBSYSTEMID>
-      <PRODUCTID>100e</PRODUCTID>
-      <TYPE>Carte Intel(R) PRO/1000 MT pour station de travail</TYPE>
-      <VENDORID>8086</VENDORID>
-    </CONTROLLERS>
-    <CONTROLLERS>
-      <CAPTION>VirtualBox Guest Service</CAPTION>
-      <MANUFACTURER>InnoTek Systemberatung GmbH</MANUFACTURER>
-      <NAME>VirtualBox Guest Service</NAME>
-      <PCISUBSYSTEMID>0000:0000</PCISUBSYSTEMID>
-      <PRODUCTID>cafe</PRODUCTID>
-      <TYPE>VirtualBox Device</TYPE>
-      <VENDORID>80ee</VENDORID>
-    </CONTROLLERS>
-    <CONTROLLERS>
-      <CAPTION>440FX - 82441FX PMC [Natoma]</CAPTION>
-      <MANUFACTURER>Intel Corporation</MANUFACTURER>
-      <NAME>440FX - 82441FX PMC [Natoma]</NAME>
-      <PCISUBSYSTEMID>0000:0000</PCISUBSYSTEMID>
-      <PRODUCTID>1237</PRODUCTID>
-      <TYPE>Pont Intel 82441FX Processeur Pentium(R) Pro vers PCI</TYPE>
-      <VENDORID>8086</VENDORID>
-    </CONTROLLERS>
-    <CONTROLLERS>
-      <CAPTION>82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller</CAPTION>
-      <MANUFACTURER>Intel Corporation</MANUFACTURER>
-      <NAME>82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller</NAME>
-      <PCISUBSYSTEMID>8384:7680</PCISUBSYSTEMID>
-      <PRODUCTID>2668</PRODUCTID>
-      <TYPE>Contrôleur audio haute définition</TYPE>
-      <VENDORID>8086</VENDORID>
-    </CONTROLLERS>
-    <CONTROLLERS>
-      <CAPTION>82371SB PIIX3 ISA [Natoma/Triton II]</CAPTION>
-      <MANUFACTURER>Intel Corporation</MANUFACTURER>
-      <NAME>82371SB PIIX3 ISA [Natoma/Triton II]</NAME>
-      <PCISUBSYSTEMID>0000:0000</PCISUBSYSTEMID>
-      <PRODUCTID>7000</PRODUCTID>
-      <TYPE>Pont Intel 82371SB PCI vers ISA</TYPE>
-      <VENDORID>8086</VENDORID>
-    </CONTROLLERS>
-    <CONTROLLERS>
-      <CAPTION>VirtualBox Graphics Adapter</CAPTION>
-      <MANUFACTURER>InnoTek Systemberatung GmbH</MANUFACTURER>
-      <NAME>VirtualBox Graphics Adapter</NAME>
-      <PCISUBSYSTEMID>0000:0000</PCISUBSYSTEMID>
-      <PRODUCTID>beef</PRODUCTID>
-      <TYPE>VirtualBox Graphics Adapter</TYPE>
-      <VENDORID>80ee</VENDORID>
-    </CONTROLLERS>
-    <CPUS>
-      <CORE>1</CORE>
-      <DESCRIPTION>Intel64 Family 6 Model 69 Stepping 1</DESCRIPTION>
-      <FAMILYNUMBER>6</FAMILYNUMBER>
-      <MANUFACTURER>Intel</MANUFACTURER>
-      <MODEL>69</MODEL>
-      <NAME>Intel(R) Core(TM) i5-4200U CPU @ 1.60GHz</NAME>
-      <SPEED>1600</SPEED>
-      <STEPPING>1</STEPPING>
-      <THREAD>1</THREAD>
-    </CPUS>
-    <DRIVES>
-      <DESCRIPTION>Disque fixe local</DESCRIPTION>
-      <FILESYSTEM>NTFS</FILESYSTEM>
-      <FREE>11002</FREE>
-      <LABEL></LABEL>
-      <LETTER>C:</LETTER>
-      <SERIAL>E478E77B</SERIAL>
-      <SYSTEMDRIVE>1</SYSTEMDRIVE>
-      <TOTAL>20555</TOTAL>
-      <TYPE>Local Disk</TYPE>
-      <VOLUMN></VOLUMN>
-    </DRIVES>
-    <DRIVES>
-      <DESCRIPTION>Disque CD-ROM</DESCRIPTION>
-      <LETTER>D:</LETTER>
-      <SYSTEMDRIVE></SYSTEMDRIVE>
-      <TYPE>Compact Disc</TYPE>
-    </DRIVES>
-    <ENVS>
-      <KEY>ComSpec</KEY>
-      <VAL>%SystemRoot%\system32\cmd.exe</VAL>
-    </ENVS>
-    <ENVS>
-      <KEY>FP_NO_HOST_CHECK</KEY>
-      <VAL>NO</VAL>
-    </ENVS>
-    <ENVS>
-      <KEY>OS</KEY>
-      <VAL>Windows_NT</VAL>
-    </ENVS>
-    <ENVS>
-      <KEY>Path</KEY>
-      <VAL>%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem;%SYSTEMROOT%\System32\WindowsPowerShell\v1.0\;C:\Program Files\Cfengine\bin\</VAL>
-    </ENVS>
-    <ENVS>
-      <KEY>PATHEXT</KEY>
-      <VAL>.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC</VAL>
-    </ENVS>
-    <ENVS>
-      <KEY>PROCESSOR_ARCHITECTURE</KEY>
-      <VAL>AMD64</VAL>
-    </ENVS>
-    <ENVS>
-      <KEY>TEMP</KEY>
-      <VAL>%SystemRoot%\TEMP</VAL>
-    </ENVS>
-    <ENVS>
-      <KEY>TMP</KEY>
-      <VAL>%SystemRoot%\TEMP</VAL>
-    </ENVS>
-    <ENVS>
-      <KEY>USERNAME</KEY>
-      <VAL>SYSTEM</VAL>
-    </ENVS>
-    <ENVS>
-      <KEY>windir</KEY>
-      <VAL>%SystemRoot%</VAL>
-    </ENVS>
-    <ENVS>
-      <KEY>PSModulePath</KEY>
-      <VAL>%SystemRoot%\system32\WindowsPowerShell\v1.0\Modules\</VAL>
-    </ENVS>
-    <ENVS>
-      <KEY>NUMBER_OF_PROCESSORS</KEY>
-      <VAL>1</VAL>
-    </ENVS>
-    <ENVS>
-      <KEY>PROCESSOR_LEVEL</KEY>
-      <VAL>6</VAL>
-    </ENVS>
-    <ENVS>
-      <KEY>PROCESSOR_IDENTIFIER</KEY>
-      <VAL>Intel64 Family 6 Model 69 Stepping 1, GenuineIntel</VAL>
-    </ENVS>
-    <ENVS>
-      <KEY>PROCESSOR_REVISION</KEY>
-      <VAL>4501</VAL>
-    </ENVS>
-    <HARDWARE>
-      <ARCHNAME>MSWin32-x64-multi-thread</ARCHNAME>
-      <CHASSIS_TYPE>Other</CHASSIS_TYPE>
-      <CHECKSUM>131071</CHECKSUM>
-      <DEFAULTGATEWAY>10.0.2.2</DEFAULTGATEWAY>
-      <DNS>10.0.2.3</DNS>
-      <ETIME>19</ETIME>
-      <IPADDR>10.0.2.15/192.168.43.10</IPADDR>
-      <LASTLOGGEDUSER>vagrant</LASTLOGGEDUSER>
-      <MEMORY>2047</MEMORY>
-      <NAME>WIN-UC3QD07D2PO</NAME>
-      <OSNAME>Microsoft Windows Server 2008 R2 Standard </OSNAME>
-      <OSVERSION>6.1.7600</OSVERSION>
-      <PROCESSORN>1</PROCESSORN>
-      <PROCESSORS>1600</PROCESSORS>
-      <PROCESSORT>Intel(R) Core(TM) i5-4200U CPU @ 1.60GHz</PROCESSORT>
-      <USERID>vagrant</USERID>
-      <UUID>B1F2330E-9D66-0C4E-B9CC-CD455F007AC1</UUID>
-      <VMSYSTEM>VirtualBox</VMSYSTEM>
-      <WINLANG>1036</WINLANG>
-      <WINOWNER>Utilisateur Windows</WINOWNER>
-      <WINPRODID>00477-179-0000007-84674</WINPRODID>
-      <WINPRODKEY>HMG6P-C7VGP-47GJ9-TWBD4-2YYCD</WINPRODKEY>
-      <WORKGROUP>WORKGROUP</WORKGROUP>
-    </HARDWARE>
-    <INPUTS>
-      <CAPTION>Étendu (101 ou 102 touches)</CAPTION>
-      <DESCRIPTION>Clavier standard PS/2</DESCRIPTION>
-      <LAYOUT>0000040C</LAYOUT>
-      <NAME>Étendu (101 ou 102 touches)</NAME>
-    </INPUTS>
-    <INPUTS>
-      <CAPTION>Souris Microsoft PS/2</CAPTION>
-      <DESCRIPTION>Souris Microsoft PS/2</DESCRIPTION>
-      <INTERFACE>PS/2</INTERFACE>
-      <MANUFACTURER>Microsoft</MANUFACTURER>
-      <NAME>Souris Microsoft PS/2</NAME>
-      <POINTINGTYPE>2</POINTINGTYPE>
-    </INPUTS>
-    <INPUTS>
-      <CAPTION>Périphérique d’entrée USB</CAPTION>
-      <DESCRIPTION>Périphérique d’entrée USB</DESCRIPTION>
-      <INTERFACE>USB</INTERFACE>
-      <MANUFACTURER>(Périphériques système standard)</MANUFACTURER>
-      <NAME>Périphérique d’entrée USB</NAME>
-      <POINTINGTYPE>2</POINTINGTYPE>
-    </INPUTS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-574</ID>
-      <NAME>Accès DCOM service de certificats</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-544</ID>
-      <NAME>Administrateurs</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-552</ID>
-      <NAME>Duplicateurs</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-568</ID>
-      <NAME>IIS_IUSRS</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-546</ID>
-      <NAME>Invités</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-573</ID>
-      <NAME>Lecteurs des journaux d’événements</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-569</ID>
-      <NAME>Opérateurs de chiffrement</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-556</ID>
-      <NAME>Opérateurs de configuration réseau</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-551</ID>
-      <NAME>Opérateurs de sauvegarde</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-550</ID>
-      <NAME>Opérateurs d’impression</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-545</ID>
-      <NAME>Utilisateurs</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-547</ID>
-      <NAME>Utilisateurs avec pouvoir</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-558</ID>
-      <NAME>Utilisateurs de l’Analyseur de performances</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-555</ID>
-      <NAME>Utilisateurs du Bureau à distance</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-559</ID>
-      <NAME>Utilisateurs du journal de performances</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_GROUPS>
-      <ID>S-1-5-32-562</ID>
-      <NAME>Utilisateurs du modèle COM distribué</NAME>
-    </LOCAL_GROUPS>
-    <LOCAL_USERS>
-      <ID>S-1-5-21-3455907242-2152756475-1308380486-500</ID>
-      <NAME>Administrateur</NAME>
-    </LOCAL_USERS>
-    <LOCAL_USERS>
-      <ID>S-1-5-21-3455907242-2152756475-1308380486-1001</ID>
-      <NAME>demo</NAME>
-    </LOCAL_USERS>
-    <LOCAL_USERS>
-      <ID>S-1-5-21-3455907242-2152756475-1308380486-1000</ID>
-      <NAME>vagrant</NAME>
-    </LOCAL_USERS>
-    <NETWORKS>
-      <DESCRIPTION>Carte Intel(R) PRO/1000 MT pour station de travail</DESCRIPTION>
-      <IPADDRESS>10.0.2.15</IPADDRESS>
-      <IPDHCP>10.0.2.2</IPDHCP>
-      <IPGATEWAY>10.0.2.2</IPGATEWAY>
-      <IPMASK>255.255.255.0</IPMASK>
-      <IPSUBNET>10.0.2.0</IPSUBNET>
-      <MACADDR>08:00:27:E2:3A:B7</MACADDR>
-      <PCIID>8086:100E:001E:8086</PCIID>
-      <PNPDEVICEID>PCI\VEN_8086&amp;DEV_100E&amp;SUBSYS_001E8086&amp;REV_02\3&amp;267A616A&amp;0&amp;18</PNPDEVICEID>
-      <SPEED>1000</SPEED>
-      <STATUS>Up</STATUS>
-      <TYPE>ethernet</TYPE>
-      <VIRTUALDEV>0</VIRTUALDEV>
-    </NETWORKS>
-    <NETWORKS>
-      <DESCRIPTION>Carte Intel(R) PRO/1000 MT pour station de travail</DESCRIPTION>
-      <IPADDRESS6>fe80::95e:ef68:9f33:1690</IPADDRESS6>
-      <IPMASK6>ffff:ffff:ffff:ffff::</IPMASK6>
-      <IPSUBNET6>fe80::</IPSUBNET6>
-      <MACADDR>08:00:27:E2:3A:B7</MACADDR>
-      <PCIID>8086:100E:001E:8086</PCIID>
-      <PNPDEVICEID>PCI\VEN_8086&amp;DEV_100E&amp;SUBSYS_001E8086&amp;REV_02\3&amp;267A616A&amp;0&amp;18</PNPDEVICEID>
-      <SPEED>1000</SPEED>
-      <STATUS>Up</STATUS>
-      <TYPE>ethernet</TYPE>
-      <VIRTUALDEV>0</VIRTUALDEV>
-    </NETWORKS>
-    <NETWORKS>
-      <DESCRIPTION>Carte Intel(R) PRO/1000 MT pour station de travail #2</DESCRIPTION>
-      <IPADDRESS>192.168.43.10</IPADDRESS>
-      <IPMASK>255.255.255.0</IPMASK>
-      <IPSUBNET>192.168.43.0</IPSUBNET>
-      <MACADDR>08:00:27:A6:80:AA</MACADDR>
-      <PCIID>8086:100E:001E:8086</PCIID>
-      <PNPDEVICEID>PCI\VEN_8086&amp;DEV_100E&amp;SUBSYS_001E8086&amp;REV_02\3&amp;267A616A&amp;0&amp;40</PNPDEVICEID>
-      <SPEED>1000</SPEED>
-      <STATUS>Up</STATUS>
-      <TYPE>ethernet</TYPE>
-      <VIRTUALDEV>0</VIRTUALDEV>
-    </NETWORKS>
-    <NETWORKS>
-      <DESCRIPTION>Carte Intel(R) PRO/1000 MT pour station de travail #2</DESCRIPTION>
-      <IPADDRESS6>fe80::6810:6ee7:237f:9c7f</IPADDRESS6>
-      <IPMASK6>ffff:ffff:ffff:ffff::</IPMASK6>
-      <IPSUBNET6>fe80::</IPSUBNET6>
-      <MACADDR>08:00:27:A6:80:AA</MACADDR>
-      <PCIID>8086:100E:001E:8086</PCIID>
-      <PNPDEVICEID>PCI\VEN_8086&amp;DEV_100E&amp;SUBSYS_001E8086&amp;REV_02\3&amp;267A616A&amp;0&amp;40</PNPDEVICEID>
-      <SPEED>1000</SPEED>
-      <STATUS>Up</STATUS>
-      <TYPE>ethernet</TYPE>
-      <VIRTUALDEV>0</VIRTUALDEV>
-    </NETWORKS>
-    <OPERATINGSYSTEM>
-      <ARCH>64-bit</ARCH>
-      <BOOT_TIME>2017-05-09 13:17:07</BOOT_TIME>
-      <DNS_DOMAIN></DNS_DOMAIN>
-      <FQDN>WIN-UC3QD07D2PO</FQDN>
-      <FULL_NAME>Microsoft Windows Server 2008 R2 Standard </FULL_NAME>
-      <INSTALL_DATE>2017-04-04 16:56:36</INSTALL_DATE>
-      <KERNEL_NAME>MSWin32</KERNEL_NAME>
-      <KERNEL_VERSION>6.1.7600</KERNEL_VERSION>
-      <NAME>Windows</NAME>
-      <SERVICE_PACK /></OPERATINGSYSTEM>
-    <PRINTERS>
-      <DRIVER>Microsoft XPS Document Writer</DRIVER>
-      <NAME>Microsoft XPS Document Writer</NAME>
-      <NETWORK>0</NETWORK>
-      <PORT>XPSPort:</PORT>
-      <PRINTPROCESSOR>winprint</PRINTPROCESSOR>
-      <RESOLUTION>600x600</RESOLUTION>
-      <SHARED>0</SHARED>
-      <STATUS>Idle</STATUS>
-    </PRINTERS>
-    <RUDDER>
-      <AGENT>
-        <AGENT_NAME>cfengine-nova</AGENT_NAME>
-        <AGENT_CERT>-----BEGIN CERTIFICATE-----
-MIIFgTCCA2mgAwIBAgIUTOUJeR7kGBPch+AvEUcfL+fFP6wwDQYJKoZIhvcNAQEL
-BQAwUDEYMBYGA1UEAwwPV0lOLUdOR0RIUFZIVlROMTQwMgYKCZImiZPyLGQBAQwk
-YjczZWE0NTEtYzQyYS00MjBkLWE1NDAtNDdiNDQ1ZTU4MzEzMB4XDTE5MDcxMjE2
-MzEyOVoXDTI3MDkyODE2MzEyOVowUDEYMBYGA1UEAwwPV0lOLUdOR0RIUFZIVlRO
-MTQwMgYKCZImiZPyLGQBAQwkYjczZWE0NTEtYzQyYS00MjBkLWE1NDAtNDdiNDQ1
-ZTU4MzEzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzVWb3HUyZEnl
-zR9X4SZMORYmgw7iZZgs41cyfuskBX2dYa9m5MyQSUHkVGc5/pYPq0Qns9l8MJ7o
-ay+uQsg7ow36vViQm4hLZmkyCUs2BLdP28MiX1mHjWmYGqt+ZpkRgsZqYrGjwKzi
-5HA1IESMh0lPNAyKMbr0MUra+RdjijXvQAHGxRv1oHbrJsjBKsnscBx9/VIX8X3H
-J8i35rLwrij9O+Vl1t0z6UzAMSeLI5pFI6zuHifG66OJpcHqOq9WvG5Z5MVUspqe
-qmw+voI2UFFsbVy8q+RaIJt3Ogn6Z45iipkUSSZyAr3kbpj6XQmhpvL2/XBFfDcL
-7NKY1dPr4VV9NirtnVrk7XbOuOIRKptYYld+Dqolv03uBVO4Kx4jQc95aPyCxDeE
-0VCtDZCySITKCkgwQ861LeseCb2Vik+rvGO5QJ6Ssdo20WexjrCEIqWWsOc9KF0s
-ZI7gVeEOrR4+wBdvWZkBw6kJyG6gbR4yswxI/2DwS1sN0WZn83nozW2CdjKmQy18
-zXtP1Z3gMUY0YqQGsNG49kbf7nWjNHw+7rus6CcpmgyjDSkGrqNfgSn3JQSQn2FT
-+wazZ0t6DJxBB5HK7UywzA+0M+3q+RdSJ/WEH6u7famvMvxoiRA6M/ZbLINGdC/4
-omifV+i8xFEQWmosdhFx0QWounnIU3kCAwEAAaNTMFEwHQYDVR0OBBYEFByrvy4Y
-sNqPewRSj58sh4a7HkXTMB8GA1UdIwQYMBaAFByrvy4YsNqPewRSj58sh4a7HkXT
-MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAHT2n8zbHMdRQwka
-/lOdEQVsE++Jr5EMtwCHN/OzHEzFAkCeZwrZPgx0gwbrCDDujsKaNhgqo+2xjpuA
-CmzjsanuubvK5/lJ3vVarB/6qvaWARGYAZd9RjDxS0OCL43rPOEzYN8qaAXp8M+Y
-EOOw8bQOy/eJEs2oSdJzTILIqAKsXiZpW1G//bVL+baY6KjgI/2ZAml0NWX5wUsT
-/JrEvookXW0FqqlW6ukyTyx4zsHxLFJ48ydcVsdOYwrhSvfx21H9f/T7s3XlX3vh
-9HBZAQULDbMiwMu2OOskmNTegsKUXaqyAgtHRqWYORlhMv3afW2Sy86CbLuwrlww
-U3ytQVfgEmdIba03IlxzHTJL4NQn6WsZyzRzgLxJf2eJ2ACf7RX/Lf3tjW0OI+sq
-gQ7QpOVFPHficPfhiQkoThvHoc2kGMWL/WkENTPrcUZ6bhwIqJ+orK6dL4NGiJiB
-TuHOsJOv21y7l90fnaenL5lyBkMWeHfzYQkhGfcUN/55yWkjkrOkgeFUqXkyQQ1v
-Jq19A1ObBOe7axqsHvqeW4GJapXBjcWFRsq2ltP19lefKu27ikMWzEvkYJu1TX7t
-RmA82uwwqMa4eo5lXYkLCkVLyN3sSb39vqMb9C45y2fjBZv9OcpWCt/c0FwKz00K
-TZEW7+Ri43DsMyRwYiCafuVThL+J
------END CERTIFICATE-----
-        </AGENT_CERT>
-        <OWNER>win-uc3qd07d2po\vagrant</OWNER>
-        <POLICY_SERVER_HOSTNAME>192.168.43.2</POLICY_SERVER_HOSTNAME>
-        <POLICY_SERVER_UUID>root</POLICY_SERVER_UUID>
-      </AGENT>
-      <HOSTNAME>WIN-UC3QD07D2PO</HOSTNAME>
-      <UUID>D02D7F7A-49DC-443C-A98D-F3265E8721F9</UUID>
-    </RUDDER>
-    <SOFTWARES>
-      <ARCH>x86_64</ARCH>
-      <FROM>registry</FROM>
-      <GUID>FusionInventory-Agent</GUID>
-      <HELPLINK>http://forge.fusioninventory.org/projects/fusioninventory-agent</HELPLINK>
-      <NAME>FusionInventory Agent 2.3.17 (x64 edition)</NAME>
-      <PUBLISHER>FusionInventory Team</PUBLISHER>
-      <UNINSTALL_STRING>C:\Program Files\FusionInventory-Agent\Uninstall.exe</UNINSTALL_STRING>
-      <VERSION>2.3.17</VERSION>
-    </SOFTWARES>
-    <SOFTWARES>
-      <ARCH>x86_64</ARCH>
-      <FROM>registry</FROM>
-      <GUID>Oracle VM VirtualBox Guest Additions</GUID>
-      <NAME>Oracle VM VirtualBox Guest Additions 5.0.32</NAME>
-      <PUBLISHER>Oracle Corporation</PUBLISHER>
-      <UNINSTALL_STRING>C:\Program Files\Oracle\VirtualBox Guest Additions\uninst.exe</UNINSTALL_STRING>
-      <URL_INFO_ABOUT>http://www.virtualbox.org</URL_INFO_ABOUT>
-      <VERSION>5.0.32.0</VERSION>
-    </SOFTWARES>
-    <SOFTWARES>
-      <ARCH>x86_64</ARCH>
-      <FROM>registry</FROM>
-      <GUID>{1EF75B76-EBA6-4342-87F8-043CA9BBB3FD}</GUID>
-      <INSTALLDATE>09/05/2017</INSTALLDATE>
-      <NAME>CFEngine Nova</NAME>
-      <PUBLISHER>CFEngine AS</PUBLISHER>
-      <UNINSTALL_STRING>MsiExec.exe /I{1EF75B76-EBA6-4342-87F8-043CA9BBB3FD}</UNINSTALL_STRING>
-      <VERSION>3.7.4.65534</VERSION>
-    </SOFTWARES>
-    <SOFTWARES>
-      <ARCH>x86_64</ARCH>
-      <FROM>registry</FROM>
-      <NAME>Internet Explorer (64bit)</NAME>
-      <PUBLISHER>Microsoft Corporation</PUBLISHER>
-      <VERSION>8.0.7600.16385</VERSION>
-    </SOFTWARES>
-    <SOFTWARES>
-      <ARCH>i586</ARCH>
-      <FROM>registry</FROM>
-      <GUID>{22FA28AB-3C1B-438B-A8B5-E23892C8B567}</GUID>
-      <INSTALLDATE>09/05/2017</INSTALLDATE>
-      <NAME>NXLOG-CE</NAME>
-      <PUBLISHER>nxsec.com</PUBLISHER>
-      <UNINSTALL_STRING>MsiExec.exe /X{22FA28AB-3C1B-438B-A8B5-E23892C8B567}</UNINSTALL_STRING>
-      <VERSION>2.8.1248</VERSION>
-    </SOFTWARES>
-    <SOFTWARES>
-      <ARCH>i586</ARCH>
-      <FROM>registry</FROM>
-      <NAME>Internet Explorer</NAME>
-      <PUBLISHER>Microsoft Corporation</PUBLISHER>
-      <VERSION>8.0.7600.16385</VERSION>
-    </SOFTWARES>
-    <SOUNDS>
-      <CAPTION>Périphérique High Definition Audio</CAPTION>
-      <DESCRIPTION>Périphérique High Definition Audio</DESCRIPTION>
-      <MANUFACTURER>Microsoft</MANUFACTURER>
-      <NAME>Périphérique High Definition Audio</NAME>
-    </SOUNDS>
-    <STORAGES>
-      <DESCRIPTION>Lecteur de disque</DESCRIPTION>
-      <DISKSIZE>21661</DISKSIZE>
-      <FIRMWARE>1.0</FIRMWARE>
-      <INTERFACE>IDE</INTERFACE>
-      <MANUFACTURER>(Lecteurs de disque standard)</MANUFACTURER>
-      <MODEL>VBOX HARDDISK</MODEL>
-      <NAME>\\.\PHYSICALDRIVE0</NAME>
-      <SCSI_COID>0</SCSI_COID>
-      <SCSI_LUN>0</SCSI_LUN>
-      <SCSI_UNID>0</SCSI_UNID>
-      <SERIAL>VB320f0b43-8fc6de1d</SERIAL>
-      <SERIALNUMBER>VB320f0b43-8fc6de1d</SERIALNUMBER>
-      <TYPE>Fixed hard disk media</TYPE>
-    </STORAGES>
-    <STORAGES>
-      <DESCRIPTION>Lecteur de CD-ROM</DESCRIPTION>
-      <MANUFACTURER>(Lecteurs de CD-ROM standard)</MANUFACTURER>
-      <MODEL>VBOX CD-ROM ATA Device</MODEL>
-      <NAME>VBOX CD-ROM ATA Device</NAME>
-      <SCSI_COID>1</SCSI_COID>
-      <SCSI_LUN>0</SCSI_LUN>
-      <SCSI_UNID>0</SCSI_UNID>
-      <SERIALNUMBER />  <TYPE>UNKNOWN</TYPE>
-    </STORAGES>
-    <USBDEVICES>
-      <CAPTION>USB Tablet</CAPTION>
-      <MANUFACTURER>VirtualBox</MANUFACTURER>
-      <NAME>USB Tablet</NAME>
-      <PRODUCTID>0021</PRODUCTID>
-      <VENDORID>80EE</VENDORID>
-    </USBDEVICES>
-    <USERS>
-      <DOMAIN>WIN-UC3QD07D2PO</DOMAIN>
-      <LOGIN>vagrant</LOGIN>
-    </USERS>
-    <VERSIONCLIENT>FusionInventory-Agent_v2.3.17</VERSIONCLIENT>
-    <VIDEOS>
-      <NAME>VirtualBox Graphics Adapter</NAME>
-    </VIDEOS>
-  </CONTENT>
-  <DEVICEID>WIN-UC3QD07D2PO-2017-05-09-12-37-45</DEVICEID>
-<UUID>D02D7F7A-49DC-443C-A98D-F3265E8721F9</UUID>
-<USER>vagrant</USER>
-<AGENTSNAME>
-<AGENTNAME>Nova</AGENTNAME>
-</AGENTSNAME>
-<MACHINEID>B1F2330E-9D66-0C4E-B9CC-CD455F007AC1</MACHINEID>
-<CFKEY>-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEArHBxshmpqEuF9X6UR0hdkgL1ZzUfwEnbnBRHxVRgymsfFkI2H3G4
-h2rgMcJlwx7RTMlfpI81IS7F5AUlMZygTROXX/rKpMXqK4ss+X6M3mSCsGfk1S8E
-VYXyQ7VOXLzQdvJGiqgr0vAKg3UIMl5Du5PmopO84KZF7zSut4beIFNA8qSlAi3s
-Nc2TGS5RJrEIhvFT/aZ05hmG2FMxScdgGsA5vG02FUaL32Xxp4aZjXCmbt0M1wGi
-cY1jyDuuNXpGE2rmPxb0LHQXdTo342DJl+tJmPUxoMsqCf3r0S4W+rNEw14gAbFe
-Wyrmdk0V6uvRM2mc/soF63RCeZ+MmMOmZQIDAQAB
------END RSA PUBLIC KEY-----</CFKEY>
-<POLICY_SERVER>root</POLICY_SERVER>
-<SERVER_ROLES>
-</SERVER_ROLES>
-
-  <QUERY>INVENTORY</QUERY>
-</REQUEST>
diff --git a/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/WIN-AI8CLNPLOV5-2014-06-20-18-15-49.ocs b/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/WIN-AI8CLNPLOV5-2014-06-20-18-15-49.ocs
index 3f1925ab8e8..e9e6e6859e3 100644
--- a/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/WIN-AI8CLNPLOV5-2014-06-20-18-15-49.ocs
+++ b/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/WIN-AI8CLNPLOV5-2014-06-20-18-15-49.ocs
@@ -371,16 +371,6 @@
       <UNINSTALL_STRING>C:\Program Files\NVIDIA Corporation\nView\nViewSetup.exe -uninstall</UNINSTALL_STRING>
       <VERSION>6.14.10.13618</VERSION>
     </SOFTWARES>
-    <SOFTWARES>
-      <ARCH>x86_64</ARCH>
-      <FROM>registry</FROM>
-      <GUID>{6795D59A-91ED-49C4-81EF-BDCA9C9CD15D}</GUID>
-      <INSTALLDATE>20/06/2014</INSTALLDATE>
-      <NAME>CFEngine Nova</NAME>
-      <PUBLISHER>CFEngine AS</PUBLISHER>
-      <UNINSTALL_STRING>MsiExec.exe /I{6795D59A-91ED-49C4-81EF-BDCA9C9CD15D}</UNINSTALL_STRING>
-      <VERSION>3.6.0.65534</VERSION>
-    </SOFTWARES>
     <SOFTWARES>
       <ARCH>x86_64</ARCH>
       <FROM>registry</FROM>
diff --git a/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/rudder-tag/minimal-two-agents-fails.ocs b/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/rudder-tag/minimal-two-agents-fails.ocs
index 81d7a945591..94cbcd5fe97 100644
--- a/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/rudder-tag/minimal-two-agents-fails.ocs
+++ b/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/rudder-tag/minimal-two-agents-fails.ocs
@@ -17,7 +17,7 @@
         <POLICY_SERVER_UUID>root_1</POLICY_SERVER_UUID>
       </AGENT>
       <AGENT>
-        <AGENT_NAME>nova</AGENT_NAME>
+        <AGENT_NAME>cfengine-community</AGENT_NAME>
         <CFENGINE_KEY>-----BEGIN RSA PUBLIC KEY-----foo-----END RSA PUBLIC KEY-----</CFENGINE_KEY>
         <OWNER>root</OWNER>
         <POLICY_SERVER_HOSTNAME>192.168.110.47</POLICY_SERVER_HOSTNAME>
diff --git a/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/rudder-tag/minimal-two-agents.ocs b/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/rudder-tag/minimal-two-agents.ocs
index 16a644fc6e7..79d2f9642a9 100644
--- a/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/rudder-tag/minimal-two-agents.ocs
+++ b/webapp/sources/ldap-inventory/inventory-fusion/src/test/resources/fusion-inventories/rudder-tag/minimal-two-agents.ocs
@@ -17,7 +17,7 @@
         <POLICY_SERVER_UUID>root</POLICY_SERVER_UUID>
       </AGENT>
       <AGENT>
-        <AGENT_NAME>CFEngine-nova</AGENT_NAME>
+        <AGENT_NAME>CFEngine-community</AGENT_NAME>
         <AGENT_CERT>-----BEGIN RSA PUBLIC KEY-----foo-----END RSA PUBLIC KEY-----</AGENT_CERT>
         <OWNER>root</OWNER>
         <POLICY_SERVER_HOSTNAME>192.168.110.47</POLICY_SERVER_HOSTNAME>
diff --git a/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPreParsingDate.scala b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPreParsingDate.scala
new file mode 100644
index 00000000000..56e382d37ee
--- /dev/null
+++ b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestPreParsingDate.scala
@@ -0,0 +1,97 @@
+/*
+ *************************************************************************************
+ * Copyright 2024 Normation SAS
+ *************************************************************************************
+ *
+ * This file is part of Rudder.
+ *
+ * Rudder is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In accordance with the terms of section 7 (7. Additional Terms.) of
+ * the GNU General Public License version 3, the copyright holders add
+ * the following Additional permissions:
+ * Notwithstanding to the terms of section 5 (5. Conveying Modified Source
+ * Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
+ * Public License version 3, when you create a Related Module, this
+ * Related Module is not considered as a part of the work and may be
+ * distributed under the license agreement of your choice.
+ * A "Related Module" means a set of sources files including their
+ * documentation that, without modification of the Source Code, enables
+ * supplementary functions or services in addition to those offered by
+ * the Software.
+ *
+ * Rudder is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *************************************************************************************
+ */
+
+package com.normation.inventory.provisioning.fusion
+
+import better.files.Resource
+import com.normation.inventory.provisioning.fusion.PreInventoryParserCheckInventoryAge.*
+import com.normation.zio.*
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+import org.junit.runner.*
+import org.specs2.mutable.*
+import org.specs2.runner.*
+import scala.xml.XML
+import zio.*
+
+@RunWith(classOf[JUnitRunner])
+class TestPreParsingDate extends Specification {
+
+  val now       = OffsetDateTime.of(2023, 11, 16, 11, 26, 18, 0, ZoneOffset.UTC)
+  val centos8   = OffsetDateTime.of(2023, 11, 16, 11, 26, 18, 0, ZoneOffset.UTC)
+  val maxBefore = 1.day
+  val maxAfter  = 2.hours
+  val okDate    = centos8
+  val before    = now.minus(maxBefore).minusSeconds(1)
+  val after     = now.plus(maxAfter).plusSeconds(1)
+
+  "Pre inventory check age" should {
+    "be able to extract a date without timezone info in inventory" in {
+      val xml  = XML.load(Resource.getAsStream("fusion-inventories/8.0/centos8.ocs"))
+      val v    = extracDateValue(xml)
+      val date = parseInventoryDate(v)
+      (v === "2023-11-16 11:26:18") and
+      (date must beRight[OffsetDateTime](beEqualTo(centos8)))
+    }
+    "be able to extract a date  timezone info in inventory" in {
+      val xml  = XML.load(Resource.getAsStream("fusion-inventories/8.0/sles15sp4.ocs"))
+      val v    = extracDateValue(xml)
+      val date = parseInventoryDate(v)
+      (v === "2023-11-16 11:46:12+0100") and
+      (date must beRight[OffsetDateTime](beEqualTo(OffsetDateTime.of(2023, 11, 16, 11, 46, 12, 0, ZoneOffset.ofHours(1)))))
+    }
+    "accept date in range" in {
+      checkDate(okDate, now, maxBefore, maxAfter) === Right(())
+    }
+    "reject date before" in {
+      checkDate(before, now, maxBefore, maxAfter).left.map(_.fullMsg) must beLeft(
+        matching(s".*Inventory is too old.*")
+      )
+    }
+    "reject date after" in {
+      checkDate(after, now, maxBefore, maxAfter).left.map(_.fullMsg) must beLeft(
+        matching(s".*Inventory is too far in the future.*")
+      )
+    }
+    "reject centos8 inventory from 2023 (testing full process)" in {
+      val xml     = XML.load(Resource.getAsStream("fusion-inventories/8.0/centos8.ocs"))
+      val checker = new PreInventoryParserCheckInventoryAge(maxBefore, maxAfter)
+      ZioRuntime.unsafeRun(checker(xml).either).left.map(_.fullMsg) must beLeft(
+        matching(s".*Inventory is too old.*")
+      )
+    }
+  }
+}
diff --git a/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestReportParsing.scala b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestReportParsing.scala
index 6b84f6f53d5..8fb5ceaa60b 100644
--- a/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestReportParsing.scala
+++ b/webapp/sources/ldap-inventory/inventory-fusion/src/test/scala/com/normation/inventory/provisioning/fusion/TestReportParsing.scala
@@ -44,12 +44,13 @@ import com.normation.utils.StringUuidGeneratorImpl
 import com.normation.zio.ZioRuntime
 import java.io.File
 import net.liftweb.common.*
-import net.liftweb.json.JsonAST.*
 import org.junit.runner.*
 import org.specs2.mutable.*
 import org.specs2.runner.*
 import scala.annotation.nowarn
 import zio.*
+import zio.json.*
+import zio.json.ast.*
 
 /**
  * A simple test class to check that the demo data file is up to date
@@ -173,19 +174,17 @@ class TestInventoryParsing extends Specification with Loggable {
 
   "Custom properties" should {
     "correctly be parsed" in {
-      import net.liftweb.json.parse
-
       val expected = List(
-        CustomProperty("hook1_k1", JInt(42)),
-        CustomProperty("hook1_k2", JBool(value = true)),
-        CustomProperty("hook1_k3", JString("a string")),
+        CustomProperty("hook1_k1", Json.Num(42)),
+        CustomProperty("hook1_k2", Json.Bool(value = true)),
+        CustomProperty("hook1_k3", Json.Str("a string")),
         CustomProperty(
           "hook2",
-          parse("""
+          """
             { "some": "more"
             , "json": [1, 2, 3]
             , "deep": { "and": "deeper"}
-            }""")
+            }""".fromJson[Json].getOrElse(throw new IllegalArgumentException("error in test"))
         )
       )
 
@@ -198,8 +197,8 @@ class TestInventoryParsing extends Specification with Loggable {
 
     // after parsing, we also have custom property for original hostname
     val expected = List(
-      CustomProperty("rudder_override_hostname", JString("node1-overridden.rudder.local.override")),
-      CustomProperty("rudder_original_hostname", JString("node1.rudder.local"))
+      CustomProperty("rudder_override_hostname", Json.Str("node1-overridden.rudder.local.override")),
+      CustomProperty("rudder_original_hostname", Json.Str("node1.rudder.local"))
     )
 
     val inventory = parseRun("fusion-inventories/7.1/node1-4d3a43bc-8508-46a2-92d7-cfe7320309a5.ocs")
@@ -326,17 +325,17 @@ class TestInventoryParsing extends Specification with Loggable {
         inventory.node.customProperties === List(
           CustomProperty(
             "cpu_vulnerabilities",
-            JObject(
-              List(
-                JField(
+            Json.Obj(
+              Chunk(
+                (
                   "spectre_v2",
-                  JObject(List(JField("status", JString("vulnerable")), JField("details", JString("Retpoline without IBPB"))))
+                  Json.Obj(Chunk(("status", Json.Str("vulnerable")), ("details", Json.Str("Retpoline without IBPB"))))
                 ),
-                JField(
+                (
                   "spectre_v1",
-                  JObject(List(JField("status", JString("mitigated")), JField("details", JString("Load fences"))))
+                  Json.Obj(Chunk(("status", Json.Str("mitigated")), ("details", Json.Str("Load fences"))))
                 ),
-                JField("meltdown", JObject(List(JField("status", JString("mitigated")), JField("details", JString("PTI")))))
+                ("meltdown", Json.Obj(Chunk(("status", Json.Str("mitigated")), ("details", Json.Str("PTI")))))
               )
             )
           )
diff --git a/webapp/sources/ldap-inventory/inventory-provisioning-core/pom.xml b/webapp/sources/ldap-inventory/inventory-provisioning-core/pom.xml
index 71ced64a69c..1f4261ce7b1 100644
--- a/webapp/sources/ldap-inventory/inventory-provisioning-core/pom.xml
+++ b/webapp/sources/ldap-inventory/inventory-provisioning-core/pom.xml
@@ -35,7 +35,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation.inventory</groupId>
     <artifactId>inventory-parent</artifactId>
-    <version>8.2.4-SNAPSHOT</version>
+    <version>8.3.0~alpha1-SNAPSHOT</version>
   </parent>
 
   <artifactId>inventory-provisioning-core</artifactId>
diff --git a/webapp/sources/ldap-inventory/inventory-repository/pom.xml b/webapp/sources/ldap-inventory/inventory-repository/pom.xml
index 712def3dc30..463b720b5e3 100644
--- a/webapp/sources/ldap-inventory/inventory-repository/pom.xml
+++ b/webapp/sources/ldap-inventory/inventory-repository/pom.xml
@@ -34,7 +34,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation.inventory</groupId>
     <artifactId>inventory-parent</artifactId>
-    <version>8.2.4-SNAPSHOT</version>
+    <version>8.3.0~alpha1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>inventory-repository</artifactId>
diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/main/resources/ldap/inventory.schema b/webapp/sources/ldap-inventory/inventory-repository/src/main/resources/ldap/inventory.schema
index 3092fae7634..7816c64049c 100644
--- a/webapp/sources/ldap-inventory/inventory-repository/src/main/resources/ldap/inventory.schema
+++ b/webapp/sources/ldap-inventory/inventory-repository/src/main/resources/ldap/inventory.schema
@@ -303,7 +303,7 @@ attributetype ( InventoryAttributes:300.12
 
 attributetype ( InventoryAttributes:300.13
   NAME 'agentName'
-  DESC 'List of name of the agent (Nova, Community, ...)'
+  DESC 'List of name of the agent (Community, DSC,...)'
   EQUALITY caseIgnoreMatch
   SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryMapper.scala b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryMapper.scala
index 9a443b7ddf7..7e44e9dd5a3 100644
--- a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryMapper.scala
+++ b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/InventoryMapper.scala
@@ -51,9 +51,9 @@ import com.normation.ldap.sdk.schema.LDAPObjectClass
 import com.softwaremill.quicklens.*
 import com.unboundid.ldap.sdk.{Version as _, *}
 import java.net.InetAddress
-import net.liftweb.json.*
 import org.joda.time.DateTime
 import zio.*
+import zio.json.*
 import zio.syntax.*
 
 sealed trait InventoryMappingRudderError extends RudderError
@@ -89,50 +89,6 @@ object InventoryMappingResult {
 
 }
 
-////////////////// Node Custom Properties /////////////////////////
-object CustomPropertiesSerialization {
-
-  import net.liftweb.json.*
-
-  /*
-   * CustomProperty serialization must follow NodeProperties one:
-   * {"name":"propkey","value": JVALUE}
-   * with JVALUE either a simple type (string, int, etc) or a valid JSON
-   */
-  implicit class Serialise(val cs: CustomProperty) extends AnyVal {
-    def toJson: String = {
-      Serialization.write(cs)(DefaultFormats)
-    }
-  }
-
-  implicit class Unserialize(val json: String) extends AnyVal {
-    def toCustomProperty: Either[Throwable, CustomProperty] = {
-      implicit val formats: Formats = DefaultFormats
-      try {
-        Right(Serialization.read[CustomProperty](json))
-      } catch {
-        case ex: Exception => Left(ex)
-      }
-    }
-  }
-}
-
-class DateTimeSerializer extends Serializer[DateTime] {
-  private val IntervalClass = classOf[DateTime]
-
-  def deserialize(implicit format: Formats): PartialFunction[(TypeInfo, JValue), DateTime] = {
-    case (TypeInfo(IntervalClass, _), json) =>
-      json match {
-        case JObject(JField("datetime", JString(date)) :: Nil) => DateTime.parse(date)
-        case x                                                 => throw new MappingException("Can't convert " + x + " to DateTime")
-      }
-  }
-
-  def serialize(implicit format: Formats): PartialFunction[Any, JValue] = {
-    case date: DateTime => JObject(JField("datetime", JString(date.toString())) :: Nil)
-  }
-}
-
 object InventoryMapper {
   def getSoftwareUpdate(entry: LDAPEntry): IOResult[Chunk[SoftwareUpdate]] = {
     ZIO
@@ -159,8 +115,6 @@ class InventoryMapper(
     removedDit:  InventoryDit
 ) {
 
-  implicit val formats: Formats = DefaultFormats + new DateTimeSerializer
-
   ////////////////////////////////////////////////////////////
   ///////////////////////// Software /////////////////////////
   ////////////////////////////////////////////////////////////
@@ -741,30 +695,6 @@ class InventoryMapper(
     }
   }
 
-  ////////////////// Node Custom Properties /////////////////////////
-  object CustomPropertiesSerialization {
-
-    import net.liftweb.json.*
-
-    /*
-     * CustomProperty serialization must follow NodeProperties one:
-     * {"name":"propkey","value": JVALUE}
-     * with JVALUE either a simple type (string, int, etc) or a valid JSON
-     */
-    implicit class Serialise(cs: CustomProperty) {
-      def toJson: String = {
-        Serialization.write(cs)(DefaultFormats)
-      }
-    }
-
-    implicit class Unserialize(json: String) {
-      def toCustomProperty: IOResult[CustomProperty] = {
-        implicit val formats: Formats = DefaultFormats
-        IOResult.attempt(Serialization.read[CustomProperty](json))
-      }
-    }
-  }
-
   ////////////////// Node/ NodeInventory /////////////////////////
 
   private def createNodeModelFromServer(server: NodeInventory): LDAPEntry = {
@@ -857,8 +787,6 @@ class InventoryMapper(
   // This won't include the Process in it, it needs to be done with method
   // processesFromNode below
   def treeFromNode(server: NodeInventory): LDAPTree = {
-    import com.normation.inventory.domain.AgentInfoSerialisation.*
-
     val dit  = ditService.getDit(server.main.status)
     // the root entry of the tree: the machine inventory
     val root = rootEntryFromNode(server)
@@ -877,9 +805,9 @@ class InventoryMapper(
     root.setOpt(server.lastLoggedUserTime, A_LAST_LOGGED_USER_TIME, (x: DateTime) => GeneralizedTime(x).toString)
     root.setOpt(server.inventoryDate, A_INVENTORY_DATE, (x: DateTime) => GeneralizedTime(x).toString)
     root.setOpt(server.receiveDate, A_RECEIVE_DATE, (x: DateTime) => GeneralizedTime(x).toString)
-    root.resetValuesTo(A_AGENTS_NAME, server.agents.map(x => x.toJsonString)*)
+    root.resetValuesTo(A_AGENTS_NAME, server.agents.map(x => x.toJson)*)
     root.resetValuesTo(A_SOFTWARE_DN, server.softwareIds.map(x => dit.SOFTWARE.SOFT.dn(x).toString)*)
-    root.resetValuesTo(A_EV, server.environmentVariables.map(x => Serialization.write(x))*)
+    root.resetValuesTo(A_EV, server.environmentVariables.map(_.toJson)*)
     root.resetValuesTo(A_LIST_OF_IP, server.serverIps.distinct*)
     // we don't know their dit...
     root.resetValuesTo(
@@ -894,12 +822,8 @@ class InventoryMapper(
       root.resetValuesTo(A_TIMEZONE_NAME, timezone.name)
       root.resetValuesTo(A_TIMEZONE_OFFSET, timezone.offset)
     }
-    server.customProperties.foreach { cp =>
-      import CustomPropertiesSerialization.Serialise
-      root.addValues(A_CUSTOM_PROPERTY, cp.toJson)
-    }
+    server.customProperties.foreach(cp => root.addValues(A_CUSTOM_PROPERTY, cp.toJson))
     server.softwareUpdates.foreach { s =>
-      import zio.json.*
       import JsonSerializers.implicits.*
       root.addValues(A_SOFTWARE_UPDATE, s.toJson)
     }
@@ -924,7 +848,7 @@ class InventoryMapper(
   // map process from node
   def processesFromNode(node: NodeInventory): Seq[String] = {
     // convert the processes
-    node.processes.map(x => Serialization.write(x))
+    node.processes.map(_.toJson)
   }
 
   // Create the entry with only processes
@@ -1073,31 +997,28 @@ class InventoryMapper(
       hostname       <- entry.required(A_HOSTNAME).toIO
       rootUser       <- entry.required(A_ROOT_USER).toIO
       policyServerId <- entry.required(A_POLICY_SERVER_UUID).toIO
-      publicKeys      = entry.valuesFor(A_PKEYS).map(Some(_))
-      agentNames     <- {
-        val agents        = entry.valuesFor(A_AGENTS_NAME).toSeq.map(Some(_))
-        val agentWithKeys = agents.zipAll(publicKeys, None, None).filter(_._1.isDefined)
-        ZIO
-          .foreach(agentWithKeys) {
-            case (opt, key) =>
-              ((opt, key) match {
-                case (Some(agent), key) =>
-                  AgentInfoSerialisation
-                    .parseJson(agent, key)
-                    .chainError(s"Error when parsing agent security token '${agent}'")
-                case (None, _)          =>
-                  InventoryMappingRudderError.MissingMandatory("Error when parsing agent security token: agent is undefined").fail
-              }).foldZIO(
-                err =>
-                  InventoryDataLogger.error(
-                    s"Error when parsing agent information for node '${id.value}': that agent will be " +
-                    s"ignored for the node, which will likely cause problem like the node being ignored: ${err.fullMsg}"
-                  ) *> None.succeed,
-                ok => Some(ok).succeed
-              )
-          }
-          .map(_.flatten)
-      }
+      agentNames     <- ZIO
+                          .foreach(entry.valuesFor(A_AGENTS_NAME).toList) {
+                            case agent =>
+                              agent.fromJson[AgentInfo].toIO.chainError(s"Error when parsing agent security token '${agent}'")
+                          }
+                          .foldZIO(
+                            err =>
+                              InventoryDataLogger.error(
+                                s"Error when parsing agent information for node '${id.value}': that agent will be " +
+                                s"ignored for the node, which will likely cause problem like the node being ignored: ${err.fullMsg}"
+                              ) *> Nil.succeed,
+                            _.distinct match {
+                              case Nil      => Nil.succeed
+                              case a :: Nil => List(a).succeed
+                              // we must have exactly one agent
+                              case several  =>
+                                InventoryDataLogger.error(
+                                  s"Error: inventory for node '${id.value}' has several (${several.size}) different agents defined, which is not supported. Ignoring all agents."
+                                ) *> Nil.succeed
+                            }
+                          )
+
       // now, look for the OS type
       osDetails      <- mapOsDetailsFromEntry(entry).toIO
       // optional information
@@ -1109,17 +1030,42 @@ class InventoryMapper(
 
       lastLoggedUser     = entry(A_LAST_LOGGED_USER)
       lastLoggedUserTime = entry.getAsGTime(A_LAST_LOGGED_USER_TIME).map(_.dateTime)
-      publicKeys         = entry.valuesFor(A_PKEYS).map(k => PublicKey(k))
-      ev                 = entry.valuesFor(A_EV).toSeq.map(Serialization.read[EnvironmentVariable](_))
-      process            = entry.valuesFor(A_PROCESS).toSeq.map(Serialization.read[Process](_))
-      softwareIds        = entry.valuesFor(A_SOFTWARE_DN).toSeq.flatMap(x => dit.SOFTWARE.SOFT.idFromDN(new DN(x)).toOption)
+      ev                <- ZIO.foldLeft(entry.valuesFor(A_EV))(List.empty[EnvironmentVariable]) {
+                             case (l, json) =>
+                               json.fromJson[EnvironmentVariable] match {
+                                 case Left(err) =>
+                                   InventoryProcessingLogger
+                                     .warn(s"Error when deserializing environment variable, ignoring it: ${json} ; error: ${err}") *> l.succeed
+                                 case Right(ev) => (ev :: l).succeed
+                               }
+                           }
+      process           <- ZIO.foldLeft(entry.valuesFor(A_PROCESS))(List.empty[Process]) {
+                             case (l, json) =>
+                               json.fromJson[Process] match {
+                                 case Left(err) =>
+                                   InventoryProcessingLogger
+                                     .warn(s"Error when deserializing process, ignoring it: ${json} ; error: ${err}") *> l.succeed
+                                 case Right(p)  => (p :: l).succeed
+                               }
+                           }
+      softwareIds       <- ZIO.foldLeft(entry.valuesFor(A_SOFTWARE_DN))(List.empty[SoftwareUuid]) {
+                             case (l, x) =>
+                               dit.SOFTWARE.SOFT.idFromDN(new DN(x)) match {
+                                 case Left(err) =>
+                                   InventoryProcessingLogger
+                                     .warn(
+                                       s"Error when deserializing software, ignoring it: ${x} ; error: ${err.msg}"
+                                     ) *> l.succeed
+                                 case Right(s)  => (s :: l).succeed
+                               }
+                           }
       machineId         <- mapSeqStringToMachineIdAndStatus(entry.valuesFor(A_CONTAINER_DN)).toList match {
                              case Nil                 => None.succeed
                              case m :: Nil            => Some(m).succeed
                              case l @ (m1 :: m2 :: _) =>
                                InventoryProcessingLogger.error(
                                  "Several machine were registered for a node. That is not supported. " +
-                                 "The first in the following list will be choosen, but you may encouter strange " +
+                                 "The first in the following list will be chosen, but you may encounter strange " +
                                  "results in the future: %s".format(
                                    l.map { case (id, status) => "%s [%s]".format(id.value, status.name) }.mkString(" ; ")
                                  )
@@ -1134,28 +1080,28 @@ class InventoryMapper(
                              case (Some(tzName), Some(offset)) => Some(NodeTimezone(tzName, offset))
                              case _                            => None
                            }
-      customProperties  <- {
-        import CustomPropertiesSerialization.Unserialize
-        ZIO.foreach(entry.valuesFor(A_CUSTOM_PROPERTY))(a => {
-          a.toCustomProperty.foldZIO(
-            err =>
-              InventoryProcessingLogger.warn(
-                Chained(s"Error when deserializing node inventory custom property (ignoring that property)", err).fullMsg
-              ) *> None.succeed,
-            p => Some(p).succeed
-          )
-        })
-      }
-      softwareUpdates   <- InventoryMapper.getSoftwareUpdate(entry)
-      main               = NodeSummary(
-                             id,
-                             inventoryStatus,
-                             rootUser,
-                             hostname,
-                             osDetails,
-                             NodeId(policyServerId),
-                             keyStatus
-                           )
+      customProperties  <- ZIO.foreach(entry.valuesFor(A_CUSTOM_PROPERTY)) { a =>
+                             a.fromJson[CustomProperty] match {
+                               case Left(err) =>
+                                 InventoryProcessingLogger.warn(
+                                   Unexpected(
+                                     s"Error when deserializing node inventory custom property (ignoring that property): ${a}; error: ${err}"
+                                   ).fullMsg
+                                 ) *> None.succeed
+                               case Right(p)  => Some(p).succeed
+                             }
+                           }
+
+      softwareUpdates <- InventoryMapper.getSoftwareUpdate(entry)
+      main             = NodeSummary(
+                           id,
+                           inventoryStatus,
+                           rootUser,
+                           hostname,
+                           osDetails,
+                           NodeId(policyServerId),
+                           keyStatus
+                         )
     } yield {
       NodeInventory(
         main,
diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/LDAPConstants.scala b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/LDAPConstants.scala
index 56ec9de0c3a..a4977fec365 100644
--- a/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/LDAPConstants.scala
+++ b/webapp/sources/ldap-inventory/inventory-repository/src/main/scala/com/normation/inventory/ldap/core/LDAPConstants.scala
@@ -57,7 +57,6 @@ object LDAPConstants {
   val A_HOSTNAME           = "nodeHostname"
   val A_ROOT_USER          = "localAdministratorAccountName"
   val A_DEF                = "definition"
-  val A_PKEYS              = "publicKey"
   val A_AGENTS_NAME        = "agentName"
   val A_DESCRIPTION        = "description"
   val A_REV_ID             = "revision"
@@ -398,7 +397,6 @@ object LDAPConstants {
     may = Set(
       A_NAME,
       A_DESCRIPTION,
-      A_PKEYS,
       A_AGENTS_NAME,
       A_CONTAINER_DN,
       A_SOFTWARE_DN,
diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/test/resources/ldap-data/schema/099-0-inventory.ldif b/webapp/sources/ldap-inventory/inventory-repository/src/test/resources/ldap-data/schema/099-0-inventory.ldif
index a860ee72e78..f8bc8307ccc 100644
--- a/webapp/sources/ldap-inventory/inventory-repository/src/test/resources/ldap-data/schema/099-0-inventory.ldif
+++ b/webapp/sources/ldap-inventory/inventory-repository/src/test/resources/ldap-data/schema/099-0-inventory.ldif
@@ -216,12 +216,6 @@ attributeTypes: ( 1.3.6.1.4.1.35061.1.1.300.7
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
   EQUALITY generalizedTimeMatch
   ORDERING generalizedTimeOrderingMatch )
-attributeTypes: ( 1.3.6.1.4.1.35061.1.1.300.8
-  NAME 'publicKey'
-  DESC 'A public key in PEM representation'
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
 attributeTypes: ( 1.3.6.1.4.1.35061.1.1.300.9
   NAME 'nodeTechniques'
   DESC 'Name of techniques applied to that node'
@@ -248,7 +242,7 @@ attributeTypes: ( 1.3.6.1.4.1.35061.1.1.300.12
   ORDERING generalizedTimeOrderingMatch )
 attributeTypes: ( 1.3.6.1.4.1.35061.1.1.300.13
   NAME 'agentName'
-  DESC 'List of name of the agent (Nova, Community, ...)'
+  DESC 'List of name of the agent (Dsc, Community, ...)'
   EQUALITY caseIgnoreMatch
   SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
@@ -856,7 +850,7 @@ objectClasses: ( 1.3.6.1.4.1.35061.1.2.14
   ABSTRACT
   MUST ( nodeId $ localAdministratorAccountName $ nodeHostname $
   policyServerId $ osName $ osVersion $ osKernelVersion )
-  MAY ( description $ cn $ publicKey $ agentName $ hostedVm $ container $
+  MAY ( description $ cn $ agentName $ hostedVm $ container $
   software $  localAccountName $ osServicePack $
   nodeTechniques $ ram $ swap $ confirmed $
   inventoryDate $ receiveDate $ ipHostNumber $ osFullName $
diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestInventory.scala b/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestInventory.scala
index 4417671b9a1..a9a80165921 100644
--- a/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestInventory.scala
+++ b/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestInventory.scala
@@ -206,7 +206,38 @@ class TestInventory extends Specification {
       AgentInfo(
         AgentType.CfeCommunity,
         None,
-        Certificate("""-----BEGIN CERTIFICATE-----\ndummy-certificate-value\n-----END CERTIFICATE-----)"""),
+        Certificate("""-----BEGIN CERTIFICATE-----
+                      |MIIFTjCCAzagAwIBAgIUfa0+S+CyJahRzuwNNOFLNQQjIH8wDQYJKoZIhvcNAQEL
+                      |BQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MB4XDTI0MDMwMTExMDIxM1oXDTM0
+                      |MDIyNzExMDIxM1owFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MIICIjANBgkqhkiG
+                      |9w0BAQEFAAOCAg8AMIICCgKCAgEAsmBUYI1A5vqkOTCW24m/mQhBaRu4WaAUXDAr
+                      |ArdIAAMN0KyHhEXP1/X32Flw90E0VjtUH4P+DYLBozXYWhJrUxdWLyn3TRSbv3Kr
+                      |pXoCWhMhMp8OK2s/mG+rfiMpTXIwaMhPnBaJFNV3c+bkijGAMHtFjl3+leXJvNZ7
+                      |w3bIg4cA3e77kz7EWMyqxOUvvLMyY6wpd03ahe/By+iLgtOkgUwl9hMqMU8tJeaz
+                      |NIeUporsHk5rrk8bSf6Mxxdknm43Sk6oflnueNCIUFdd4rS2JLieMugsTh8n/oH+
+                      |k29ZyirE3ikhftmZ3vY8GQ3IcIzaXwiAOGnCKcze79zVx5jmOTGSZitGZaU/cZc6
+                      |LjzEp+ZDmE8caVIksiA+hIlaZeBXNHB+YRv/gV1Rbt7kS1am+XUZJSfVFf+99YqE
+                      |lZ5p0hqJsczkBb2RuMxWxxsWO3pesPUNCuL/yaeggTIp7eK06tQWi1EfXr40ctrf
+                      |oimbzMAKNBpRKWruL7652SlF75Usaq+PaPi1TtqYQjLRZmbpr+IR4uMeKnEMIZPw
+                      |3dLDKBV6d71XkTAalCmcJU+fgYrRmgz1dEnaZDIXY+f+fYR15hsFpDrZ0avHgkzJ
+                      |ca/nT/rKeX7136BttxVSbZaTU9hnmjAvl+v0BF+JUWPQ3VPTcrmyUNAICt8xdVae
+                      |uo1tsvkCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSRG0uHQRIA
+                      |gl91YqzSjaeaw+F7PDBSBgNVHSMESzBJgBSRG0uHQRIAgl91YqzSjaeaw+F7PKEb
+                      |pBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3ghR9rT5L4LIlqFHO7A004Us1BCMg
+                      |fzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBABR2vTH/6WlqjaTZ/hQc
+                      |B+crqRlFimqCiVTRdX6qfkt0tLX2dK6scHNTBT04ORLjLTAn0KbcOUz3k6i0mIqB
+                      |nG5UjqCFEQR+i2V4Hz7aK6+7LBQuwXWRhDhvO5xMn7MxjvP0LGgNf5iiA4r/N22L
+                      |EMc1prDESIOGmWdKg9XlfLxd877R2d8/3hXyT82Y2uJHO25b53skj4pbUOWLsGSw
+                      |d4FBNnWqM+7Hbg2v9xFvmtfs2G2Inqk4Xjtjnj8qkVk3ft6KzClUIMXGXQ8QqaRp
+                      |YPkTJm5g2UBYDiguD/tlz3VmbsNYU6fkap7DKqhttbaseIx1zDwdAv4jtVOWDyjx
+                      |Wq4b7pljYiczfRa84X/9v1x05pT3raELy5udY+Pxmnz+hOXOM+jY5bzSKS24b8rS
+                      |5Sklmutm0IdflMKd5vNrXd9yPFLu3QzN50ArzHHXczwBLgjaMlZsPAp1wITlqM7+
+                      |WCjy3qM5/KgAjH3L24MPTq23o9PokBVh1NH7lesZqgJPgsj+OG7FMQDvKzg7ytrs
+                      |QlIDF1c8Ko+9/RrnRVAS8C4GZOqbmMmfJjMp09GBz2d0ixlTusF6m6iwfIVMf/nI
+                      |P/V0D7STRiV62cfnZ3e0w8kIeZwWAgXI7RMHJU3skLyurUu8yxkp635IQyzQsW2A
+                      |Yo7t7O7fxjqD9yVI2QfkERZ7
+                      |-----END CERTIFICATE-----
+                      |""".stripMargin),
         Set()
       )
     )
diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestNodeUnserialisation.scala b/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestNodeUnserialisation.scala
index 495fa2a3d87..aecaedbecae 100644
--- a/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestNodeUnserialisation.scala
+++ b/webapp/sources/ldap-inventory/inventory-repository/src/test/scala/com/normation/inventory/ldap/core/TestNodeUnserialisation.scala
@@ -45,6 +45,8 @@ import com.unboundid.ldap.sdk.Entry
 import org.junit.runner.*
 import org.specs2.mutable.*
 import org.specs2.runner.*
+import zio.*
+import zio.json.ast.*
 
 /**
  * Test node unserialisation frome entries, in particular
@@ -76,62 +78,34 @@ class TestNodeUnserialisation extends Specification {
     new InventoryMapper(inventoryDitService, pendingNodesDitImpl, acceptedNodesDitImpl, removedNodesDitImpl)
   }
 
-  val linux41Ldif: String = {
-    """dn: nodeId=root,ou=Nodes,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration
-      |objectClass: top
+  val dsc61Ldif: String = {
+    """dn: nodeId=aff80e6d-68fb-43dd-9a33-a5204b7e3153,ou=Nodes,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration
+      |nodeId: aff80e6d-68fb-43dd-9a33-a5204b7e3153
       |objectClass: node
-      |objectClass: unixNode
-      |objectClass: linuxNode
-      |nodeId: root
-      |localAdministratorAccountName: root
-      |nodeHostname: server.rudder.local
-      |policyServerId: root
-      |osFullName: Debian GNU/Linux 9.4 (stretch)
-      |keyStatus: certified
-      |ram: 1572864000
-      |swap: 1072693248
-      |osArchitectureType: x86_64
-      |lastLoggedUser: vagrant
-      |lastLoggedUserTime: 20000714125900.000Z
-      |publicKey: publickey
-      |timezoneName: UTC
-      |timezoneOffset: +0000
-      |osKernelVersion: 4.9.0-6-amd64
-      |osName: Debian
-      |osVersion: 9.4
-      |inventoryDate: 20180713130033.000Z
-      |receiveDate: 20180713130534.772Z
-      |agentName: {"agentType":"Community","version":"4.1.14"}""".stripMargin
-  }
-
-  val linux42Ldif: String = {
-    """dn: nodeId=root,ou=Nodes,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration
       |objectClass: top
-      |objectClass: node
-      |objectClass: unixNode
-      |objectClass: linuxNode
-      |nodeId: root
-      |localAdministratorAccountName: root
-      |nodeHostname: server.rudder.local
+      |objectClass: windowsNode
+      |osName: Windows2012R2
+      |windowsRegistrationCompany: Vagrant
+      |windowsKey: PN79T-M7QXW-R8FVX-FDF89-7XKCB
+      |windowsId: 00252-00105-69793-AA339
+      |osFullName: Microsoft Windows Server 2012 R2 Standard
+      |osVersion: N/A
+      |osKernelVersion: 6.3.9600
+      |localAdministratorAccountName: vagrant-2012-r2
+      |nodeHostname: vagrant-2012-r2
+      |keyStatus: undefined
       |policyServerId: root
-      |osFullName: Ubuntu 16.04 LTS
-      |keyStatus: certified
-      |ram: 1568669696
-      |swap: 804257792
+      |ram: 535822336
       |osArchitectureType: x86_64
       |lastLoggedUser: vagrant
-      |timezoneName: EDT
-      |timezoneOffset: -0400
-      |osKernelVersion: 4.4.0-21-generic
-      |osName: Ubuntu
-      |osVersion: 16.04
-      |lastLoggedUserTime: 20000710133300.000Z
-      |inventoryDate: 20180716134036.000Z
-      |receiveDate: 20180716134537.505Z
-      |agentName: {"agentType":"cfengine-community","version":"4.2.8","securityToken":{"value":"publickey","type":"publicKey"}}""".stripMargin
+      |inventoryDate: 20180716104920.000Z
+      |receiveDate: 20180716135035.945Z
+      |agentName: {"agentType":"dsc","version":"6.1-1.9","securityToken": {"value":"-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUfa0+S+CyJahRzuwNNOFLNQQjIH8wDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MB4XDTI0MDMwMTExMDIxM1oXDTM0\nMDIyNzExMDIxM1owFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAsmBUYI1A5vqkOTCW24m/mQhBaRu4WaAUXDAr\nArdIAAMN0KyHhEXP1/X32Flw90E0VjtUH4P+DYLBozXYWhJrUxdWLyn3TRSbv3Kr\npXoCWhMhMp8OK2s/mG+rfiMpTXIwaMhPnBaJFNV3c+bkijGAMHtFjl3+leXJvNZ7\nw3bIg4cA3e77kz7EWMyqxOUvvLMyY6wpd03ahe/By+iLgtOkgUwl9hMqMU8tJeaz\nNIeUporsHk5rrk8bSf6Mxxdknm43Sk6oflnueNCIUFdd4rS2JLieMugsTh8n/oH+\nk29ZyirE3ikhftmZ3vY8GQ3IcIzaXwiAOGnCKcze79zVx5jmOTGSZitGZaU/cZc6\nLjzEp+ZDmE8caVIksiA+hIlaZeBXNHB+YRv/gV1Rbt7kS1am+XUZJSfVFf+99YqE\nlZ5p0hqJsczkBb2RuMxWxxsWO3pesPUNCuL/yaeggTIp7eK06tQWi1EfXr40ctrf\noimbzMAKNBpRKWruL7652SlF75Usaq+PaPi1TtqYQjLRZmbpr+IR4uMeKnEMIZPw\n3dLDKBV6d71XkTAalCmcJU+fgYrRmgz1dEnaZDIXY+f+fYR15hsFpDrZ0avHgkzJ\nca/nT/rKeX7136BttxVSbZaTU9hnmjAvl+v0BF+JUWPQ3VPTcrmyUNAICt8xdVae\nuo1tsvkCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSRG0uHQRIA\ngl91YqzSjaeaw+F7PDBSBgNVHSMESzBJgBSRG0uHQRIAgl91YqzSjaeaw+F7PKEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3ghR9rT5L4LIlqFHO7A004Us1BCMg\nfzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBABR2vTH/6WlqjaTZ/hQc\nB+crqRlFimqCiVTRdX6qfkt0tLX2dK6scHNTBT04ORLjLTAn0KbcOUz3k6i0mIqB\nnG5UjqCFEQR+i2V4Hz7aK6+7LBQuwXWRhDhvO5xMn7MxjvP0LGgNf5iiA4r/N22L\nEMc1prDESIOGmWdKg9XlfLxd877R2d8/3hXyT82Y2uJHO25b53skj4pbUOWLsGSw\nd4FBNnWqM+7Hbg2v9xFvmtfs2G2Inqk4Xjtjnj8qkVk3ft6KzClUIMXGXQ8QqaRp\nYPkTJm5g2UBYDiguD/tlz3VmbsNYU6fkap7DKqhttbaseIx1zDwdAv4jtVOWDyjx\nWq4b7pljYiczfRa84X/9v1x05pT3raELy5udY+Pxmnz+hOXOM+jY5bzSKS24b8rS\n5Sklmutm0IdflMKd5vNrXd9yPFLu3QzN50ArzHHXczwBLgjaMlZsPAp1wITlqM7+\nWCjy3qM5/KgAjH3L24MPTq23o9PokBVh1NH7lesZqgJPgsj+OG7FMQDvKzg7ytrs\nQlIDF1c8Ko+9/RrnRVAS8C4GZOqbmMmfJjMp09GBz2d0ixlTusF6m6iwfIVMf/nI\nP/V0D7STRiV62cfnZ3e0w8kIeZwWAgXI7RMHJU3skLyurUu8yxkp635IQyzQsW2A\nYo7t7O7fxjqD9yVI2QfkERZ7\n-----END CERTIFICATE-----\n","type":"certificate"}}
+      |timezoneName: Pacific Standard Time
+      |timezoneOffset: -0700""".stripMargin
   }
 
-  val linux43Ldif: String = {
+  val linux61Ldif: String = {
     """dn: nodeId=root,ou=Nodes,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration
       |objectClass: top
       |objectClass: node
@@ -153,40 +127,13 @@ class TestNodeUnserialisation extends Specification {
       |osArchitectureType: x86_64
       |timezoneOffset: +0200
       |timezoneName: Europe/Paris
-      |agentName: {"agentType":"cfengine-community","version":"4.3.2","securityToken":{"value":"publickey","type":"publicKey"}}
+      |agentName: {"agentType":"cfengine-community","version":"6.1.0","securityToken":{"value":"-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUfa0+S+CyJahRzuwNNOFLNQQjIH8wDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MB4XDTI0MDMwMTExMDIxM1oXDTM0\nMDIyNzExMDIxM1owFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAsmBUYI1A5vqkOTCW24m/mQhBaRu4WaAUXDAr\nArdIAAMN0KyHhEXP1/X32Flw90E0VjtUH4P+DYLBozXYWhJrUxdWLyn3TRSbv3Kr\npXoCWhMhMp8OK2s/mG+rfiMpTXIwaMhPnBaJFNV3c+bkijGAMHtFjl3+leXJvNZ7\nw3bIg4cA3e77kz7EWMyqxOUvvLMyY6wpd03ahe/By+iLgtOkgUwl9hMqMU8tJeaz\nNIeUporsHk5rrk8bSf6Mxxdknm43Sk6oflnueNCIUFdd4rS2JLieMugsTh8n/oH+\nk29ZyirE3ikhftmZ3vY8GQ3IcIzaXwiAOGnCKcze79zVx5jmOTGSZitGZaU/cZc6\nLjzEp+ZDmE8caVIksiA+hIlaZeBXNHB+YRv/gV1Rbt7kS1am+XUZJSfVFf+99YqE\nlZ5p0hqJsczkBb2RuMxWxxsWO3pesPUNCuL/yaeggTIp7eK06tQWi1EfXr40ctrf\noimbzMAKNBpRKWruL7652SlF75Usaq+PaPi1TtqYQjLRZmbpr+IR4uMeKnEMIZPw\n3dLDKBV6d71XkTAalCmcJU+fgYrRmgz1dEnaZDIXY+f+fYR15hsFpDrZ0avHgkzJ\nca/nT/rKeX7136BttxVSbZaTU9hnmjAvl+v0BF+JUWPQ3VPTcrmyUNAICt8xdVae\nuo1tsvkCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSRG0uHQRIA\ngl91YqzSjaeaw+F7PDBSBgNVHSMESzBJgBSRG0uHQRIAgl91YqzSjaeaw+F7PKEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3ghR9rT5L4LIlqFHO7A004Us1BCMg\nfzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBABR2vTH/6WlqjaTZ/hQc\nB+crqRlFimqCiVTRdX6qfkt0tLX2dK6scHNTBT04ORLjLTAn0KbcOUz3k6i0mIqB\nnG5UjqCFEQR+i2V4Hz7aK6+7LBQuwXWRhDhvO5xMn7MxjvP0LGgNf5iiA4r/N22L\nEMc1prDESIOGmWdKg9XlfLxd877R2d8/3hXyT82Y2uJHO25b53skj4pbUOWLsGSw\nd4FBNnWqM+7Hbg2v9xFvmtfs2G2Inqk4Xjtjnj8qkVk3ft6KzClUIMXGXQ8QqaRp\nYPkTJm5g2UBYDiguD/tlz3VmbsNYU6fkap7DKqhttbaseIx1zDwdAv4jtVOWDyjx\nWq4b7pljYiczfRa84X/9v1x05pT3raELy5udY+Pxmnz+hOXOM+jY5bzSKS24b8rS\n5Sklmutm0IdflMKd5vNrXd9yPFLu3QzN50ArzHHXczwBLgjaMlZsPAp1wITlqM7+\nWCjy3qM5/KgAjH3L24MPTq23o9PokBVh1NH7lesZqgJPgsj+OG7FMQDvKzg7ytrs\nQlIDF1c8Ko+9/RrnRVAS8C4GZOqbmMmfJjMp09GBz2d0ixlTusF6m6iwfIVMf/nI\nP/V0D7STRiV62cfnZ3e0w8kIeZwWAgXI7RMHJU3skLyurUu8yxkp635IQyzQsW2A\nYo7t7O7fxjqD9yVI2QfkERZ7\n-----END CERTIFICATE-----\n","type":"certificate"},"capabilities":["https"]}
       |inventoryDate: 20180717000031.000Z
       |receiveDate: 20180717000527.050Z
       |lastLoggedUserTime: 20000714084300.000Z""".stripMargin
   }
 
-  val dsc42Ldif: String = {
-    s"""dn: nodeId=aff80e6d-68fb-43dd-9a33-a5204b7e3153,ou=Nodes,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration
-       |nodeId: aff80e6d-68fb-43dd-9a33-a5204b7e3153
-       |objectClass: node
-       |objectClass: top
-       |objectClass: windowsNode
-       |osName: Windows2012R2
-       |windowsRegistrationCompany: Vagrant
-       |windowsKey: PN79T-M7QXW-R8FVX-FDF89-7XKCB
-       |windowsId: 00252-00105-69793-AA339
-       |osFullName: Microsoft Windows Server 2012 R2 Standard
-       |osVersion: N/A
-       |osKernelVersion: 6.3.9600
-       |localAdministratorAccountName: vagrant-2012-r2
-       |nodeHostname: vagrant-2012-r2
-       |keyStatus: undefined
-       |policyServerId: root
-       |ram: 535822336
-       |osArchitectureType: x86_64
-       |lastLoggedUser: vagrant
-       |inventoryDate: 20180716104920.000Z
-       |receiveDate: 20180716135035.945Z
-       |agentName: {"agentType":"dsc","version":"4.2-1.9","securityToken": {"value":"certificate","type":"certificate"}}
-       |timezoneName: Pacific Standard Time
-       |timezoneOffset: -0700""".stripMargin
-  }
-
-  val linux61Ldif: String = {
+  val linux70Ldif: String = {
     """dn: nodeId=root,ou=Nodes,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration
       |objectClass: top
       |objectClass: node
@@ -208,13 +155,24 @@ class TestNodeUnserialisation extends Specification {
       |osArchitectureType: x86_64
       |timezoneOffset: +0200
       |timezoneName: Europe/Paris
-      |agentName: {"agentType":"cfengine-community","version":"6.1.0","securityToken":{"value":"certificate","type":"certificate"},"capabilities":["https"]}
+      |agentName: {"agentType":"cfengine-community","version":"6.1.0","securityToken":{"type":"certificate","value":"-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUfa0+S+CyJahRzuwNNOFLNQQjIH8wDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MB4XDTI0MDMwMTExMDIxM1oXDTM0\nMDIyNzExMDIxM1owFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAsmBUYI1A5vqkOTCW24m/mQhBaRu4WaAUXDAr\nArdIAAMN0KyHhEXP1/X32Flw90E0VjtUH4P+DYLBozXYWhJrUxdWLyn3TRSbv3Kr\npXoCWhMhMp8OK2s/mG+rfiMpTXIwaMhPnBaJFNV3c+bkijGAMHtFjl3+leXJvNZ7\nw3bIg4cA3e77kz7EWMyqxOUvvLMyY6wpd03ahe/By+iLgtOkgUwl9hMqMU8tJeaz\nNIeUporsHk5rrk8bSf6Mxxdknm43Sk6oflnueNCIUFdd4rS2JLieMugsTh8n/oH+\nk29ZyirE3ikhftmZ3vY8GQ3IcIzaXwiAOGnCKcze79zVx5jmOTGSZitGZaU/cZc6\nLjzEp+ZDmE8caVIksiA+hIlaZeBXNHB+YRv/gV1Rbt7kS1am+XUZJSfVFf+99YqE\nlZ5p0hqJsczkBb2RuMxWxxsWO3pesPUNCuL/yaeggTIp7eK06tQWi1EfXr40ctrf\noimbzMAKNBpRKWruL7652SlF75Usaq+PaPi1TtqYQjLRZmbpr+IR4uMeKnEMIZPw\n3dLDKBV6d71XkTAalCmcJU+fgYrRmgz1dEnaZDIXY+f+fYR15hsFpDrZ0avHgkzJ\nca/nT/rKeX7136BttxVSbZaTU9hnmjAvl+v0BF+JUWPQ3VPTcrmyUNAICt8xdVae\nuo1tsvkCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSRG0uHQRIA\ngl91YqzSjaeaw+F7PDBSBgNVHSMESzBJgBSRG0uHQRIAgl91YqzSjaeaw+F7PKEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3ghR9rT5L4LIlqFHO7A004Us1BCMg\nfzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBABR2vTH/6WlqjaTZ/hQc\nB+crqRlFimqCiVTRdX6qfkt0tLX2dK6scHNTBT04ORLjLTAn0KbcOUz3k6i0mIqB\nnG5UjqCFEQR+i2V4Hz7aK6+7LBQuwXWRhDhvO5xMn7MxjvP0LGgNf5iiA4r/N22L\nEMc1prDESIOGmWdKg9XlfLxd877R2d8/3hXyT82Y2uJHO25b53skj4pbUOWLsGSw\nd4FBNnWqM+7Hbg2v9xFvmtfs2G2Inqk4Xjtjnj8qkVk3ft6KzClUIMXGXQ8QqaRp\nYPkTJm5g2UBYDiguD/tlz3VmbsNYU6fkap7DKqhttbaseIx1zDwdAv4jtVOWDyjx\nWq4b7pljYiczfRa84X/9v1x05pT3raELy5udY+Pxmnz+hOXOM+jY5bzSKS24b8rS\n5Sklmutm0IdflMKd5vNrXd9yPFLu3QzN50ArzHHXczwBLgjaMlZsPAp1wITlqM7+\nWCjy3qM5/KgAjH3L24MPTq23o9PokBVh1NH7lesZqgJPgsj+OG7FMQDvKzg7ytrs\nQlIDF1c8Ko+9/RrnRVAS8C4GZOqbmMmfJjMp09GBz2d0ixlTusF6m6iwfIVMf/nI\nP/V0D7STRiV62cfnZ3e0w8kIeZwWAgXI7RMHJU3skLyurUu8yxkp635IQyzQsW2A\nYo7t7O7fxjqD9yVI2QfkERZ7\n-----END CERTIFICATE-----\n"},"capabilities":["https"]}
       |inventoryDate: 20180717000031.000Z
       |receiveDate: 20180717000527.050Z
-      |lastLoggedUserTime: 20000714084300.000Z""".stripMargin
+      |lastLoggedUserTime: 20000714084300.000Z
+      |softwareUpdate: {"name":"rudder-agent","version":"7.0.0-realease","arch":"x86_64","from":"yum","kind":"none","description":"Local privilege escalation in pkexec","severity":"low","date":"2022-01-26T00:00:00Z","ids":["RHSA-2020-4566","CVE-2021-4034"]}
+      |customProperty: {"name":"simpleString","value":"a simple string"}
+      |customProperty: {"name":"someJson","value":{"foo":"bar","i":42,"b":true,"arr":[1,2]}}
+      |environmentVariable: {"name":"UPSTART_INSTANCE"}
+      |environmentVariable: {"name":"SHELL","value":"/bin/bash"}
+      |process: {"pid":193,"commandName":"/var/rudder/cfengine-community/bin/cf-serverd","cpuUsage":0.0,"memory":0.0,"started":"2014-09-25 09:45","tty":"?","user":"root","virtualMemory":36664}
+      |""".stripMargin
   }
 
-  val linux70Ldif: String = {
+  /*
+   * Mains changes from 7.0~8.2
+   * - process: commandName => name
+   */
+  val linux83Ldif: String = {
     """dn: nodeId=root,ou=Nodes,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration
       |objectClass: top
       |objectClass: node
@@ -236,11 +194,17 @@ class TestNodeUnserialisation extends Specification {
       |osArchitectureType: x86_64
       |timezoneOffset: +0200
       |timezoneName: Europe/Paris
-      |agentName: {"agentType":"cfengine-community","version":"6.1.0","securityToken":{"value":"certificate","type":"certificate"},"capabilities":["https"]}
+      |agentName: {"agentType":"cfengine-community","version":"6.1.0","securityToken":{"type":"certificate","value":"-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUfa0+S+CyJahRzuwNNOFLNQQjIH8wDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MB4XDTI0MDMwMTExMDIxM1oXDTM0\nMDIyNzExMDIxM1owFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAsmBUYI1A5vqkOTCW24m/mQhBaRu4WaAUXDAr\nArdIAAMN0KyHhEXP1/X32Flw90E0VjtUH4P+DYLBozXYWhJrUxdWLyn3TRSbv3Kr\npXoCWhMhMp8OK2s/mG+rfiMpTXIwaMhPnBaJFNV3c+bkijGAMHtFjl3+leXJvNZ7\nw3bIg4cA3e77kz7EWMyqxOUvvLMyY6wpd03ahe/By+iLgtOkgUwl9hMqMU8tJeaz\nNIeUporsHk5rrk8bSf6Mxxdknm43Sk6oflnueNCIUFdd4rS2JLieMugsTh8n/oH+\nk29ZyirE3ikhftmZ3vY8GQ3IcIzaXwiAOGnCKcze79zVx5jmOTGSZitGZaU/cZc6\nLjzEp+ZDmE8caVIksiA+hIlaZeBXNHB+YRv/gV1Rbt7kS1am+XUZJSfVFf+99YqE\nlZ5p0hqJsczkBb2RuMxWxxsWO3pesPUNCuL/yaeggTIp7eK06tQWi1EfXr40ctrf\noimbzMAKNBpRKWruL7652SlF75Usaq+PaPi1TtqYQjLRZmbpr+IR4uMeKnEMIZPw\n3dLDKBV6d71XkTAalCmcJU+fgYrRmgz1dEnaZDIXY+f+fYR15hsFpDrZ0avHgkzJ\nca/nT/rKeX7136BttxVSbZaTU9hnmjAvl+v0BF+JUWPQ3VPTcrmyUNAICt8xdVae\nuo1tsvkCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSRG0uHQRIA\ngl91YqzSjaeaw+F7PDBSBgNVHSMESzBJgBSRG0uHQRIAgl91YqzSjaeaw+F7PKEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3ghR9rT5L4LIlqFHO7A004Us1BCMg\nfzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBABR2vTH/6WlqjaTZ/hQc\nB+crqRlFimqCiVTRdX6qfkt0tLX2dK6scHNTBT04ORLjLTAn0KbcOUz3k6i0mIqB\nnG5UjqCFEQR+i2V4Hz7aK6+7LBQuwXWRhDhvO5xMn7MxjvP0LGgNf5iiA4r/N22L\nEMc1prDESIOGmWdKg9XlfLxd877R2d8/3hXyT82Y2uJHO25b53skj4pbUOWLsGSw\nd4FBNnWqM+7Hbg2v9xFvmtfs2G2Inqk4Xjtjnj8qkVk3ft6KzClUIMXGXQ8QqaRp\nYPkTJm5g2UBYDiguD/tlz3VmbsNYU6fkap7DKqhttbaseIx1zDwdAv4jtVOWDyjx\nWq4b7pljYiczfRa84X/9v1x05pT3raELy5udY+Pxmnz+hOXOM+jY5bzSKS24b8rS\n5Sklmutm0IdflMKd5vNrXd9yPFLu3QzN50ArzHHXczwBLgjaMlZsPAp1wITlqM7+\nWCjy3qM5/KgAjH3L24MPTq23o9PokBVh1NH7lesZqgJPgsj+OG7FMQDvKzg7ytrs\nQlIDF1c8Ko+9/RrnRVAS8C4GZOqbmMmfJjMp09GBz2d0ixlTusF6m6iwfIVMf/nI\nP/V0D7STRiV62cfnZ3e0w8kIeZwWAgXI7RMHJU3skLyurUu8yxkp635IQyzQsW2A\nYo7t7O7fxjqD9yVI2QfkERZ7\n-----END CERTIFICATE-----\n"},"capabilities":["https"]}
       |inventoryDate: 20180717000031.000Z
       |receiveDate: 20180717000527.050Z
       |lastLoggedUserTime: 20000714084300.000Z
-      |softwareUpdate: {"name":"rudder-agent","version":"7.0.0-realease","from":"yum","arch":"x86_64","kind":"none","description":"Local privilege escalation in pkexec","severity":"low","date":"2022-01-26T00:00:00Z","ids":["RHSA-2020-4566","CVE-2021-4034"]}""".stripMargin
+      |softwareUpdate: {"name":"rudder-agent","version":"7.0.0-realease","arch":"x86_64","from":"yum","kind":"none","description":"Local privilege escalation in pkexec","severity":"low","date":"2022-01-26T00:00:00Z","ids":["RHSA-2020-4566","CVE-2021-4034"]}
+      |customProperty: {"name":"simpleString","value":"a simple string"}
+      |customProperty: {"name":"someJson","value":{"foo":"bar","i":42,"b":true,"arr":[1,2]}}
+      |environmentVariable: {"name":"UPSTART_INSTANCE"}
+      |environmentVariable: {"name":"SHELL","value":"/bin/bash"}
+      |process: {"pid":193,"name":"/var/rudder/cfengine-community/bin/cf-serverd","cpuUsage":0.0,"memory":0.0,"started":"2014-09-25 09:45","tty":"?","user":"root","virtualMemory":36664.0}
+      |""".stripMargin
   }
 
   def node(ldif: String): NodeInventory = {
@@ -248,16 +212,49 @@ class TestNodeUnserialisation extends Specification {
     ZioRuntime.unsafeRun(mapper.nodeFromEntry(nodeEntry).either).getOrElse(throw new Exception("Error when getting node"))
   }
 
+  val cert = """-----BEGIN CERTIFICATE-----
+               |MIIFTjCCAzagAwIBAgIUfa0+S+CyJahRzuwNNOFLNQQjIH8wDQYJKoZIhvcNAQEL
+               |BQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MB4XDTI0MDMwMTExMDIxM1oXDTM0
+               |MDIyNzExMDIxM1owFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MIICIjANBgkqhkiG
+               |9w0BAQEFAAOCAg8AMIICCgKCAgEAsmBUYI1A5vqkOTCW24m/mQhBaRu4WaAUXDAr
+               |ArdIAAMN0KyHhEXP1/X32Flw90E0VjtUH4P+DYLBozXYWhJrUxdWLyn3TRSbv3Kr
+               |pXoCWhMhMp8OK2s/mG+rfiMpTXIwaMhPnBaJFNV3c+bkijGAMHtFjl3+leXJvNZ7
+               |w3bIg4cA3e77kz7EWMyqxOUvvLMyY6wpd03ahe/By+iLgtOkgUwl9hMqMU8tJeaz
+               |NIeUporsHk5rrk8bSf6Mxxdknm43Sk6oflnueNCIUFdd4rS2JLieMugsTh8n/oH+
+               |k29ZyirE3ikhftmZ3vY8GQ3IcIzaXwiAOGnCKcze79zVx5jmOTGSZitGZaU/cZc6
+               |LjzEp+ZDmE8caVIksiA+hIlaZeBXNHB+YRv/gV1Rbt7kS1am+XUZJSfVFf+99YqE
+               |lZ5p0hqJsczkBb2RuMxWxxsWO3pesPUNCuL/yaeggTIp7eK06tQWi1EfXr40ctrf
+               |oimbzMAKNBpRKWruL7652SlF75Usaq+PaPi1TtqYQjLRZmbpr+IR4uMeKnEMIZPw
+               |3dLDKBV6d71XkTAalCmcJU+fgYrRmgz1dEnaZDIXY+f+fYR15hsFpDrZ0avHgkzJ
+               |ca/nT/rKeX7136BttxVSbZaTU9hnmjAvl+v0BF+JUWPQ3VPTcrmyUNAICt8xdVae
+               |uo1tsvkCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSRG0uHQRIA
+               |gl91YqzSjaeaw+F7PDBSBgNVHSMESzBJgBSRG0uHQRIAgl91YqzSjaeaw+F7PKEb
+               |pBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3ghR9rT5L4LIlqFHO7A004Us1BCMg
+               |fzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBABR2vTH/6WlqjaTZ/hQc
+               |B+crqRlFimqCiVTRdX6qfkt0tLX2dK6scHNTBT04ORLjLTAn0KbcOUz3k6i0mIqB
+               |nG5UjqCFEQR+i2V4Hz7aK6+7LBQuwXWRhDhvO5xMn7MxjvP0LGgNf5iiA4r/N22L
+               |EMc1prDESIOGmWdKg9XlfLxd877R2d8/3hXyT82Y2uJHO25b53skj4pbUOWLsGSw
+               |d4FBNnWqM+7Hbg2v9xFvmtfs2G2Inqk4Xjtjnj8qkVk3ft6KzClUIMXGXQ8QqaRp
+               |YPkTJm5g2UBYDiguD/tlz3VmbsNYU6fkap7DKqhttbaseIx1zDwdAv4jtVOWDyjx
+               |Wq4b7pljYiczfRa84X/9v1x05pT3raELy5udY+Pxmnz+hOXOM+jY5bzSKS24b8rS
+               |5Sklmutm0IdflMKd5vNrXd9yPFLu3QzN50ArzHHXczwBLgjaMlZsPAp1wITlqM7+
+               |WCjy3qM5/KgAjH3L24MPTq23o9PokBVh1NH7lesZqgJPgsj+OG7FMQDvKzg7ytrs
+               |QlIDF1c8Ko+9/RrnRVAS8C4GZOqbmMmfJjMp09GBz2d0ixlTusF6m6iwfIVMf/nI
+               |P/V0D7STRiV62cfnZ3e0w8kIeZwWAgXI7RMHJU3skLyurUu8yxkp635IQyzQsW2A
+               |Yo7t7O7fxjqD9yVI2QfkERZ7
+               |-----END CERTIFICATE-----
+               |""".stripMargin
+
   "Agent type " should {
-    "correctly unserialize Linux node from 4_3" in {
+    "correctly unserialize Linux node from 6_1" in {
       node(linux61Ldif).agents(0) must beEqualTo(
-        AgentInfo(AgentType.CfeCommunity, Some(AgentVersion("6.1.0")), Certificate("certificate"), Set(AgentCapability("https")))
+        AgentInfo(AgentType.CfeCommunity, Some(AgentVersion("6.1.0")), Certificate(cert), Set(AgentCapability("https")))
       )
     }
 
-    "correctly unserialize DSC node from 4_2" in {
-      node(dsc42Ldif).agents(0) must beEqualTo(
-        AgentInfo(AgentType.Dsc, Some(AgentVersion("4.2-1.9")), Certificate("certificate"), Set())
+    "correctly unserialize DSC node from 6_1" in {
+      node(dsc61Ldif).agents(0) must beEqualTo(
+        AgentInfo(AgentType.Dsc, Some(AgentVersion("6.1-1.9")), Certificate(cert), Set())
       )
     }
 
@@ -278,5 +275,114 @@ class TestNodeUnserialisation extends Specification {
         )
       ))
     }
+
+    "correctly unserialize custom properties from 7_0" in {
+      import Json.*
+      node(linux70Ldif).customProperties must containTheSameElementsAs(
+        List(
+          CustomProperty("simpleString", Str("a simple string")),
+          CustomProperty(
+            "someJson",
+            Obj(
+              Chunk(
+                ("foo" -> Str("bar")),
+                ("i"   -> Num(42)),
+                ("b"   -> Bool(true)),
+                ("arr" -> Arr(Num(1), Num(2)))
+              )
+            )
+          )
+        )
+      )
+    }
+
+    "correctly unserialize environment variable" in {
+      node(linux70Ldif).environmentVariables must containTheSameElementsAs(
+        List(
+          EnvironmentVariable("UPSTART_INSTANCE"),
+          EnvironmentVariable("SHELL", Some("/bin/bash"))
+        )
+      )
+    }
+
+    "correctly unserialize processes" in {
+      node(linux70Ldif).processes must containTheSameElementsAs(
+        List(
+          Process(
+            193,
+            Some("/var/rudder/cfengine-community/bin/cf-serverd"),
+            Some(0.0f),
+            Some(0.0f),
+            Some("2014-09-25 09:45"),
+            Some("?"),
+            Some("root"),
+            Some(36664)
+          )
+        )
+      )
+    }
+
+    "7.0 and 8.3 ldif lead to the same node" in {
+      val n1 = node(linux70Ldif)
+      val n2 = node(linux83Ldif)
+      n1 === n2
+    }
+
+    "idempotence of unser/ser for 8.3" in {
+      val nodeEntry = new LDAPEntry(new Entry(linux83Ldif.split("\n").toSeq*))
+      val prog      = for {
+        n <- mapper.nodeFromEntry(nodeEntry)
+        e  = mapper.treeFromNode(n).root
+        p  = mapper.processesFromNode(n)
+        _  = e.resetValuesTo(LDAPConstants.A_PROCESS, p*)
+      } yield e
+
+      val entry = ZioRuntime.unsafeRun(prog)
+      val diff  = com.unboundid.ldap.sdk.Entry.diff(nodeEntry.backed, entry.backed, false, true)
+      diff.toArray() must beEmpty
+    }
+
+    "correctly unserialize a node even with malformed env var, process, soft update" in {
+      val nodeEntry = new LDAPEntry(
+        new Entry(
+          """dn: nodeId=root,ou=Nodes,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration
+            |objectClass: top
+            |objectClass: node
+            |objectClass: unixNode
+            |objectClass: linuxNode
+            |nodeId: root
+            |localAdministratorAccountName: root
+            |policyServerId: root
+            |osFullName: SUSE Linux Enterprise Server 11 (x86_64)
+            |osServicePack: 3
+            |ram: 1572864000
+            |swap: 781189120
+            |lastLoggedUser: root
+            |osKernelVersion: 3.0.76-0.11-default
+            |osName: Suse
+            |osVersion: 11
+            |keyStatus: certified
+            |nodeHostname: orchestrateur-3.labo.normation.com
+            |osArchitectureType: x86_64
+            |timezoneOffset: +0200
+            |timezoneName: Europe/Paris
+            |agentName: {"agentType":"cfengine-community","version":"6.1.0","securityToken":{"type":"certificate","value":"-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUfa0+S+CyJahRzuwNNOFLNQQjIH8wDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MB4XDTI0MDMwMTExMDIxM1oXDTM0\nMDIyNzExMDIxM1owFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAsmBUYI1A5vqkOTCW24m/mQhBaRu4WaAUXDAr\nArdIAAMN0KyHhEXP1/X32Flw90E0VjtUH4P+DYLBozXYWhJrUxdWLyn3TRSbv3Kr\npXoCWhMhMp8OK2s/mG+rfiMpTXIwaMhPnBaJFNV3c+bkijGAMHtFjl3+leXJvNZ7\nw3bIg4cA3e77kz7EWMyqxOUvvLMyY6wpd03ahe/By+iLgtOkgUwl9hMqMU8tJeaz\nNIeUporsHk5rrk8bSf6Mxxdknm43Sk6oflnueNCIUFdd4rS2JLieMugsTh8n/oH+\nk29ZyirE3ikhftmZ3vY8GQ3IcIzaXwiAOGnCKcze79zVx5jmOTGSZitGZaU/cZc6\nLjzEp+ZDmE8caVIksiA+hIlaZeBXNHB+YRv/gV1Rbt7kS1am+XUZJSfVFf+99YqE\nlZ5p0hqJsczkBb2RuMxWxxsWO3pesPUNCuL/yaeggTIp7eK06tQWi1EfXr40ctrf\noimbzMAKNBpRKWruL7652SlF75Usaq+PaPi1TtqYQjLRZmbpr+IR4uMeKnEMIZPw\n3dLDKBV6d71XkTAalCmcJU+fgYrRmgz1dEnaZDIXY+f+fYR15hsFpDrZ0avHgkzJ\nca/nT/rKeX7136BttxVSbZaTU9hnmjAvl+v0BF+JUWPQ3VPTcrmyUNAICt8xdVae\nuo1tsvkCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSRG0uHQRIA\ngl91YqzSjaeaw+F7PDBSBgNVHSMESzBJgBSRG0uHQRIAgl91YqzSjaeaw+F7PKEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3ghR9rT5L4LIlqFHO7A004Us1BCMg\nfzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBABR2vTH/6WlqjaTZ/hQc\nB+crqRlFimqCiVTRdX6qfkt0tLX2dK6scHNTBT04ORLjLTAn0KbcOUz3k6i0mIqB\nnG5UjqCFEQR+i2V4Hz7aK6+7LBQuwXWRhDhvO5xMn7MxjvP0LGgNf5iiA4r/N22L\nEMc1prDESIOGmWdKg9XlfLxd877R2d8/3hXyT82Y2uJHO25b53skj4pbUOWLsGSw\nd4FBNnWqM+7Hbg2v9xFvmtfs2G2Inqk4Xjtjnj8qkVk3ft6KzClUIMXGXQ8QqaRp\nYPkTJm5g2UBYDiguD/tlz3VmbsNYU6fkap7DKqhttbaseIx1zDwdAv4jtVOWDyjx\nWq4b7pljYiczfRa84X/9v1x05pT3raELy5udY+Pxmnz+hOXOM+jY5bzSKS24b8rS\n5Sklmutm0IdflMKd5vNrXd9yPFLu3QzN50ArzHHXczwBLgjaMlZsPAp1wITlqM7+\nWCjy3qM5/KgAjH3L24MPTq23o9PokBVh1NH7lesZqgJPgsj+OG7FMQDvKzg7ytrs\nQlIDF1c8Ko+9/RrnRVAS8C4GZOqbmMmfJjMp09GBz2d0ixlTusF6m6iwfIVMf/nI\nP/V0D7STRiV62cfnZ3e0w8kIeZwWAgXI7RMHJU3skLyurUu8yxkp635IQyzQsW2A\nYo7t7O7fxjqD9yVI2QfkERZ7\n-----END CERTIFICATE-----\n"},"capabilities":["https"]}
+            |inventoryDate: 20180717000031.000Z
+            |receiveDate: 20180717000527.050Z
+            |lastLoggedUserTime: 20000714084300.000Z
+            |#
+            |# this is the interesting parts: even with that, we get a valid inventory
+            |#
+            |customProperty: malformed json
+            |environmentVariable: malformed json
+            |process: malformed json
+            |softwareUuid: malformed DN
+            |""".stripMargin.linesIterator.toSeq*
+        )
+      )
+
+      ZioRuntime.unsafeRun(mapper.nodeFromEntry(nodeEntry).either) must beRight
+    }
+
   }
 }
diff --git a/webapp/sources/ldap-inventory/pom.xml b/webapp/sources/ldap-inventory/pom.xml
index b940773f133..9a202ca85c2 100644
--- a/webapp/sources/ldap-inventory/pom.xml
+++ b/webapp/sources/ldap-inventory/pom.xml
@@ -40,7 +40,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>8.2.4-SNAPSHOT</version>
+    <version>8.3.0~alpha1-SNAPSHOT</version>
   </parent>
 
   <description>
diff --git a/webapp/sources/pom.xml b/webapp/sources/pom.xml
index 8f5bc4a3972..7bdcde5a8ad 100644
--- a/webapp/sources/pom.xml
+++ b/webapp/sources/pom.xml
@@ -18,7 +18,7 @@ limitations under the License.
 
   <groupId>com.normation</groupId>
   <artifactId>parent-pom</artifactId>
-  <version>8.2.4-SNAPSHOT</version>
+  <version>8.3.0~alpha1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!-- ====================================  PROJECT INFORMATION  ==================================== -->
@@ -120,7 +120,7 @@ limitations under the License.
           <dependency>
             <groupId>ch.epfl.scala</groupId>
             <artifactId>scala3-migrate-rules_2.13</artifactId>
-            <version>0.6.2</version>
+            <version>0.7.1</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -419,8 +419,8 @@ limitations under the License.
     <!-- Libraries version that MUST be used in all children project -->
 
     <current-year>2024</current-year>
-    <rudder-major-version>8.2</rudder-major-version>
-    <rudder-version>8.2.4-SNAPSHOT</rudder-version>
+    <rudder-major-version>8.3</rudder-major-version>
+    <rudder-version>8.3.0~alpha1-SNAPSHOT</rudder-version>
 
     <servlet-version>5.0.0</servlet-version>
     <scala-version>2.13.12</scala-version>
@@ -432,44 +432,44 @@ limitations under the License.
          parser option - see https://github.com/scala/scala-xml/releases/tag/v2.1.0 -->
     <scala-xml-version>1.3.0</scala-xml-version>
     <lift-version>4.0.0-M1</lift-version>
-    <slf4j-version>2.0.13</slf4j-version>
-    <logback-version>1.5.6</logback-version>
-    <jodatime-version>2.12.7</jodatime-version>
-    <jodaconvert-version>2.2.3</jodaconvert-version>
-    <commons-io-version>2.16.1</commons-io-version>
-    <commons-lang-version>3.15.0</commons-lang-version>
+    <slf4j-version>2.0.16</slf4j-version>
+    <logback-version>1.5.12</logback-version>
+    <jodatime-version>2.13.0</jodatime-version>
+    <jodaconvert-version>3.0.1</jodaconvert-version>
+    <commons-io-version>2.17.0</commons-io-version>
+    <commons-lang-version>3.17.0</commons-lang-version>
     <commons-text-version>1.12.0</commons-text-version>
-    <commons-codec-version>1.17.0</commons-codec-version> <!-- can't update to 1.17.1 because of md5 requiring a non-empty salt prefix -->
+    <commons-codec-version>1.17.1</commons-codec-version>
     <commons-fileupload>2.0.0-M2</commons-fileupload>
-    <commons-csv-version>1.11.0</commons-csv-version>
-    <jgit-version>6.10.0.202406032230-r</jgit-version>
-    <spring-version>6.1.12</spring-version>
-    <spring-security-version>6.3.3</spring-security-version>
+    <commons-csv-version>1.12.0</commons-csv-version>
+    <jgit-version>7.0.0.202409031743-r</jgit-version>
+    <spring-version>6.1.14</spring-version>
+    <spring-security-version>6.3.4</spring-security-version>
     <cglib-version>3.3.0</cglib-version>
-    <asm-version>9.7</asm-version>
+    <asm-version>9.7.1</asm-version>
     <!-- Level of Java compatibility, here 1.8+ -->
     <bouncycastle-compat>jdk18on</bouncycastle-compat>
-    <bouncycastle-version>1.78.1</bouncycastle-version>
+    <bouncycastle-version>1.79</bouncycastle-version>
     <better-files-version>3.9.2</better-files-version>
     <sourcecode-version>0.4.2</sourcecode-version>
-    <quicklens-version>1.9.7</quicklens-version>
-    <hikaricp-version>5.1.0</hikaricp-version>
+    <quicklens-version>1.9.9</quicklens-version>
+    <hikaricp-version>6.0.0</hikaricp-version>
     <nuprocess-version>3.0.0</nuprocess-version>
-    <postgresql-version>42.7.3</postgresql-version>
+    <postgresql-version>42.7.4</postgresql-version>
     <json-path-version>2.9.0</json-path-version>
     <json-smart-version>2.5.1</json-smart-version>
     <scalaj-version>2.4.2</scalaj-version>
-    <unboundid-version>7.0.0</unboundid-version>
+    <unboundid-version>7.0.1</unboundid-version>
     <fastparse-version>3.1.1</fastparse-version>
     <config-version>1.4.3</config-version>
     <caffeine-version>3.1.8</caffeine-version>
     <jgrapht-version>1.5.2</jgrapht-version>
     <reflections-version>0.10.2</reflections-version>
-    <graalvm-version>24.0.2</graalvm-version>
-    <chimney-version>1.4.0</chimney-version>
+    <graalvm-version>24.1.1</graalvm-version>
+    <chimney-version>1.5.0</chimney-version>
     <cron4s-version>0.7.0</cron4s-version>
-    <ipaddress-version>5.5.0</ipaddress-version>
-    <snakeyaml-version>2.2</snakeyaml-version>
+    <ipaddress-version>5.5.1</ipaddress-version>
+    <snakeyaml-version>2.3</snakeyaml-version>
 
     <zio-http-version>2.0.0-RC11</zio-http-version> <!-- used in datasources -->
 
@@ -478,18 +478,18 @@ limitations under the License.
       We declare cats in "test" here, because it is not directly needed
       in any project before rudder.
     -->
-    <specs2-version>4.20.8</specs2-version>
+    <specs2-version>4.20.9</specs2-version>
     <junit-version>4.13.2</junit-version>
     <cats-version>2.12.0</cats-version>
     <ip4s-version>3.6.0</ip4s-version>
     <doobie-version>1.0.0-RC5</doobie-version>
     <fs2-version>3.10.2</fs2-version>
     <shapeless-version>2.3.12</shapeless-version>
-    <cats-effect-version>3.5.4</cats-effect-version>
-    <dev-zio-version>2.0.22</dev-zio-version>
-    <zio-cats-version>23.1.0.2</zio-cats-version> <!-- gives fs2 3.10.2, but doobie 1.0.0-RC5 is in 3.9.3 -->
-    <zio-json-version>0.7.1</zio-json-version>
-    <enumeratum-version>1.7.4</enumeratum-version>
+    <cats-effect-version>3.5.5</cats-effect-version>
+    <dev-zio-version>2.1.12</dev-zio-version>
+    <zio-cats-version>23.1.0.3</zio-cats-version> <!-- gives fs2 3.10.2, but doobie 1.0.0-RC5 is in 3.9.3 -->
+    <zio-json-version>0.7.3</zio-json-version>
+    <enumeratum-version>1.7.5</enumeratum-version>
 
     <!--
       Hack to make scalac jvm parameters like RAM configurable.
diff --git a/webapp/sources/rudder/pom.xml b/webapp/sources/rudder/pom.xml
index d387b469de1..0ebe0cf989f 100644
--- a/webapp/sources/rudder/pom.xml
+++ b/webapp/sources/rudder/pom.xml
@@ -39,7 +39,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>8.2.4-SNAPSHOT</version>
+    <version>8.3.0~alpha1-SNAPSHOT</version>
   </parent>
 
   <description>
diff --git a/webapp/sources/rudder/rudder-core/pom.xml b/webapp/sources/rudder/rudder-core/pom.xml
index 65c482138bf..39b5bc82585 100644
--- a/webapp/sources/rudder/rudder-core/pom.xml
+++ b/webapp/sources/rudder/rudder-core/pom.xml
@@ -37,7 +37,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation.rudder</groupId>
     <artifactId>rudder-parent</artifactId>
-    <version>8.2.4-SNAPSHOT</version>
+    <version>8.3.0~alpha1-SNAPSHOT</version>
   </parent>
 
   <artifactId>rudder-core</artifactId>
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/AixPasswordHashAlgo.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/AixPasswordHashAlgo.scala
deleted file mode 100644
index 29811c3fb9f..00000000000
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/AixPasswordHashAlgo.scala
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- *************************************************************************************
- * Copyright 2016 Normation SAS
- *************************************************************************************
- *
- * This file is part of Rudder.
- *
- * Rudder is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * In accordance with the terms of section 7 (7. Additional Terms.) of
- * the GNU General Public License version 3, the copyright holders add
- * the following Additional permissions:
- * Notwithstanding to the terms of section 5 (5. Conveying Modified Source
- * Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
- * Public License version 3, when you create a Related Module, this
- * Related Module is not considered as a part of the work and may be
- * distributed under the license agreement of your choice.
- * A "Related Module" means a set of sources files including their
- * documentation that, without modification of the Source Code, enables
- * supplementary functions or services in addition to those offered by
- * the Software.
- *
- * Rudder is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
-
- *
- *************************************************************************************
- */
-
-package com.normation.cfclerk.domain
-
-import java.security.NoSuchAlgorithmException
-import javax.crypto.SecretKeyFactory
-import javax.crypto.spec.PBEKeySpec
-import net.liftweb.common.Box
-import net.liftweb.common.EmptyBox
-import net.liftweb.common.Failure
-import net.liftweb.common.Full
-import net.liftweb.common.Loggable
-import org.apache.commons.codec.digest.Md5Crypt
-import scala.util.Random
-
-/*
- * This file contains the implementation of the 4 supported algorithms in
- * AIX /etc/security/passwd file (with example hash string result for
- * the password "secret"):
- * - salted md5     : {smd5}tyiOfoE4$r5HleyKHVdL3dg9ouzcZ80
- * - salted sha1    : {ssha1}12$tyiOfoE4WXucUfh/$1olYn48enIIKGOOs0ve/GE.k.sF
- * - salted ssha256: {ssha256}12$tyiOfoE4WXucUfh/$YDkcqbY5oKk4lwQ4pVKPy8o4MqcfVpp1ZxxvSfP0.wS
- * - salted ssha512: {ssha512}10$tyiOfoE4WXucUfh/$qaLbOhKx3fwIu93Hkh4Z89Vr.otLYEhRGN3b3SAZFD3mtxhqWZmY2iJKf0KB/5fuwlERv14pIN9h4XRAZtWH..
- *
- * Appart for md5, which is the standard unix implementation and differs only for the
- * prefix ({smd5} in place of "$1", the other implementations differ SIGNIFICANTLY from
- * standard Unix crypt described at https://www.akkadia.org/drepper/SHA-crypt.txt. In fact,
- * they only kept:
- * - the number of bytes (and so chars) for the hash: 20 for ssha1, 32 for ssha256, 64 for ssh512
- * - the base64 encoding table (which is not the standard one but starts with "./012" etc
- *
- * What changed is:
- * - they use PBKDF2 HMAC-(sha1, sha256, sha512) in place of Sha-Crypt,
- * - they use a different padding table
- * - the number of iterations, named "rounds" in Unix crypt vocabulary, is not the number N
- *   found at the begining of the hash string (after the algo name). The number of iteration
- *   is actually  2^N, and N is called in /etc/security/pwdalg.cfg the "cost"
- *
- * Hope this decription may help other people find there way to generate AIX hash string.
- */
-object AixPasswordHashAlgo extends Loggable {
-  import java.lang.StringBuilder as JStringBuilder
-
-  /**
-   * Table with characters for Sha-Crypt Base64 transformation,
-   * and used by Aix even if they DON'T use sha-crypt.
-   */
-  final val SCB64Table = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-  /*
-   * Sha-Crypt Base64 byte encoding into chars.
-   *
-   * Convert 3 bytes into 0 to 3 chars from the B64Tables.
-   * Output is written into the buffer given in input.
-   *
-   * This code is a Scala adaptation from org.apache.commons.codec.digest.B64
-   *
-   */
-  def b64from24bit(b2: Byte, b1: Byte, b0: Byte, outNumChars: Int, buffer: JStringBuilder): Unit = {
-    // The bit masking is necessary because the JVM byte type is signed!
-    var w = ((b2 << 16) & 0x00ffffff) | ((b1 << 8) & 0x00ffff) | (b0 & 0xff)
-    // It's effectively a "for" loop but kept to resemble the original C code.
-    val n = outNumChars
-    for (i <- 0 until n) {
-      buffer.append(SCB64Table.charAt(w & 0x3f))
-      w >>= 6
-    }
-  }
-
-  /*
-   * AIX {smd5} implementation.
-   * @parameter pwd: the string password, in UTF-8, to hash
-   * @parameter salt: a
-   */
-  def smd5(pwd: String, salt: Option[String] = None): String = {
-
-    val s    = salt.getOrElse(getRandomSalt(8))
-    val hash = Md5Crypt.md5Crypt(pwd.getBytes("UTF-8"), s, "")
-
-    val sb = new java.lang.StringBuilder()
-    sb.append("{smd5}")
-    sb.append(hash)
-
-    sb.toString
-  }
-
-  /*
-   * Generic implementation of AIX {ssha*} hash scheme.
-   * The hash format is {ssha*}NN$saltsalt$sha.crypt.base.64.encoded.hash
-   * where NN is the cost (cost_num in /etc/security/pwdalg.cfg vocabulary),
-   * a 0 padded int between 1 and 31, and saltsalt is the slat string,
-   * by default 16 chars long.
-   *
-   */
-  def ssha(pwd: String, salt: Option[String], cost: Int, sha: ShaSpec): Box[String] = {
-    for {
-      skf <- getSecretKeFactory(sha)
-    } yield {
-      doSsha(sha, skf)(pwd, salt, cost)
-    }
-  }
-
-  /*
-   * Create an AIX {ssha1} hash string from pwd. Optionaly, specify the
-   * salt string to use (default to a random 16 chars string), and the "num_cost"
-   * (defaults to 10, i.e 1024 iterations).
-   *
-   * If PBKDF2WithHmacSHA1 crypto algorithm is not available in the current JVM,
-   * revert back to {smd5}.
-   */
-  def ssha1(pwd: String, salt: Option[String] = None, cost: Int = 10): String = {
-    ssha1impl(pwd, salt, cost)
-  }
-
-  /*
-   * Create an AIX {ssha256} hash string from pwd. Optionaly, specify the
-   * salt string to use (default to a random 16 chars string), and the "num_cost"
-   * (defaults to 10, i.e 1024 iterations).
-   *
-   * If PBKDF2WithHmacSHA256 crypto algorithm is not available in the current JVM,
-   * revert back to {ssha1}.
-   */
-  def ssha256(pwd: String, salt: Option[String] = None, cost: Int = 10): String = {
-    ssha256impl(pwd, salt, cost)
-  }
-
-  /*
-   * Create an AIX {ssha256} hash string from pwd. Optionaly, specify the
-   * salt string to use (default to a random 16 chars string), and the "num_cost"
-   * (defaults to 10, i.e 1024 iterations).
-   *
-   * If PBKDF2WithHmacSHA512 crypto algorithm is not available in the current JVM,
-   * revert back to {ssha1}.
-   */
-  def ssha512(pwd: String, salt: Option[String] = None, cost: Int = 10): String = {
-    ssha512impl(pwd, salt, cost)
-  }
-
-  /////
-  /////          Implementation details
-  ///// (if you are looking to understand how AIX hashes its
-  /////  passwords, that the part of interest)
-  /////
-
-  final protected[domain] def getSecretKeFactory(sha: ShaSpec): Box[SecretKeyFactory] = {
-    try {
-      Full(SecretKeyFactory.getInstance(s"PBKDF2WithHmac${sha.name}"))
-    } catch {
-      case ex: NoSuchAlgorithmException =>
-        Failure(
-          s"Your current Java installation does not support PBKDF2WithHmac${sha.name} algorithm, " +
-          "which is necessary for {ssha256} hash"
-        )
-    }
-  }
-
-  /////
-  ///// Initialize the correct instance of hashing algo
-  ///// based on the available secret key factory on the
-  ///// jvm. The check is done at most one time by jvm session.
-  /////
-
-  /// ssha1 revert to smd5 - but all post-java6 JVM should be ok
-  final private lazy val ssha1impl = getSecretKeFactory(ShaSpec.SHA1) match {
-    case Full(skf) => doSsha(ShaSpec.SHA1, skf) _
-    case e: EmptyBox =>
-      // this should not happen, because PBKDF2WithHmacSHA1 is
-      // in standard Java since Java6. But who knows..
-      // Fallback to md5 hash.
-      logger.error(
-        "Your current Java installation does not support PBKDF2WithHmacSHA1 algorithm, " +
-        "which is necessary for {ssha1} hash. Falling back to {smd5} hashing scheme"
-      )
-
-      (pwd: String, salt: Option[String], cost: Int) => smd5(pwd, salt)
-  }
-
-  /// ssha256 reverts to ssha1 - not so bad
-  final private lazy val ssha256impl = getSecretKeFactory(ShaSpec.SHA256) match {
-    case Full(skf) => doSsha(ShaSpec.SHA256, skf) _
-    case e: EmptyBox =>
-      // this may happen on Java 7 and older version, because PBKDF2WithHmacSHA256
-      // was introduced in Java 8.
-      // Fallback to ssha1 hash.
-      logger.error(
-        "Your current Java installation does not support PBKDF2WithHmacSHA256 algorithm, " +
-        "which is necessary for {ssha256} hash. Falling back to {ssha1} hashing scheme"
-      )
-
-      ssha1impl
-  }
-
-  /// ssha512 reverts to ssha1 - no so bad
-  final private lazy val ssha512impl = getSecretKeFactory(ShaSpec.SHA512) match {
-    case Full(skf) => doSsha(ShaSpec.SHA512, skf) _
-    case e: EmptyBox =>
-      // this may happen on Java 7 and older version, because PBKDF2WithHmacSHA512
-      // was introduced in Java 8.
-      // Fallback to ssha1 hash.
-      logger.error(
-        "Your current Java installation does not support PBKDF2WithHmacSHA512 algorithm, " +
-        "which is necessary for {ssha256} hash. Falling back to {ssha1} hashing scheme"
-      )
-
-      ssha1impl
-  }
-
-  /*
-   * This one is not public - the caller must ensure that sha and SecretKeyFactory are compatible
-   */
-  final protected[domain] def doSsha(
-      sha: ShaSpec,
-      skf: SecretKeyFactory
-  )(pwd: String, salt: Option[String], cost: Int): String = {
-    val rounds = 2 << (cost - 1)
-    val s      = salt.getOrElse(getRandomSalt(16)).getBytes("UTF-8")
-    val spec: PBEKeySpec = new PBEKeySpec(pwd.toCharArray, s, rounds, 8 * sha.byteNumber)
-
-    val sb = new java.lang.StringBuilder()
-    sb.append(sha.prefix)
-    sb.append("%02d".format(cost))
-    sb.append("$").append(new String(s)).append("$")
-    sha.scb64Encode(skf.generateSecret(spec).getEncoded, sb)
-
-    (sb.toString)
-  }
-
-  /*
-   * Generic trait denoting the specificities of each
-   * SHA variant in term of name, number of output
-   * bytes, and way to encode them into a string.
-   */
-  sealed trait ShaSpec {
-    // SHA version: SHA1, SHA256, SHA512
-    def name: String
-
-    // algo prefix prepended in the final hash string.
-    final lazy val prefix: String = s"{s${name.toLowerCase}}"
-
-    // number of bytes of the hash before encoding
-    def byteNumber: Int
-
-    // encode the byte array resulting from the hash
-    // into a Sha-Crypt Base64 string, with correct
-    // byte switching and padding.
-    // the input byte array must have byteNumber elements.
-    def scb64Encode(bytes: Array[Byte], buffer: JStringBuilder): JStringBuilder
-
-  }
-
-  object ShaSpec {
-    // specific implementation for SHA1, SHA256 and SHA512
-
-    case object SHA1 extends ShaSpec {
-      val name       = "SHA1"
-      val byteNumber = 20
-      def scb64Encode(bytes: Array[Byte], buffer: JStringBuilder): JStringBuilder = {
-        b64from24bit(bytes(0), bytes(1), bytes(2), 4, buffer)
-        b64from24bit(bytes(3), bytes(4), bytes(5), 4, buffer)
-        b64from24bit(bytes(6), bytes(7), bytes(8), 4, buffer)
-        b64from24bit(bytes(9), bytes(10), bytes(11), 4, buffer)
-        b64from24bit(bytes(12), bytes(13), bytes(14), 4, buffer)
-        b64from24bit(bytes(15), bytes(16), bytes(17), 4, buffer)
-        b64from24bit(bytes(18), bytes(19), 0, 3, buffer)
-
-        buffer
-      }
-    }
-
-    case object SHA256 extends ShaSpec {
-      val name       = "SHA256"
-      val byteNumber = 32
-      def scb64Encode(bytes: Array[Byte], buffer: JStringBuilder): JStringBuilder = {
-        b64from24bit(bytes(0), bytes(1), bytes(2), 4, buffer)
-        b64from24bit(bytes(3), bytes(4), bytes(5), 4, buffer)
-        b64from24bit(bytes(6), bytes(7), bytes(8), 4, buffer)
-        b64from24bit(bytes(9), bytes(10), bytes(11), 4, buffer)
-        b64from24bit(bytes(12), bytes(13), bytes(14), 4, buffer)
-        b64from24bit(bytes(15), bytes(16), bytes(17), 4, buffer)
-        b64from24bit(bytes(18), bytes(19), bytes(20), 4, buffer)
-        b64from24bit(bytes(21), bytes(22), bytes(23), 4, buffer)
-        b64from24bit(bytes(24), bytes(25), bytes(26), 4, buffer)
-        b64from24bit(bytes(27), bytes(28), bytes(29), 4, buffer)
-        b64from24bit(bytes(30), bytes(31), 0, 3, buffer)
-
-        buffer
-      }
-    }
-
-    case object SHA512 extends ShaSpec {
-      val name       = "SHA512"
-      val byteNumber = 64
-      def scb64Encode(bytes: Array[Byte], buffer: JStringBuilder): JStringBuilder = {
-        b64from24bit(bytes(0), bytes(1), bytes(2), 4, buffer)
-        b64from24bit(bytes(3), bytes(4), bytes(5), 4, buffer)
-        b64from24bit(bytes(6), bytes(7), bytes(8), 4, buffer)
-        b64from24bit(bytes(9), bytes(10), bytes(11), 4, buffer)
-        b64from24bit(bytes(12), bytes(13), bytes(14), 4, buffer)
-        b64from24bit(bytes(15), bytes(16), bytes(17), 4, buffer)
-        b64from24bit(bytes(18), bytes(19), bytes(20), 4, buffer)
-        b64from24bit(bytes(21), bytes(22), bytes(23), 4, buffer)
-        b64from24bit(bytes(24), bytes(25), bytes(26), 4, buffer)
-        b64from24bit(bytes(27), bytes(28), bytes(29), 4, buffer)
-        b64from24bit(bytes(30), bytes(31), bytes(32), 4, buffer)
-        b64from24bit(bytes(33), bytes(34), bytes(35), 4, buffer)
-        b64from24bit(bytes(36), bytes(37), bytes(38), 4, buffer)
-        b64from24bit(bytes(39), bytes(40), bytes(41), 4, buffer)
-        b64from24bit(bytes(42), bytes(43), bytes(44), 4, buffer)
-        b64from24bit(bytes(45), bytes(46), bytes(47), 4, buffer)
-        b64from24bit(bytes(48), bytes(49), bytes(50), 4, buffer)
-        b64from24bit(bytes(51), bytes(52), bytes(53), 4, buffer)
-        b64from24bit(bytes(54), bytes(55), bytes(56), 4, buffer)
-        b64from24bit(bytes(57), bytes(58), bytes(59), 4, buffer)
-        b64from24bit(bytes(60), bytes(61), bytes(62), 4, buffer)
-        b64from24bit(bytes(63), 0, 0, 2, buffer)
-
-        buffer
-      }
-    }
-  }
-
-  /**
-   * Generate a random string with the size given
-   * as a parameter and chars taken from the Sha-Crypt
-   * Base 64 table.
-   */
-  private def getRandomSalt(size: Int): String = {
-    val chars = for {
-      i <- (0 until size).toArray
-    } yield {
-      SCB64Table.charAt(Random.nextInt(SCB64Table.length))
-    }
-    new String(chars)
-  }
-
-}
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Constraint.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Constraint.scala
index e39b0d106c2..fbf2709827a 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Constraint.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/Constraint.scala
@@ -108,7 +108,7 @@ object VTypeConstraint {
     Nil ::: regexTypes ::: sizeTypes
   }
   def validTypes(r: Option[RegexConstraint], algos: Seq[HashAlgoConstraint]): List[VTypeConstraint] = {
-    PermVType :: PasswordVType(algos) :: AixDerivedPasswordVType :: LinuxDerivedPasswordVType :: MasterPasswordVType(algos) ::
+    PermVType :: PasswordVType(algos) :: LinuxDerivedPasswordVType :: MasterPasswordVType(algos) ::
     UploadedFileVType :: DestinationPathVType :: SharedFileVType ::
     BooleanVType :: RawVType :: Nil ::: stringTypes(r)
   }
@@ -255,9 +255,6 @@ sealed trait DerivedPasswordVType extends AbstactPassword {
   override lazy val name: String = s"derivedPassword:${tpe.name}"
 }
 
-case object AixDerivedPasswordVType   extends DerivedPasswordVType {
-  override val tpe: DerivedPasswordType.AIX.type = HashAlgoConstraint.DerivedPasswordType.AIX
-}
 case object LinuxDerivedPasswordVType extends DerivedPasswordVType {
   override val tpe: DerivedPasswordType.Linux.type = HashAlgoConstraint.DerivedPasswordType.Linux
 }
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/HashAlgoConstraint.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/HashAlgoConstraint.scala
index c68cd00be52..0dabbecc7dc 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/HashAlgoConstraint.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/domain/HashAlgoConstraint.scala
@@ -140,37 +140,6 @@ object HashAlgoConstraint extends Enum[HashAlgoConstraint] {
 
   }
 
-  /*
-   * AIX /etc/security/user hash, as explained here:
-   *
-   * =>> $id$salt$encrypted
-   *
-   *    ID  | Method
-   *    ---------------------------------------------------------
-   *    1   | MD5
-   *    2a  | Blowfish (not in mainline glibc; added in some Linux distributions)
-   *    5   | SHA-256 (since glibc 2.7)
-   *    6   | SHA-512 (since glibc 2.7)
-   *
-   * "salt" stands for the up to 16 characters following "$id$" in the salt.
-   *
-   * shadow-md5 / shadow-sha-(level)
-   */
-  object AixMD5 extends HashAlgoConstraint("aix-smd5") {
-    override def hash(input: Array[Byte]): String = AixPasswordHashAlgo.smd5(new String(input, "UTF-8"))
-
-  }
-
-  object AixSHA256 extends HashAlgoConstraint("aix-ssha256") {
-    override def hash(input: Array[Byte]): String = AixPasswordHashAlgo.ssha256(new String(input, "UTF-8"))
-
-  }
-
-  object AixSHA512 extends HashAlgoConstraint("aix-ssha512") {
-    override def hash(input: Array[Byte]): String = AixPasswordHashAlgo.ssha512(new String(input, "UTF-8"))
-
-  }
-
   /**
    * Unix historical crypt algo (based on 56 bits DES)
    * Used in historical Unix systems.
@@ -189,28 +158,11 @@ object HashAlgoConstraint extends Enum[HashAlgoConstraint] {
 
   object DerivedPasswordType {
 
-    case object AIX extends DerivedPasswordType {
-      final val name = "AIX"
-
-      def hash(h: HashAlgoConstraint): HashAlgoConstraint = h match {
-        case LinuxShadowMD5    => AixMD5
-        case LinuxShadowSHA256 => AixSHA256
-        case LinuxShadowSHA512 => AixSHA512
-        case x                 => x
-      }
-    }
-
     case object Linux extends DerivedPasswordType {
       final val name = "Unix"
 
-      def hash(h: HashAlgoConstraint): HashAlgoConstraint = h match {
-        case AixMD5    => LinuxShadowMD5
-        case AixSHA256 => LinuxShadowSHA256
-        case AixSHA512 => LinuxShadowSHA512
-        case x         => x
-      }
+      def hash(h: HashAlgoConstraint): HashAlgoConstraint = h
     }
-    // solaris, etc: todo
   }
 
   /////
@@ -232,9 +184,6 @@ object HashAlgoConstraint extends Enum[HashAlgoConstraint] {
       case LinuxShadowMD5    => 21
       case LinuxShadowSHA256 => 22
       case LinuxShadowSHA512 => 23
-      case AixMD5            => 31
-      case AixSHA256         => 32
-      case AixSHA512         => 33
       case UnixCryptDES      => 70
       case MD5               => 81
       case SHA1              => 82
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/SystemVariableSpecServiceImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/SystemVariableSpecServiceImpl.scala
index 5914a453e29..c083d653f11 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/SystemVariableSpecServiceImpl.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/services/impl/SystemVariableSpecServiceImpl.scala
@@ -99,12 +99,6 @@ class SystemVariableSpecServiceImpl extends SystemVariableSpecService {
     ),
     SystemVariableSpec("INPUTLIST", "Input list", multivalued = false),
     SystemVariableSpec("BUNDLELIST", "Bundle list", multivalued = false),
-    SystemVariableSpec(
-      "NOVA",
-      "The Cfengine Nova agent",
-      multivalued = false,
-      constraint = Constraint(mayBeEmpty = true)
-    ),
     SystemVariableSpec(
       "COMMUNITY",
       "The Cfengine Community agent",
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/TechniqueParser.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/TechniqueParser.scala
index 4880dcc966e..76062370a05 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/TechniqueParser.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/TechniqueParser.scala
@@ -101,9 +101,9 @@ class TechniqueParser(
             deprecationInfo <- parseDeprecrationInfo(xml)
 
             // for compatibility reason, we cheat and make the template/file/bundlesequence under root
-            // and not in an <AGENT> sub-element be considered as being in <AGENT type="cfengine-community,cfengine-enterprise">
+            // and not in an <AGENT> sub-element be considered as being in <AGENT type="cfengine-community,...">
             compatibilityAgent <- {
-              val forCompatibilityAgent = <AGENT type={s"${AgentType.CfeCommunity.toString},${AgentType.CfeEnterprise.toString}"}>
+              val forCompatibilityAgent = <AGENT type={s"${AgentType.CfeCommunity.toString}"}>
                                       {(xml \ PROMISE_TEMPLATES_ROOT)}
                                       {(xml \ FILES)}
                                       {(xml \ BUNDLES_ROOT)}
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/VariableSpecParser.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/VariableSpecParser.scala
index 46cc6965dfa..1cc9142624f 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/VariableSpecParser.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/cfclerk/xmlparsers/VariableSpecParser.scala
@@ -309,7 +309,6 @@ class VariableSpecParser extends Loggable {
         defaultValue: Option[String]
     ): SectionVariableSpec = {
       val (postfix, vtype) = tpe match {
-        case DerivedPasswordType.AIX   => ("AIX", AixDerivedPasswordVType)
         case DerivedPasswordType.Linux => ("LINUX", LinuxDerivedPasswordVType)
       }
 
@@ -335,9 +334,6 @@ class VariableSpecParser extends Loggable {
             .split(",")
             .flatMap { s =>
               s.toLowerCase.trim match {
-                case "aix" =>
-                  Some(derivedPasswordVar(varName, DerivedPasswordType.AIX, mayBeEmpty, defaultValue))
-
                 case "linux" =>
                   Some(derivedPasswordVar(varName, DerivedPasswordType.Linux, mayBeEmpty, defaultValue))
 
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/ApiAccountRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/ApiAccountRepository.scala
index a8c100b9e3f..69f62bfff29 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/ApiAccountRepository.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/api/ApiAccountRepository.scala
@@ -164,24 +164,7 @@ final class RoLDAPApiAccountRepository(
         // here, be careful to the semantic of get with a filter!
         optEntry <- ldap.get(rudderDit.API_ACCOUNTS.dn, BuildFilter.EQ(RudderLDAPConstants.A_API_TOKEN, hash))
         optRes   <- optEntry match {
-                      case None    => {
-                        // Fallback on v1 clear text tokens
-                        for {
-                          optEntry <-
-                            // here, be careful to the semantic of get with a filter!
-                            ldap.get(rudderDit.API_ACCOUNTS.dn, BuildFilter.EQ(RudderLDAPConstants.A_API_TOKEN, token.value))
-                          optRes   <- optEntry match {
-                                        case None    => None.succeed
-                                        case Some(e) =>
-                                          mapper
-                                            .entry2ApiAccount(e)
-                                            .map(Some(_))
-                                            .toIO
-                                      }
-                        } yield {
-                          optRes
-                        }
-                      }
+                      case None    => None.succeed
                       case Some(e) => mapper.entry2ApiAccount(e).map(Some(_)).toIO
                     }
       } yield {
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonQueryObjects.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonQueryObjects.scala
index d39db8bbb4c..d9e938f866e 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonQueryObjects.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonQueryObjects.scala
@@ -64,9 +64,10 @@ import com.normation.rudder.domain.properties.NodeProperty
 import com.normation.rudder.domain.properties.PatchProperty
 import com.normation.rudder.domain.properties.PropertyProvider
 import com.normation.rudder.domain.properties.Visibility.Hidden
-import com.normation.rudder.domain.queries.NodeReturnType
 import com.normation.rudder.domain.queries.Query
 import com.normation.rudder.domain.queries.QueryReturnType
+import com.normation.rudder.domain.queries.QueryReturnType.NodeReturnType
+import com.normation.rudder.repository.FullNodeGroupCategory
 import com.normation.rudder.rule.category.RuleCategory
 import com.normation.rudder.rule.category.RuleCategoryId
 import com.normation.rudder.services.policies.PropertyParser
@@ -82,6 +83,7 @@ import io.scalaland.chimney.Transformer
 import io.scalaland.chimney.dsl.*
 import net.liftweb.common.*
 import net.liftweb.http.Req
+import zio.Chunk
 import zio.NonEmptyChunk
 import zio.json.*
 
@@ -115,6 +117,9 @@ object JsonQueryObjects {
   final case class JQClasses(
       classes: Option[List[String]]
   )
+  final case class JQNodeIdChunk(
+      nodeId: Option[Chunk[NodeId]]
+  )
   final case class JQNodeIdStatus(
       nodeId: List[NodeId],
       status: JQNodeStatusAction
@@ -141,6 +146,10 @@ object JsonQueryObjects {
     )
   }
 
+  final case class JQNodeInherited(
+      inherited: Option[Boolean]
+  )
+
   final case class JQNodePropertyInfo(
       inherited: Boolean,
       value:     String
@@ -166,6 +175,10 @@ object JsonQueryObjects {
     }
   }
 
+  final case class JQIncludeSystem(
+      includeSystem: Option[Boolean]
+  )
+
   final case class JQDirectiveSectionVar(
       name:  String,
       value: String
@@ -347,6 +360,57 @@ object JsonQueryObjects {
       _isEnabled:  Option[Boolean]
   )
 
+  final case class JQGroupCategory private[apidata] (
+      id:          Option[NodeGroupCategoryId] = None,
+      name:        Option[String] = None,
+      description: Option[String] = None,
+      parent:      Option[NodeGroupCategoryId] = None
+  ) {
+    def update(category: FullNodeGroupCategory): FullNodeGroupCategory = {
+      val updateId          = id.getOrElse(category.id)
+      val updateName        = name.getOrElse(category.name)
+      val updateDescription = description.getOrElse(category.description)
+      category.copy(
+        id = updateId,
+        name = updateName,
+        description = updateDescription
+      )
+    }
+
+    def create(defaultId: => NodeGroupCategoryId): PureResult[FullNodeGroupCategory] = {
+      name match {
+        case Some(name) =>
+          Right(
+            FullNodeGroupCategory(
+              id.getOrElse(defaultId),
+              name,
+              description.getOrElse(""),
+              Nil,
+              Nil
+            )
+          )
+        case None       =>
+          Left(Inconsistency("Could not create group Category, cause: name is not defined"))
+      }
+    }
+  }
+  object JQGroupCategory {
+    private val minimalNameSize = 3
+    // validation method for validating the name the group category
+    private[apidata] def validate(groupCategory: JQGroupCategory): Either[String, JQGroupCategory] = {
+      def validateName: Either[String, JQGroupCategory] = {
+        groupCategory.name match {
+          case None        => Right(groupCategory)
+          case Some(value) =>
+            if (value.size < minimalNameSize) {
+              Left(s"Group category name '${value}' must at least have a ${minimalNameSize} character size")
+            } else Right(groupCategory)
+        }
+      }
+      validateName
+    }
+  }
+
   final case class JQGroup(
       id:          Option[NodeGroupId] = None,
       displayName: Option[String] = None,
@@ -443,6 +507,7 @@ trait RudderJsonDecoders {
   implicit val classesDecoder:      JsonDecoder[JQClasses]    = DeriveJsonDecoder.gen[JQClasses].orElse((_, _) => JQClasses(None))
 
   implicit val nodeIdDecoder:             JsonDecoder[NodeId]                      = JsonDecoder[String].map(NodeId.apply)
+  implicit val nodeIdChunkDecoder:        JsonDecoder[JQNodeIdChunk]               = DeriveJsonDecoder.gen[JQNodeIdChunk]
   implicit val nodeStatusActionDecoder:   JsonDecoder[JQNodeStatusAction]          =
     JsonDecoder[String].mapOrFail(JQNodeStatusAction.withNameInsensitiveEither(_).left.map(_.getMessage()))
   implicit val nodeIdStatusDecoder:       JsonDecoder[JQNodeIdStatus]              = DeriveJsonDecoder
@@ -454,17 +519,16 @@ trait RudderJsonDecoders {
         Right(x)
       }
     })
+  implicit val nodeInheritedDecoder:      JsonDecoder[JQNodeInherited]             = DeriveJsonDecoder.gen[JQNodeInherited]
   implicit val nodestatusDecoder:         JsonDecoder[JQNodeStatus]                = DeriveJsonDecoder.gen[JQNodeStatus]
   implicit val nodePropertyInfoDecoder:   JsonDecoder[JQNodePropertyInfo]          = DeriveJsonDecoder.gen[JQNodePropertyInfo]
   implicit val nodeIdsSoftwareProperties: JsonDecoder[JQNodeIdsSoftwareProperties] =
     DeriveJsonDecoder.gen[JQNodeIdsSoftwareProperties]
 
-  implicit val securityTokenDecoder: JsonDecoder[SecurityToken] =
-    JsonDecoder[String].mapOrFail(SecurityToken.parseValidate(_).left.map(_.fullMsg))
-  implicit val keyStatusDecoder:     JsonDecoder[KeyStatus]     =
+  implicit val keyStatusDecoder:  JsonDecoder[KeyStatus]    =
     JsonDecoder[String].mapOrFail(KeyStatus.apply(_).left.map(_.fullMsg))
-  implicit val agentKeyDecoder:      JsonDecoder[JQAgentKey]    = DeriveJsonDecoder.gen[JQAgentKey]
-  implicit val updateNodeDecoder:    JsonDecoder[JQUpdateNode]  = DeriveJsonDecoder.gen[JQUpdateNode]
+  implicit val agentKeyDecoder:   JsonDecoder[JQAgentKey]   = DeriveJsonDecoder.gen[JQAgentKey]
+  implicit val updateNodeDecoder: JsonDecoder[JQUpdateNode] = DeriveJsonDecoder.gen[JQUpdateNode]
 
   // JRRuleTarget
   object JRRuleTargetDecoder {
@@ -519,6 +583,8 @@ trait RudderJsonDecoders {
 
   implicit val ruleCategoryDecoder: JsonDecoder[JQRuleCategory] = DeriveJsonDecoder.gen
 
+  implicit val includeSystemDecoder: JsonDecoder[JQIncludeSystem] = DeriveJsonDecoder.gen
+
   // RestDirective - lazy because section/sectionVar/directive are mutually recursive
   implicit lazy val sectionDecoder:   JsonDecoder[JQDirectiveSection]    = DeriveJsonDecoder.gen
   implicit lazy val variableDecoder:  JsonDecoder[JQDirectiveSectionVar] = DeriveJsonDecoder.gen
@@ -541,6 +607,8 @@ trait RudderJsonDecoders {
   implicit val groupPropertyDecoder:       JsonDecoder[JQGroupProperty]     = DeriveJsonDecoder.gen
   implicit val groupPropertyDecoder2:      JsonDecoder[GroupProperty]       = JsonDecoder[JQGroupProperty].map(_.toGroupProperty)
   implicit val nodeGroupIdDecoder:         JsonDecoder[NodeGroupId]         = JsonDecoder[String].mapOrFail(x => NodeGroupId.parse(x))
+  implicit val groupCategoryDecoder:       JsonDecoder[JQGroupCategory]     =
+    DeriveJsonDecoder.gen[JQGroupCategory].mapOrFail(JQGroupCategory.validate)
   implicit val groupDecoder:               JsonDecoder[JQGroup]             = DeriveJsonDecoder.gen
 
 }
@@ -650,6 +718,14 @@ class ZioJsonExtractor(queryParser: CmdbQueryParser with JsonQueryLexer) {
     }
   }
 
+  def extractGroupCategory(req: Req): PureResult[JQGroupCategory] = {
+    if (req.json_?) {
+      parseJson[JQGroupCategory](req)
+    } else {
+      extractGroupCategoryFromParams(req.params)
+    }
+  }
+
   def extractDeleteMode(req: Req): PureResult[Option[DeleteMode]] = {
     if (req.json_?) {
       parseJson[JQDeleteMode](req).map(_.mode)
@@ -666,6 +742,14 @@ class ZioJsonExtractor(queryParser: CmdbQueryParser with JsonQueryLexer) {
     }
   }
 
+  def extractNodeIdChunk(req: Req): PureResult[Option[Chunk[NodeId]]] = {
+    parseJson[JQNodeIdChunk](req).map(_.nodeId)
+  }
+
+  def extractNodeInherited(req: Req): PureResult[Option[Boolean]] = {
+    parseJson[JQNodeInherited](req).map(_.inherited)
+  }
+
   def extractNodeIdStatus(req: Req): PureResult[JQNodeIdStatus] = {
     if (req.json_?) {
       parseJson[JQNodeIdStatus](req)
@@ -698,6 +782,14 @@ class ZioJsonExtractor(queryParser: CmdbQueryParser with JsonQueryLexer) {
     }
   }
 
+  def extractIncludeSystem(req: Req): PureResult[Option[Boolean]] = {
+    if (req.json_?) {
+      parseJson[JQIncludeSystem](req).map(_.includeSystem)
+    } else {
+      extractIncludeSystemFromParams(req.params)
+    }
+  }
+
   def extractIdsFromParams(params: Map[String, List[String]]): PureResult[Option[List[String]]] = {
     params.parseString("ids", s => Right(s.split(",").map(_.trim).toList))
   }
@@ -798,6 +890,29 @@ class ZioJsonExtractor(queryParser: CmdbQueryParser with JsonQueryLexer) {
     }
   }
 
+  def extractGroupCategoryFromParams(params: Map[String, List[String]]): PureResult[JQGroupCategory] = {
+    for {
+      id            <- params.parse("id", JsonDecoder[NodeGroupCategoryId])
+      name          <- params.parse("name", JsonDecoder[String])
+      description   <- params.parse("description", JsonDecoder[String])
+      parent        <- params.parse("parent", JsonDecoder[NodeGroupCategoryId])
+      groupCategory <-
+        JQGroupCategory
+          .validate(
+            JQGroupCategory(
+              id,
+              name,
+              description,
+              parent
+            )
+          )
+          .left
+          .map(Inconsistency(_))
+    } yield {
+      groupCategory
+    }
+  }
+
   def extractNodeDetailLevelFromParams(params: Map[String, List[String]]): PureResult[Option[JQNodeDetailLevel]] = {
     params.parseOne("include", _.split(",").toSet.transformInto[JQNodeDetailLevel])
   }
@@ -902,4 +1017,7 @@ class ZioJsonExtractor(queryParser: CmdbQueryParser with JsonQueryLexer) {
     }
   }
 
+  def extractIncludeSystemFromParams(params: Map[String, List[String]]): PureResult[Option[Boolean]] = {
+    params.parse("includeSystem", JsonDecoder[Boolean])
+  }
 }
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonResponseObjects.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonResponseObjects.scala
index 07eae6aa314..e764e40bc87 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonResponseObjects.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/JsonResponseObjects.scala
@@ -44,18 +44,8 @@ import com.normation.cfclerk.domain.TechniqueName
 import com.normation.cfclerk.domain.TechniqueVersion
 import com.normation.errors.*
 import com.normation.inventory.domain
-import com.normation.inventory.domain.AgentType
-import com.normation.inventory.domain.AgentVersion
-import com.normation.inventory.domain.FullInventory
-import com.normation.inventory.domain.InventoryStatus
-import com.normation.inventory.domain.MemorySize
-import com.normation.inventory.domain.NodeId
-import com.normation.inventory.domain.SecurityToken
-import com.normation.inventory.domain.SoftwareUpdate
-import com.normation.inventory.domain.Version
-import com.normation.inventory.domain.VmType
-import com.normation.rudder.apidata.JsonResponseObjects.JRPropertyHierarchy.JRPropertyHierarchyHtml
-import com.normation.rudder.apidata.JsonResponseObjects.JRPropertyHierarchy.JRPropertyHierarchyJson
+import com.normation.inventory.domain.*
+import com.normation.rudder.apidata.JsonResponseObjects.JRPropertyHierarchy.*
 import com.normation.rudder.domain.nodes
 import com.normation.rudder.domain.nodes.NodeGroup
 import com.normation.rudder.domain.nodes.NodeGroupCategoryId
@@ -64,25 +54,10 @@ import com.normation.rudder.domain.nodes.NodeInfo
 import com.normation.rudder.domain.nodes.NodeKind
 import com.normation.rudder.domain.nodes.NodeState
 import com.normation.rudder.domain.policies.*
-import com.normation.rudder.domain.properties.FailedNodePropertyHierarchy
-import com.normation.rudder.domain.properties.GenericProperty
+import com.normation.rudder.domain.properties.*
 import com.normation.rudder.domain.properties.GenericProperty.*
-import com.normation.rudder.domain.properties.GlobalParameter
-import com.normation.rudder.domain.properties.GroupProperty
-import com.normation.rudder.domain.properties.InheritMode
-import com.normation.rudder.domain.properties.NodeProperty
-import com.normation.rudder.domain.properties.NodePropertyError
-import com.normation.rudder.domain.properties.NodePropertyHierarchy
-import com.normation.rudder.domain.properties.NodePropertySpecificError
-import com.normation.rudder.domain.properties.ParentProperty
-import com.normation.rudder.domain.properties.PropertyProvider
-import com.normation.rudder.domain.properties.ResolvedNodePropertyHierarchy
-import com.normation.rudder.domain.properties.SuccessNodePropertyHierarchy
 import com.normation.rudder.domain.properties.Visibility.Displayed
-import com.normation.rudder.domain.queries.CriterionLine
-import com.normation.rudder.domain.queries.Query
-import com.normation.rudder.domain.queries.QueryReturnType
-import com.normation.rudder.domain.queries.ResultTransformation
+import com.normation.rudder.domain.queries.*
 import com.normation.rudder.domain.reports.ComplianceLevel
 import com.normation.rudder.domain.reports.RunAnalysisKind
 import com.normation.rudder.domain.servers.Srv
@@ -104,9 +79,7 @@ import com.normation.rudder.rule.category.RuleCategory
 import com.normation.rudder.rule.category.RuleCategoryId
 import com.normation.rudder.score.GlobalScore
 import com.normation.rudder.score.ScoreValue
-import com.normation.rudder.services.queries.CmdbQueryParser
-import com.normation.rudder.services.queries.StringCriterionLine
-import com.normation.rudder.services.queries.StringQuery
+import com.normation.rudder.services.queries.*
 import com.normation.rudder.tenants.TenantId
 import com.normation.utils.DateFormaterService
 import com.softwaremill.quicklens.*
@@ -493,9 +466,10 @@ object JsonResponseObjects {
 
     /**
      * The structure does not directly match the domain object, nodeKind is a contextual value of the node added to each AgentInfo
+     * and we just have the display name in place of the AgentType
      */
     final case class Management(
-        name:         AgentType,
+        name:         String,
         version:      Option[AgentVersion],
         capabilities: Chunk[String],
         nodeKind:     NodeKind
@@ -505,7 +479,7 @@ object JsonResponseObjects {
         val agents = info.agentsName.map { agent =>
           val capabilities = agent.capabilities.map(_.value).toList.sorted
           Management(
-            agent.agentType,
+            agent.agentType.displayName,
             agent.version,
             Chunk.fromIterable(capabilities),
             info.nodeKind
@@ -523,16 +497,17 @@ object JsonResponseObjects {
 
     /**
      * The structure does not directly match the domain object, it aggregates some fields
+     * and the cfengineKeys is only the string for PEM format, not the JSON serialisation used in LDAP
      */
     final case class ManagementDetails(
-        cfengineKeys:     Chunk[SecurityToken],
+        cfengineKeys:     Chunk[String],
         cfengineUser:     String,
         scheduleOverride: Option[ScheduleOverride]
     )
     object ManagementDetails {
       implicit val transformer: Transformer[NodeFact, ManagementDetails] = Transformer
         .define[NodeFact, ManagementDetails]
-        .withFieldComputed(_.cfengineKeys, n => Chunk(n.rudderAgent.securityToken))
+        .withFieldComputed(_.cfengineKeys, n => Chunk(n.rudderAgent.securityToken.key))
         .withFieldComputed(_.cfengineUser, _.rudderAgent.user)
         .withFieldComputed(
           _.scheduleOverride,
@@ -1380,7 +1355,7 @@ object JsonResponseObjects {
 
     /**
      * Transform proprety hierarchy into HTML or JSON
-     * Provided hierarchy should be sorted from original order of parent properties : 
+     * Provided hierarchy should be sorted from original order of parent properties :
      * - nodes
      * - groups
      * - global params
@@ -1461,7 +1436,7 @@ object JsonResponseObjects {
 
   /**
    * Model that specifies what one or all properties has :
-   * an error message that needs to be there when 
+   * an error message that needs to be there when
    * the global status of property is fine,
    * and which is also optional in the status of a property
    */
@@ -1495,8 +1470,8 @@ object JsonResponseObjects {
       /**
        * Split global status from inherited one :
        * global ok/error status vs status on specific properties.
-       * 
-       * The global one cannot be duplicated (for distinct error messages) 
+       *
+       * The global one cannot be duplicated (for distinct error messages)
        * so it needs to be a set.
        */
       def separate: (Set[GlobalPropertyStatus], Iterable[InheritedPropertyStatus]) = {
@@ -1511,8 +1486,8 @@ object JsonResponseObjects {
 
       /**
        * Gather all error messages
-       * 
-       * Implementation uses a toSet because iterable 
+       *
+       * Implementation uses a toSet because iterable
        * is usually already a set
        */
       def distictErrorMessages: Set[String] = {
@@ -1526,7 +1501,7 @@ object JsonResponseObjects {
   /**
    * Global properties are OK or are in error :
    * they can have global error messages in properties
-   * (this does not prevent inherited properties to exist 
+   * (this does not prevent inherited properties to exist
    * and also have errors)
    */
   sealed trait GlobalPropertyStatus extends PropertyStatus
@@ -1555,11 +1530,11 @@ object JsonResponseObjects {
   }
 
   /**
-   * Status of individual properties : 
+   * Status of individual properties :
    * there is always a property identifier (the property name),
    * an set of properties inherited from parent (ordered by ancestry),
    *
-   * There can be conflicts in children properties so this identifies 
+   * There can be conflicts in children properties so this identifies
    * as a subtype.
    */
   sealed trait InheritedPropertyStatus extends PropertyStatus {
@@ -1939,7 +1914,111 @@ object JsonResponseObjects {
   }
 
   /**
-   * Representation of a group category with bare minimum group information
+   * Data container for the whole group category tree, provides the "groupCategories" dataContainer
+   */
+  final case class JRGroupCategoriesFull(groupCategories: JRFullGroupCategory)
+
+  /**
+   * Data container for the group category tree with minimal info, provides the "groupCategories" dataContainer
+   */
+  final case class JRGroupCategoriesMinimal(groupCategories: JRMinimalGroupCategory)
+
+  /**
+   * Representation of a group category with full group information
+   */
+  final case class JRFullGroupCategory(
+      id:                                     NodeGroupCategoryId,
+      name:                                   String,
+      description:                            String,
+      parent:                                 NodeGroupCategoryId,
+      @jsonField("categories") subCategories: List[JRFullGroupCategory],
+      groups:                                 List[JRGroup],
+      @jsonField("targets") targetInfos:      List[JRRuleTargetInfo]
+  )
+
+  object JRFullGroupCategory {
+    /*
+     * Somehow the chimney transformer derivation does not provide a way to pass the parent due to recursive type,
+     * so we have to make an inline transformer.
+     * Sort by ID, also in groups to keep diff easier
+     */
+    def fromCategory(
+        cat:    FullNodeGroupCategory,
+        parent: Option[NodeGroupCategoryId]
+    ): JRFullGroupCategory = {
+      cat
+        .into[JRFullGroupCategory]
+        .withFieldConst(
+          _.parent,
+          parent.getOrElse(cat.id)
+        )
+        .withFieldComputed(
+          _.subCategories,
+          cat => cat.subCategories.map(c => fromCategory(c, Some(cat.id))).sortBy(_.id.value)
+        )
+        .withFieldComputed(
+          _.groups,
+          cat => {
+            cat.ownGroups.values.toList.map(t => JRGroup.fromGroup(t.nodeGroup, cat.id, None)).sortBy(_.id)
+          }
+        )
+        .withFieldComputed(
+          _.targetInfos,
+          _.targetInfos.collect {
+            case t @ FullRuleTargetInfo(_: FullOtherTarget, _, _, _, _) => t.toTargetInfo.transformInto[JRRuleTargetInfo]
+          }
+        )
+        .transform
+    }
+  }
+
+  /**
+   * Representation of a group category with bare minimum group and subcategories ids list
+   */
+  final case class JRMinimalGroupCategory(
+      id:                                     NodeGroupCategoryId,
+      name:                                   String,
+      description:                            String,
+      parent:                                 NodeGroupCategoryId,
+      @jsonField("categories") subCategories: List[NodeGroupCategoryId],
+      groups:                                 List[NodeGroupId],
+      @jsonField("targets") targetInfos:      List[JRRuleTargetInfo]
+  )
+
+  object JRMinimalGroupCategory {
+    def fromCategory(
+        cat:    FullNodeGroupCategory,
+        parent: NodeGroupCategoryId
+    ): JRMinimalGroupCategory = {
+      cat
+        .into[JRMinimalGroupCategory]
+        .withFieldConst(
+          _.parent,
+          parent
+        )
+        .withFieldComputed(
+          _.subCategories,
+          _.subCategories.map(_.id).sortBy(_.value)
+        )
+        .withFieldComputed(
+          _.groups,
+          cat => {
+            cat.ownGroups.keys.toList.sortBy(_.serialize)
+          }
+        )
+        .withFieldComputed(
+          _.targetInfos,
+          _.targetInfos.collect {
+            case t @ FullRuleTargetInfo(_: FullOtherTarget, _, _, _, _) => t.toTargetInfo.transformInto[JRRuleTargetInfo]
+          }
+        )
+        .transform
+    }
+  }
+
+  /**
+   * Representation of a group category with minimal group information:
+   * it only contains information useful for display of a group within the hierarchy of groups.
    */
   final case class JRGroupCategoryInfo(
       id:                                     String,
@@ -2143,6 +2222,14 @@ trait RudderJsonEncoders {
   implicit val groupEncoder:                    JsonEncoder[JRGroup]                    = DeriveJsonEncoder.gen
   implicit val objectInheritedObjectProperties: JsonEncoder[JRGroupInheritedProperties] = DeriveJsonEncoder.gen
 
+  implicit val fullGroupCategoryEncoder:      JsonEncoder[JRFullGroupCategory]             =
+    DeriveJsonEncoder.gen[JRFullGroupCategory]
+  implicit val minimalGroupCategoryEncoder:   JsonEncoder[JRMinimalGroupCategory]          =
+    DeriveJsonEncoder.gen[JRMinimalGroupCategory]
+  implicit val groupCategoriesFullEncoder:    JsonEncoder[JRGroupCategoriesFull]           =
+    DeriveJsonEncoder.gen[JRGroupCategoriesFull]
+  implicit val groupCategoriesMinimalEncoder: JsonEncoder[JRGroupCategoriesMinimal]        =
+    DeriveJsonEncoder.gen[JRGroupCategoriesMinimal]
   implicit val groupInfoEncoder:              JsonEncoder[JRGroupCategoryInfo.JRGroupInfo] =
     DeriveJsonEncoder.gen[JRGroupCategoryInfo.JRGroupInfo]
   implicit lazy val groupCategoryInfoEncoder: JsonEncoder[JRGroupCategoryInfo]             = DeriveJsonEncoder.gen[JRGroupCategoryInfo]
@@ -2170,10 +2257,7 @@ trait RudderJsonEncoders {
 
   implicit val vmTypeEncoder: JsonEncoder[VmType] = JsonEncoder[String].contramap(_.name)
 
-  implicit val agentTypeEncoder:         JsonEncoder[AgentType]           = JsonEncoder[String].contramap(_.displayName)
-  implicit val agentVersionEncoder:      JsonEncoder[AgentVersion]        = JsonEncoder[String].contramap(_.value)
   implicit val nodeKindEncoder:          JsonEncoder[NodeKind]            = JsonEncoder[String].contramap(_.name)
-  implicit val securityTokenEncoder:     JsonEncoder[SecurityToken]       = JsonEncoder[String].contramap(_.key)
   implicit val managementEncoder:        JsonEncoder[Management]          = DeriveJsonEncoder.gen[Management]
   implicit val scheduleOverrideEncoder:  JsonEncoder[ScheduleOverride]    = DeriveJsonEncoder.gen[ScheduleOverride]
   implicit val managementDetailsEncoder: JsonEncoder[ManagementDetails]   = DeriveJsonEncoder.gen[ManagementDetails]
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/RestDataSerializer.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/RestDataSerializer.scala
index b72f7625383..0c02aaa4b53 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/RestDataSerializer.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/apidata/RestDataSerializer.scala
@@ -182,7 +182,8 @@ final case class RestDataSerializerImpl(
   }
 
   override def serializeGroup(group: NodeGroup, cat: Option[NodeGroupCategoryId], crId: Option[ChangeRequestId]): JValue = {
-    val query = group.query.map(query => query.toJSON)
+    import zio.json.*
+    val query = group.query.map(query => parse(query.toJson))
     (
       ("changeRequestId" -> crId.map(_.value.toString))
       ~ ("id"            -> group.id.serialize)
@@ -392,7 +393,7 @@ final case class RestDataSerializerImpl(
   def serializeGroupChange(change: NodeGroupChange, apiVersion: ApiVersion): Box[JValue] = {
 
     def serializeNodeGroupDiff(diff: ModifyNodeGroupDiff, initialState: NodeGroup): JValue = {
-      implicit def convert[T](value: GroupProperty): JValue = value.toJson
+      implicit def convert[T](value: GroupProperty): JValue = value.toJsonObj
       def convertNodeList(nl:        Set[NodeId]):   JValue = nl.map(_.value).toList
       def convertQuery(q:            Option[Query]): JValue = q.map(_.toString)
 
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/UserPropertyService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/config/UserPropertyService.scala
similarity index 69%
rename from webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/UserPropertyService.scala
rename to webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/config/UserPropertyService.scala
index cb4bc5cb694..65d5e688ffb 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/UserPropertyService.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/config/UserPropertyService.scala
@@ -34,14 +34,16 @@
  *
  *************************************************************************************
  */
-package com.normation.rudder.web.services
+package com.normation.rudder.config
 import com.normation.box.*
 import com.normation.errors.*
-import zio.syntax.*
 
-object ReasonBehavior extends Enumeration {
-  type ReasonBehavior = Value
-  val Disabled, Mandatory, Optionnal = Value
+sealed trait ReasonBehavior
+
+object ReasonBehavior {
+  case object Disabled  extends ReasonBehavior
+  case object Mandatory extends ReasonBehavior
+  case object Optional  extends ReasonBehavior
 }
 
 /**
@@ -54,20 +56,11 @@ trait UserPropertyService {
    * @return the strategy
    */
   // def reasonsFieldEnabled() : Boolean
-  def reasonsFieldBehavior:    ReasonBehavior.ReasonBehavior
+  def reasonsFieldBehavior:    ReasonBehavior
   def reasonsFieldExplanation: String
 
 }
 
-class UserPropertyServiceImpl(val opt: ReasonsMessageInfo) extends UserPropertyService {
-
-  private val impl =
-    new StatelessUserPropertyService(() => opt.enabled.succeed, () => opt.mandatory.succeed, () => opt.explanation.succeed)
-
-  override val reasonsFieldBehavior = impl.reasonsFieldBehavior
-  override val reasonsFieldExplanation: String = impl.reasonsFieldExplanation
-}
-
 /**
  * Reloadable service
  */
@@ -76,17 +69,16 @@ class StatelessUserPropertyService(
     getMandatory:   () => IOResult[Boolean],
     getExplanation: () => IOResult[String]
 ) extends UserPropertyService {
+  import ReasonBehavior.*
 
   // TODO: handle errors here!
 
-  override def reasonsFieldBehavior:    ReasonBehavior.ReasonBehavior = {
+  override def reasonsFieldBehavior:    ReasonBehavior = {
     (getEnable().toBox.getOrElse(true), getMandatory().toBox.getOrElse(true)) match {
-      case (true, true)  => ReasonBehavior.Mandatory
-      case (true, false) => ReasonBehavior.Optionnal
-      case (false, _)    => ReasonBehavior.Disabled
+      case (true, true)  => Mandatory
+      case (true, false) => Optional
+      case (false, _)    => Disabled
     }
   }
-  override def reasonsFieldExplanation: String                        = getExplanation().toBox.getOrElse("")
+  override def reasonsFieldExplanation: String         = getExplanation().toBox.getOrElse("")
 }
-
-class ReasonsMessageInfo(val enabled: Boolean, val mandatory: Boolean, val explanation: String)
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/db/Doobie.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/db/Doobie.scala
index dec0d8f6127..1640f9f1eee 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/db/Doobie.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/db/Doobie.scala
@@ -67,8 +67,6 @@ import scala.xml.XML
 import zio.*
 import zio.interop.catz.*
 import zio.json.*
-import zio.json.JsonDecoder
-import zio.json.JsonEncoder
 import zio.json.ast.Json
 
 /**
@@ -330,12 +328,10 @@ trait JsonInstances {
   import doobie.util.*
   import zio.json.DecoderOps
   import zio.json.EncoderOps
-  import zio.json.ast.Json.Null
 
   // for debugging. 250 is the default documented val in
   // https://tpolecat.github.io/doobie/docs/12-Custom-Mappings.html#defining-get-and-put-for-exotic-types
-  implicit val showPGobject:     Show[PGobject] = Show.show(_.getValue.take(250))
-  implicit private val showJson: Show[Json]     = Show.show(_.toString().take(250))
+  implicit val showPGobject: Show[PGobject] = Show.show(_.getValue.take(250))
 
   implicit val jsonPut: Put[Json] = {
     Put.Advanced
@@ -359,10 +355,28 @@ trait JsonInstances {
       .temap(a => a.getValue.fromJson)
   }
 
-  def pgEncoderPut[A: JsonEncoder]: Put[A] =
-    Put[Json].contramap(_.toJsonAST.getOrElse(Null))
+  // for structured Json encoder/decoder, we don't want to rely on intermediate JSON:
+  // - it means one more step that is useless since we have the structured result
+  // - it ignores special mapping from @jsonField etc, and so it is inconsistent with other JSON serializations
+  def pgEncoderPut[A](implicit e: JsonEncoder[A]): Put[A] = {
+    Put.Advanced
+      .other[PGobject](
+        NonEmptyList.of("jsonb")
+      )
+      .tcontramap[A] { a =>
+        val o = new PGobject
+        o.setType("jsonb")
+        o.setValue(a.toJson)
+        o
+      }
+  }
 
-  def pgDecoderGet[A: JsonDecoder]: Get[A] =
-    Get[Json].temap(_.as)
+  def pgDecoderGet[A: JsonDecoder]: Get[A] = {
+    Get.Advanced
+      .other[PGobject](
+        NonEmptyList.of("jsonb")
+      )
+      .temap[A](a => a.getValue.fromJson)
+  }
 
 }
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/Constants.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/Constants.scala
index dbb07f0c4ec..06d0779372f 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/Constants.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/Constants.scala
@@ -57,7 +57,6 @@ object Constants {
   val NODE_PROMISES_PARENT_DIR      = "share"
 
   val CFENGINE_COMMUNITY_PROMISES_PATH = "/var/rudder/cfengine-community/inputs"
-  val CFENGINE_NOVA_PROMISES_PATH      = "/var/cfengine/inputs"
 
   val GENERATED_PROPERTY_DIR   = "properties.d"
   val GENERATED_PROPERTY_FILE  = "properties.json"
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderDit.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderDit.scala
index acab94e4cc9..5a3b0182eba 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderDit.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderDit.scala
@@ -57,7 +57,6 @@ import com.normation.rudder.repository.NodeGroupLibraryArchiveId
 import com.normation.rudder.rule.category.RuleCategoryId
 import com.unboundid.ldap.sdk.*
 import net.liftweb.common.*
-import net.liftweb.json.*
 import zio.json.*
 
 class CATEGORY(
@@ -232,7 +231,7 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit {
         uuid:                 String,
         parentDN:             DN,
         techniqueName:        TechniqueName,
-        acceptationDateTimes: JObject,
+        acceptationDateTimes: String,
         isEnabled:            Boolean,
         policyTypes:          PolicyTypes
     ): LDAPEntry = {
@@ -241,7 +240,7 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit {
       mod.resetValuesTo(A_TECHNIQUE_UUID, techniqueName.value)
       mod.resetValuesTo(A_IS_ENABLED, isEnabled.toLDAPString)
       mod.resetValuesTo(A_POLICY_TYPES, policyTypes.toJson)
-      mod.resetValuesTo(A_ACCEPTATION_DATETIME, compactRender(acceptationDateTimes))
+      mod.resetValuesTo(A_ACCEPTATION_DATETIME, acceptationDateTimes)
       mod
     }
 
@@ -407,7 +406,7 @@ class RudderDit(val BASE_DN: DN) extends AbstractDit {
       query match {
         case None    => // No query to add. Maybe we'd like to enforce that it is not activated
         case Some(q) =>
-          mod.resetValuesTo(A_QUERY_NODE_GROUP, q.toJSONString)
+          mod.resetValuesTo(A_QUERY_NODE_GROUP, q.toJson)
       }
       mod
     }
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderLDAPConstants.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderLDAPConstants.scala
index 4ae2cc2fbae..c7faa7046ef 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderLDAPConstants.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/RudderLDAPConstants.scala
@@ -183,7 +183,7 @@ object RudderLDAPConstants extends Loggable {
   OC.createObjectClass(
     OC_POLICY_SERVER_NODE,
     sup = OC(OC_RUDDER_NODE),
-    must = Set(A_HOSTNAME, A_PKEYS, A_LIST_OF_IP, A_INVENTORY_DATE, A_ROOT_USER, A_AGENTS_NAME, A_NODE_POLICY_SERVER),
+    must = Set(A_HOSTNAME, A_LIST_OF_IP, A_INVENTORY_DATE, A_ROOT_USER, A_AGENTS_NAME, A_NODE_POLICY_SERVER),
     may = Set(A_DESCRIPTION)
   )
 
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/ApplicationLogger.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/ApplicationLogger.scala
index 802c66f93d7..799428635f9 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/ApplicationLogger.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/logger/ApplicationLogger.scala
@@ -233,6 +233,10 @@ object GitArchiveLoggerPure extends NamedZioLogger {
   override def loggerName: String = "git-policy-archive"
 }
 
+object EventLogsLoggerPure extends NamedZioLogger {
+  def loggerName = "eventlogs"
+}
+
 object ConfigurationLoggerPure extends NamedZioLogger {
   def loggerName = "configuration"
 
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/Node.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/Node.scala
index ab31d63aa29..f99bf8496e2 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/Node.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/Node.scala
@@ -37,10 +37,10 @@
 
 package com.normation.rudder.domain.nodes
 
+import com.normation.inventory.domain.Certificate
 import com.normation.inventory.domain.FullInventory
 import com.normation.inventory.domain.KeyStatus
 import com.normation.inventory.domain.NodeId
-import com.normation.inventory.domain.PublicKey
 import com.normation.inventory.domain.SecurityToken
 import com.normation.rudder.domain.policies.PolicyMode
 import com.normation.rudder.domain.policies.SimpleDiff
@@ -92,17 +92,18 @@ case object Node {
   }
 }
 
-sealed abstract class NodeState(override val entryName: String) extends EnumEntry {
+// isEnabled is a generic marker to decide if that state should be ignored during generation etc.
+sealed abstract class NodeState(override val entryName: String, val isEnabled: Boolean) extends EnumEntry {
   def name: String = entryName
 }
 
 object NodeState extends Enum[NodeState] {
 
-  case object Initializing  extends NodeState("initializing")
-  case object Enabled       extends NodeState("enabled")
-  case object EmptyPolicies extends NodeState("empty-policies")
-  case object Ignored       extends NodeState("ignored")
-  case object PreparingEOL  extends NodeState("preparing-eol")
+  case object Initializing  extends NodeState("initializing", true)
+  case object Enabled       extends NodeState("enabled", true)
+  case object EmptyPolicies extends NodeState("empty-policies", true)
+  case object Ignored       extends NodeState("ignored", false)
+  case object PreparingEOL  extends NodeState("preparing-eol", false)
 
   def values: IndexedSeq[NodeState] = findValues
 
@@ -210,7 +211,7 @@ object ModifyNodeDiff {
       case None    => None
       case Some(k) =>
         oldKeys match {
-          case Nil    => Some(SimpleDiff(PublicKey(""), k))
+          case Nil    => Some(SimpleDiff(Certificate(""), k))
           case x :: _ => if (k == x) None else Some(SimpleDiff(x, k))
         }
     }
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/NodeGroup.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/NodeGroup.scala
index f1915cab663..266cc871111 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/NodeGroup.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/NodeGroup.scala
@@ -41,7 +41,7 @@ import com.normation.GitVersion
 import com.normation.GitVersion.Revision
 import com.normation.inventory.domain.NodeId
 import com.normation.rudder.domain.properties.GroupProperty
-import com.normation.rudder.domain.queries.And
+import com.normation.rudder.domain.queries.CriterionComposition.And
 import com.normation.rudder.domain.queries.CriterionLine
 import com.normation.rudder.domain.queries.Query
 import com.normation.rudder.domain.queries.SubGroupComparator
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/NodeInfo.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/NodeInfo.scala
index cb015ba5f0d..7e4bd6a0e03 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/NodeInfo.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/nodes/NodeInfo.scala
@@ -44,7 +44,6 @@ import com.normation.rudder.domain.Constants
 import com.normation.rudder.domain.logger.PolicyGenerationLogger
 import com.normation.zio.*
 import enumeratum.*
-import java.io.StringReader
 import java.security.KeyFactory
 import java.security.MessageDigest
 import java.security.interfaces.RSAPublicKey
@@ -53,7 +52,6 @@ import net.liftweb.common.*
 import org.apache.commons.codec.binary.Base64
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo
-import org.bouncycastle.openssl.PEMParser
 import org.bouncycastle.util.encoders.Hex
 import org.joda.time.DateTime
 import zio.*
@@ -129,7 +127,6 @@ final case class NodeInfo(
         case Full(hash) => s"${algo}=${hash}"
         case eb: EmptyBox =>
           val msgForToken = tokenType match {
-            case _: PublicKey   => "of CFEngine public key for"
             case _: Certificate => "for certificate of"
           }
           val e           = eb ?~! s"Error when trying to get the CFEngine-${algo} digest ${msgForToken} node '${hostname}' (${id.value})"
@@ -140,18 +137,9 @@ final case class NodeInfo(
 
     agentsName.headOption.map(a => (a.agentType, a.securityToken)) match {
 
-      case Some((AgentType.CfeCommunity, key: PublicKey)) =>
-        formatDigest(NodeKeyHash.getCfengineMD5Digest(key).toBox, "MD5", key)
-
-      case Some((AgentType.CfeEnterprise, key: PublicKey)) =>
-        formatDigest(NodeKeyHash.getCfengineSHA256Digest(key).toBox, "SHA", key)
-
       case Some((AgentType.CfeCommunity, cert: Certificate)) =>
         formatDigest(NodeKeyHash.getCfengineMD5CertDigest(cert).toBox, "MD5", cert)
 
-      case Some((AgentType.CfeEnterprise, cert: Certificate)) =>
-        formatDigest(NodeKeyHash.getCfengineSHA256CertDigest(cert).toBox, "SHA", cert)
-
       case Some((AgentType.Dsc, _)) =>
         PolicyGenerationLogger.info(
           s"Node '${hostname}' (${id.value}) is a Windows node and a we do not know how to generate a hash yet"
@@ -174,17 +162,7 @@ final case class NodeInfo(
    */
   lazy val keyHashBase64Sha256: String = {
     agentsName.headOption.map(_.securityToken) match {
-      case Some(publicKey: PublicKey) =>
-        NodeKeyHash.getB64Sha256Digest(publicKey).either.runNow match {
-          case Right(hash) =>
-            hash
-          case Left(e)     =>
-            PolicyGenerationLogger.error(
-              s"Error when trying to get the sha-256 digest of CFEngine public key for node '${hostname}' (${id.value}): ${e.fullMsg}"
-            )
-            ""
-        }
-      case Some(cert: Certificate)    =>
+      case Some(cert: Certificate) =>
         NodeKeyHash.getB64Sha256Digest(cert).either.runNow match {
           case Right(hash) => hash
           case Left(e)     =>
@@ -193,7 +171,7 @@ final case class NodeInfo(
             )
             ""
         }
-      case None                       =>
+      case None                    =>
         PolicyGenerationLogger.info(s"Node '${hostname}' (${id.value}) doesn't have a registered public key")
         ""
 
@@ -256,13 +234,6 @@ object NodeKeyHash {
    *
    * Caution: to use the complete key, with header and footer, you need to use key.key
    */
-  def getCfengineMD5Digest(key: PublicKey): IOResult[String] = {
-    getCfengineDigestFromCfeKey(key, "MD5")
-  }
-
-  def getCfengineSHA256Digest(key: PublicKey): IOResult[String] = {
-    getCfengineDigestFromCfeKey(key, "SHA-256")
-  }
 
   /*
    * A version of the digest that works on a certificate
@@ -288,32 +259,6 @@ object NodeKeyHash {
     }
   }
 
-  protected def getPubkeyInfo(key: PublicKey): IOResult[SubjectPublicKeyInfo] = {
-    for {
-      // the parser able to read PEM files
-      // Parser may be null if the key is invalid
-      parser     <- IOResult.attemptZIO(Option(new PEMParser(new StringReader(key.key))) match {
-                      case None    => Inconsistency(s"Error when trying to create the PEM parser for agent key").fail
-                      case Some(x) => x.succeed
-                    })
-      // read the PEM b64 pubkey string
-      pubkeyInfo <- IOResult.attempt(parser.readObject.asInstanceOf[SubjectPublicKeyInfo])
-      // when bouncy castle doesn't successfuly load key, pubkeyinfo is null
-      _          <- if (pubkeyInfo == null) Inconsistency(s"Error when reading key (it is likely malformed)").fail else ZIO.unit
-    } yield {
-      pubkeyInfo
-    }
-  }
-
-  protected def getCfengineDigestFromCfeKey(key: PublicKey, algo: String): IOResult[String] = {
-    for {
-      pubkeyInfo <- getPubkeyInfo(key)
-      digest     <- getCfengineDigest(pubkeyInfo, algo)
-    } yield {
-      digest
-    }
-  }
-
   /*
    * The actual implementation that can use either
    * "MD5" or "SHA-256" digest.
@@ -375,23 +320,6 @@ object NodeKeyHash {
     }
   }
 
-  /**
-   * Get the sha256 digest of the public key.
-   *
-   * This is a direct digest of the encoded key in binary
-   * format, i.e neither modulus nor exponent is extracted
-   * contrary to CFEngine dedicated format.
-   */
-  def getSha256Digest(key: PublicKey): IOResult[Array[Byte]] = {
-    for {
-      pubkeyInfo <- getPubkeyInfo(key)
-      encoded    <- IOResult.attempt(pubkeyInfo.getEncoded())
-      digest     <- sha256Digest(encoded)
-    } yield {
-      digest
-    }
-  }
-
   /**
    * Get the sha256 digest of the public key of the certificate.
    *
@@ -403,7 +331,7 @@ object NodeKeyHash {
     for {
       res            <- SecurityToken.parseCertificate(cert)
       (pubkeyInfo, _) = res
-      // when bouncy castle doesn't successfuly load key, pubkeyinfo is null
+      // when bouncy castle doesn't successfully load key, pubkeyinfo is null
       _              <- if (pubkeyInfo == null) Inconsistency(s"Error when reading key (it is likely malformed)").fail else ZIO.unit
       pubkey         <- IOResult.attempt(pubkeyInfo.getEncoded)
       digest         <- sha256Digest(pubkey)
@@ -415,24 +343,14 @@ object NodeKeyHash {
   /**
    * Get Hex encoded string of the sha256 digest of the public key
    */
-  def getHexSha256Digest(key: PublicKey):    IOResult[String] = {
-    getSha256Digest(key).map(Hex.toHexString)
-  }
   def getHexSha256Digest(cert: Certificate): IOResult[String] = {
     getSha256Digest(cert).map(Hex.toHexString)
   }
 
-  /**
-   * Get Base64 encoding compatible with openssl of the sha256 of the public key
-   */
-  def getB64Sha256Digest(key: PublicKey): IOResult[String] = {
-    getSha256Digest(key).map(Base64.encodeBase64String)
-  }
-
   /**
    * Base64 encoding of the SHA-256 hash of the DER format of the public key.
-   * This is the (deprecated) format used in apach headers, and that can generated
-   * with the, as alway simple, openssl command chain:
+   * This is the (deprecated) format used in apache headers, and that can generated
+   * with the, as always simple, openssl command chain:
    * openssl x509 -in my-certificate.pem -pubkey -noout | openssl pkey -pubin -outform der | openssl dgst -sha256 -binary | openssl enc -base64
    */
   def getB64Sha256Digest(cert: Certificate): IOResult[String] = {
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/ActiveTechnique.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/ActiveTechnique.scala
index 64ebc5e941e..e44e32bf4cb 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/ActiveTechnique.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/policies/ActiveTechnique.scala
@@ -39,7 +39,9 @@ package com.normation.rudder.domain.policies
 
 import com.normation.cfclerk.domain.TechniqueName
 import com.normation.cfclerk.domain.TechniqueVersion
+import com.normation.ldap.sdk.GeneralizedTime
 import org.joda.time.DateTime
+import zio.json.*
 
 final case class ActiveTechniqueId(value: String) extends AnyVal
 
@@ -60,12 +62,37 @@ final case class ActiveTechniqueId(value: String) extends AnyVal
 final case class ActiveTechnique(
     id:                   ActiveTechniqueId,
     techniqueName:        TechniqueName,
-    acceptationDatetimes: Map[TechniqueVersion, DateTime], // TODO: remove directives ids, they DON'T have to be here.
-
-    directives:  List[DirectiveUid] = Nil,
-    _isEnabled:  Boolean = true,
-    policyTypes: PolicyTypes = PolicyTypes.rudderBase
+    acceptationDatetimes: AcceptationDateTime,
+    directives:           List[DirectiveUid] = Nil,
+    _isEnabled:           Boolean = true,
+    policyTypes:          PolicyTypes = PolicyTypes.rudderBase
 ) {
   // system object must ALWAYS be ENABLED.
   def isEnabled: Boolean = _isEnabled || policyTypes.isSystem
 }
+
+final case class AcceptationDateTime(versions: Map[TechniqueVersion, DateTime]) {
+  def withNewVersions(vs: Map[TechniqueVersion, DateTime]) = AcceptationDateTime(versions ++ vs)
+}
+
+object AcceptationDateTime {
+
+  def empty = AcceptationDateTime(Map())
+
+  implicit val decoderTechniqueVersion: JsonFieldDecoder[TechniqueVersion] =
+    JsonFieldDecoder.string.mapOrFail(TechniqueVersion.parse)
+  implicit val encoderTechniqueVersion: JsonFieldEncoder[TechniqueVersion] = JsonFieldEncoder.string.contramap(_.serialize)
+
+  implicit val codecDateTime: JsonCodec[DateTime] = new JsonCodec(
+    JsonEncoder.string.contramap(s => GeneralizedTime(s).toString()),
+    JsonDecoder.string.mapOrFail(x =>
+      GeneralizedTime.parse(x).map(_.dateTime).toRight(s"Error when parsing '${x}' as a generalized time'")
+    )
+  )
+
+  // we're forced to spell it
+  implicit val mapCodec: JsonCodec[Map[TechniqueVersion, DateTime]] = JsonCodec.map
+
+  implicit val decoderAcceptationDateTime: JsonDecoder[AcceptationDateTime] = mapCodec.decoder.map(AcceptationDateTime.apply)
+  implicit val encoderAcceptationDateTime: JsonEncoder[AcceptationDateTime] = mapCodec.encoder.contramap(_.versions)
+}
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/properties/Properties.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/properties/Properties.scala
index aa81affa250..bc7e59ee87b 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/properties/Properties.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/properties/Properties.scala
@@ -12,7 +12,9 @@
  *
  * In accordance with the terms of section 7 (7. Additional Terms.) of
  * the GNU General Public License version 3, the copyright holders add
- * the following Additional permissions:
+ * the following Additional permissions:DecoderOps
+import zio.json.EncoderOps
+import zio.json.ast.Json
  * Notwithstanding to the terms of section 5 (5. Conveying Modified Source
  * Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
  * Public License version 3, when you create a Related Module, this
@@ -57,6 +59,8 @@ import net.liftweb.json.JsonDSL.*
 import org.apache.commons.text.StringEscapeUtils
 import zio.Chunk
 import zio.NonEmptyChunk
+import zio.json.*
+import zio.json.ast.*
 
 /*
  * A property provider is the thing responsible for that property.
@@ -616,6 +620,35 @@ object GenericProperty {
     }
   }
 
+  def toJsonZio(value: ConfigValue): Json = {
+    import zio.json.ast.Json.*
+    value.valueType() match {
+      case ConfigValueType.NULL    => Null
+      case ConfigValueType.BOOLEAN => Bool(value.unwrapped().asInstanceOf[Boolean])
+      case ConfigValueType.NUMBER  =>
+        value.unwrapped() match {
+          case f: java.lang.Float   => Num(f)
+          case d: java.lang.Double  => Num(d)
+          case i: java.lang.Integer => Num(i)
+          case l: java.lang.Long    => Num(l)
+          case error =>
+            throw new IllegalArgumentException(
+              s"Error with config value '${value}': it says it is a NUMBER but it is: ${value.unwrapped()}. Please report the bug."
+            )
+        }
+      case ConfigValueType.STRING  => Str(value.unwrapped().asInstanceOf[String])
+      // the only safe and compatible way for array/object seems to be to render and then parse
+      case _                       =>
+        value.render(ConfigRenderOptions.concise()).fromJson[Json] match {
+          case Left(err)   =>
+            throw new IllegalArgumentException(
+              s"Error with config value '${value}': it can't be parsed as a JSON object"
+            )
+          case Right(json) => json
+        }
+    }
+  }
+
   /**
    * Parse a name, provider, description and value as a config object. It can fail if `value` doesn't fulfill our requirements:
    * either starts by a `{` and is well formatted hocon property string, or is a string.
@@ -681,6 +714,7 @@ object GenericProperty {
     def valueAsDebugString: String = GenericProperty.serializeToHocon(p.value)
     // get value as a JValue
     def jsonValue:          JValue = toJsonValue(p.value)
+    def jsonZio:            Json   = toJsonZio(p.value)
   }
 
   /*
@@ -711,7 +745,7 @@ object GenericProperty {
    * Implicit class to render properties to JSON
    */
   implicit class PropertyToJson(val x: GenericProperty[?]) extends AnyVal {
-    def toJson: JObject = (
+    def toJsonObj: JObject = (
       ("name"            -> x.name)
         ~ ("value"       -> parse(x.value.render(ConfigRenderOptions.concise())))
         ~ ("provider"    -> x.provider.map(_.value))
@@ -725,7 +759,7 @@ object GenericProperty {
     implicit def formats: DefaultFormats.type = DefaultFormats
 
     def toApiJson: JArray = {
-      JArray(props.map(_.toJson).toList)
+      JArray(props.map(_.toJsonObj).toList)
     }
 
     def toDataJson: JObject = {
@@ -775,7 +809,7 @@ object NodeProperty {
   }
 
   def fromInventory(prop: CustomProperty): NodeProperty =
-    apply(prop.name, GenericProperty.fromJsonValue(prop.value), None, Some(NodeProperty.customPropertyProvider))
+    apply(prop.name, GenericProperty.fromZioJson(prop.value), None, Some(NodeProperty.customPropertyProvider))
 }
 
 final case class GroupProperty(config: Config) extends GenericProperty[GroupProperty] {
@@ -972,7 +1006,7 @@ object JsonPropertySerialisation {
           )
       }
 
-      prop.prop.toJson ~ ("hierarchy" -> parents) ~ ("origval" -> origval)
+      prop.prop.toJsonObj ~ ("hierarchy" -> parents) ~ ("origval" -> origval)
 
     }
 
@@ -1028,7 +1062,7 @@ object JsonPropertySerialisation {
 }
 
 /**
-  * Error ADT that consists of specific errors on a property, or a 
+  * Error ADT that consists of specific errors on a property, or a
   */
 sealed trait NodePropertyError {
   def message: String
@@ -1042,7 +1076,7 @@ sealed trait NodePropertyError {
 sealed trait NodePropertySpecificError extends NodePropertyError {
 
   /**
-    * Properties whose name is the key of the map, are associated with 
+    * Properties whose name is the key of the map, are associated with
     * a hierarchy of inherited properties from parents that lead to the error,
     * and an error message
     */
@@ -1128,9 +1162,9 @@ object NodePropertyError         {
   /**
     * Instance of semigroup that result from the hierarchy of node property errors :
     * non specific errors are more important that specific ones.
-    * The instance is used when using combinators from the Ior datatype 
+    * The instance is used when using combinators from the Ior datatype
     * to accumulate conflicts or choose between errors.
-    * 
+    *
     * From the ADT structure and the implementation of this instance,
     * we assume that specific errors are discarded.
     * To keep all errors, consider using a collection of errors and remove this instance.
@@ -1154,15 +1188,15 @@ object NodePropertySpecificError {
 
 /**
   * The status of resolution of the hierarchy of node properties :
-  * the node properties hierarchy can sometimes be evaluated 
+  * the node properties hierarchy can sometimes be evaluated
   * in a broken global context (e.g. groups structure is non resoluble)
   * , or there can be failures to resolve some specific properties only.
 
   * There is also a success case when all properties are successfully resolved,
   * but the API assumes that there are resolved properties (even an empty set).
-  * 
-  * The API is very similar to a Ior one and in fact that datatype is used 
-  * for the combinators it provides, and this type is just the domain 
+  *
+  * The API is very similar to a Ior one and in fact that datatype is used
+  * for the combinators it provides, and this type is just the domain
   * definition that prevents the Ior datatype to be visible at many places.
   */
 sealed abstract class ResolvedNodePropertyHierarchy(val resolved: Chunk[NodePropertyHierarchy]) {
@@ -1172,10 +1206,10 @@ sealed abstract class ResolvedNodePropertyHierarchy(val resolved: Chunk[NodeProp
 }
 
 /**
-  * The failure that has some additional context message for when 
+  * The failure that has some additional context message for when
   * there is a global context for the node property error.
-  * 
-  * It wraps the error to also serve as a translation agains the 
+  *
+  * It wraps the error to also serve as a translation agains the
   * case of having both success and error,
   * and is somehow associated with the Ior datatype
   */
@@ -1207,7 +1241,7 @@ object FailedNodePropertyHierarchy {
 }
 
 /**
-  * Just a list of resolved properties (we know it's a non empty one 
+  * Just a list of resolved properties (we know it's a non empty one
   * and model it like that for the constraint of instantiation)
   */
 case class SuccessNodePropertyHierarchy(override val resolved: Chunk[NodePropertyHierarchy])
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala
index b16155b96e3..4bc803d8ada 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala
@@ -52,12 +52,13 @@ import com.normation.rudder.services.queries.*
 import com.unboundid.ldap.sdk.*
 import enumeratum.Enum
 import enumeratum.EnumEntry
+import io.scalaland.chimney.*
+import io.scalaland.chimney.syntax.*
 import java.util.regex.PatternSyntaxException
-import net.liftweb.json.*
-import net.liftweb.json.JsonDSL.*
 import org.joda.time.DateTime
 import org.joda.time.format.DateTimeFormat
 import org.joda.time.format.DateTimeFormatter
+import zio.json.*
 
 sealed trait CriterionComparator {
   val id: String
@@ -665,9 +666,9 @@ case object VmTypeComparator extends LDAPCriterionType {
 
 /*
  * Agent comparator is kind of scpecial, because it needs to accomodate to the following cases:
- * - historically, agent names were only "Nova" and "Community" (understood "cfengine", of course)
- * - then, we changed in 4.2 to normalized "cfengine-community" and "cfengine-nova" (plus "dsc")
- *   (but old agent are still "Nova" and "Community"
+ * - historically, agent names were only "Community" (understood "cfengine", of course)
+ * - then, we changed in 4.2 to normalized "cfengine-community" (plus "dsc")
+ *   (but old agent are still "Community"
  * - and we want a subcase "anything cfengine based" (because it is important for generation, for
  *   group "haspolicyserver-*" and rule "inventory-all")
  *
@@ -677,7 +678,7 @@ case object AgentComparator extends LDAPCriterionType {
 
   val ANY_CFENGINE          = "cfengine"
   val (cfeTypes, cfeAgents) =
-    ((ANY_CFENGINE, "Any CFEngine based agent"), (ANY_CFENGINE, AgentType.CfeCommunity :: AgentType.CfeEnterprise :: Nil))
+    ((ANY_CFENGINE, "Any CFEngine based agent"), (ANY_CFENGINE, AgentType.CfeCommunity :: Nil))
   private val allAgents     = AgentType.values.toList
 
   val agentTypes: List[(String, String)]       = (cfeTypes :: allAgents.map(a => (a.oldShortName, (a.displayName)))).sortBy(_._2)
@@ -893,10 +894,36 @@ final case class CriterionLine(
     value:      String = ""
 )
 
+object CriterionLine {
+  implicit val transformCriterionLine: Transformer[CriterionLine, JsonCriterionLine] = {
+    Transformer
+      .define[CriterionLine, JsonCriterionLine]
+      .withFieldComputed(_.objectType, _.objectType.objectType)
+      .withFieldComputed(_.attribute, _.attribute.name)
+      .withFieldComputed(_.comparator, _.comparator.id)
+      .buildTransformer
+  }
+
+}
+
+final case class JsonCriterionLine(
+    objectType: String,
+    attribute:  String,
+    comparator: String,
+    value:      String
+)
+
+object JsonCriterionLine {
+  implicit val encoderJsonCriterionLine: JsonEncoder[JsonCriterionLine] = DeriveJsonEncoder.gen
+}
+
 sealed abstract class CriterionComposition { def value: String }
-case object And extends CriterionComposition { val value = "and" }
-case object Or  extends CriterionComposition { val value = "or"  }
+
 object CriterionComposition {
+
+  case object And extends CriterionComposition { val value = "and" }
+  case object Or  extends CriterionComposition { val value = "or"  }
+
   def parse(s: String): Option[CriterionComposition] = {
     s.toLowerCase match {
       case "and" => Some(And)
@@ -904,13 +931,22 @@ object CriterionComposition {
       case _     => None
     }
   }
+
+  implicit val encoderCriterionComposition: JsonEncoder[CriterionComposition] = JsonEncoder.string.contramap(_.value)
 }
 
 sealed trait QueryReturnType {
   def value: String
 }
 
-case object QueryReturnType {
+object QueryReturnType {
+  case object NodeReturnType              extends QueryReturnType {
+    override val value = "node"
+  }
+  case object NodeAndRootServerReturnType extends QueryReturnType {
+    override val value = "nodeAndPolicyServer"
+  }
+
   def apply(value: String): Either[Inconsistency, QueryReturnType] = {
     value match {
       case NodeReturnType.value              => Right(NodeReturnType)
@@ -918,12 +954,8 @@ case object QueryReturnType {
       case _                                 => Left(Inconsistency(s"Query return type '${value}' is not valid"))
     }
   }
-}
-case object NodeReturnType extends QueryReturnType {
-  override val value = "node"
-}
-case object NodeAndRootServerReturnType extends QueryReturnType {
-  override val value = "nodeAndPolicyServer"
+
+  implicit val encoderQueryReturnType: JsonEncoder[QueryReturnType] = JsonEncoder.string.contramap(_.value)
 }
 
 sealed trait ResultTransformation extends EnumEntry {
@@ -950,6 +982,19 @@ object ResultTransformation extends Enum[ResultTransformation] {
         )
     }
   }
+
+  implicit val encoderResultTransformation: JsonEncoder[ResultTransformation] = JsonEncoder.string.contramap(_.value)
+}
+
+final case class JsonQuery(
+    select:      QueryReturnType,
+    composition: CriterionComposition,
+    transform:   Option[ResultTransformation],
+    where:       List[JsonCriterionLine]
+)
+
+object JsonQuery {
+  implicit val encoderJsonQuery: JsonEncoder[JsonQuery] = DeriveJsonEncoder.gen
 }
 
 object Query {
@@ -965,6 +1010,31 @@ object Query {
     q1.criteria.size == q2.criteria.size &&
     q1.criteria.forall(c1 => q2.criteria.exists(c2 => c1 == c2))
   }
+
+  implicit val transformQuery: Transformer[Query, JsonQuery] = {
+    Transformer
+      .define[Query, JsonQuery]
+      .withFieldComputed(
+        _.transform,
+        _.transform match {
+          case ResultTransformation.Identity => None
+          case x                             => Some(x)
+        }
+      )
+      .withFieldRenamed(_.returnType, _.select)
+      .withFieldRenamed(_.criteria, _.where)
+      .buildTransformer
+  }
+
+  /*
+   *  { "select":"...", "composition":"...", "where": [
+   *      { "objectType":"...", "attribute":"...", "comparator":"..", "value":"..." }
+   *      ...
+   *    ]}
+   *
+   * Make "transform" optional: don't display it if it's identity
+   */
+  implicit val encoderQuery: JsonEncoder[Query] = JsonEncoder[JsonQuery].contramap(_.transformInto[JsonQuery])
 }
 
 final case class Query(
@@ -980,29 +1050,4 @@ final case class Query(
       }.mkString(" ; ")}] }"
   }
 
-  /*
-   *  { "select":"...", "composition":"...", "where": [
-   *      { "objectType":"...", "attribute":"...", "comparator":"..", "value":"..." }
-   *      ...
-   *    ]}
-   *
-   * Make "transform" optional: don't display it if it's identity
-   */
-  lazy val toJSON: JObject = {
-    val t = transform match {
-      case ResultTransformation.Identity => None
-      case x                             => Some(x.value)
-    }
-    ("select" -> returnType.value) ~
-    ("composition" -> composition.toString) ~
-    ("transform"   -> t) ~
-    ("where"       -> criteria.map(c => {
-      ("objectType" -> c.objectType.objectType) ~
-      ("attribute"  -> c.attribute.name) ~
-      ("comparator" -> c.comparator.id) ~
-      ("value"      -> c.value)
-    }))
-  }
-
-  lazy val toJSONString: String = compactRender(toJSON)
 }
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala
index 207302639e6..69277ccfa62 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/domain/queries/NodeQueryCriteriaData.scala
@@ -684,7 +684,7 @@ object AgentMatcher extends NodeCriterionMatcher {
     // any cfengine, which is just cfengine-community since we don't do anything else
     def eq(value: String, tpe: AgentType): Boolean = {
       value match {
-        case AgentComparator.ANY_CFENGINE => tpe == AgentType.CfeCommunity || tpe == AgentType.CfeEnterprise
+        case AgentComparator.ANY_CFENGINE => tpe == AgentType.CfeCommunity
         case x                            => tpe.id == x || tpe.oldShortName == x
       }
     }
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala
index 1cf6b26830f..55710fbfcf1 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFact.scala
@@ -530,7 +530,7 @@ object NodeFact {
       // really not sure about what to do here
       softwareIds = List(),
       node.accounts,
-      node.environmentVariables.map { case (a, b) => EnvironmentVariable(a, Some(b), None) },
+      node.environmentVariables.map { case (a, b) => EnvironmentVariable(a, Some(b)) },
       node.processes,
       node.vms,
       node.networks,
@@ -668,7 +668,7 @@ object NodeFact {
   }
 
   def defaultRudderAgent(localAdmin: String): RudderAgent = {
-    RudderAgent(AgentType.CfeCommunity, localAdmin, AgentVersion("unknown"), PublicKey("not initialized"), Chunk.empty)
+    RudderAgent(AgentType.CfeCommunity, localAdmin, AgentVersion("unknown"), Certificate("not initialized"), Chunk.empty)
   }
 
   def newFromFullInventory(inventory: FullInventory, software: Option[Iterable[Software]]): NodeFact = {
@@ -944,7 +944,6 @@ trait MinimalNodeFactInterface {
         case Full(hash) => s"${algo}=${hash}"
         case eb: EmptyBox =>
           val msgForToken = tokenType match {
-            case _: PublicKey   => "of CFEngine public key for"
             case _: Certificate => "for certificate of"
           }
           val e           = eb ?~! s"Error when trying to get the CFEngine-${algo} digest ${msgForToken} node '${fqdn}' (${id.value})"
@@ -955,18 +954,9 @@ trait MinimalNodeFactInterface {
 
     (rudderAgent.agentType, rudderAgent.securityToken) match {
 
-      case (AgentType.CfeCommunity, key: PublicKey) =>
-        formatDigest(NodeKeyHash.getCfengineMD5Digest(key).toBox, "MD5", key)
-
-      case (AgentType.CfeEnterprise, key: PublicKey) =>
-        formatDigest(NodeKeyHash.getCfengineSHA256Digest(key).toBox, "SHA", key)
-
       case (AgentType.CfeCommunity, cert: Certificate) =>
         formatDigest(NodeKeyHash.getCfengineMD5CertDigest(cert).toBox, "MD5", cert)
 
-      case (AgentType.CfeEnterprise, cert: Certificate) =>
-        formatDigest(NodeKeyHash.getCfengineSHA256CertDigest(cert).toBox, "SHA", cert)
-
       case (AgentType.Dsc, _) =>
         PolicyGenerationLogger.info(
           s"Node '${fqdn}' (${id.value}) is a Windows node and a we do not know how to generate a hash yet"
@@ -985,17 +975,7 @@ trait MinimalNodeFactInterface {
    */
   lazy val keyHashBase64Sha256: String = {
     rudderAgent.securityToken match {
-      case publicKey: PublicKey   =>
-        NodeKeyHash.getB64Sha256Digest(publicKey).either.runNow match {
-          case Right(hash) =>
-            hash
-          case Left(e)     =>
-            PolicyGenerationLogger.error(
-              s"Error when trying to get the sha-256 digest of CFEngine public key for node '${fqdn}' (${id.value}): ${e.fullMsg}"
-            )
-            ""
-        }
-      case cert:      Certificate =>
+      case cert: Certificate =>
         NodeKeyHash.getB64Sha256Digest(cert).either.runNow match {
           case Right(hash) => hash
           case Left(e)     =>
@@ -1474,7 +1454,7 @@ final case class NodeFact(
   def isSystem:         Boolean               = isPolicyServer
   def serverIps:        List[String]          = ipAddresses.map(_.inet).toList
   def customProperties: Chunk[CustomProperty] = properties.collect {
-    case p if (p.provider == Some(NodeProperty.customPropertyProvider)) => CustomProperty(p.name, p.jsonValue)
+    case p if (p.provider == Some(NodeProperty.customPropertyProvider)) => CustomProperty(p.name, p.jsonZio)
   }
 
   def debugString(attrs: SelectFacts): String = {
@@ -1525,7 +1505,7 @@ final case class NodeFact(
 }
 
 final case class JsonOsDetails(
-    @jsonField("type") osType: String, // this is "kernalName"
+    @jsonField("type") osType: String, // this is "kernelName"
     name:                      String,
     version:                   String,
     fullName:                  String,
@@ -1546,8 +1526,6 @@ final case class JsonAgentRunInterval(
     splayMinute: Int
 )
 
-final case class JSecurityToken(kind: String, token: String)
-
 final case class JNodeProperty(
     name:                             String,
     value:                            ConfigValue,
@@ -1885,27 +1863,6 @@ object NodeFactSerialisation {
       }
     }
 
-    implicit val codecJsonAgentRunInterval:   JsonCodec[JsonAgentRunInterval]   = DeriveJsonCodec.gen
-    implicit val codecAgentRunInterval:       JsonCodec[AgentRunInterval]       = JsonCodec(
-      JsonEncoder[JsonAgentRunInterval].contramap[AgentRunInterval] { ari =>
-        JsonAgentRunInterval(
-          ari.overrides.map(_.toString()).getOrElse("default"),
-          ari.interval,
-          ari.startMinute,
-          ari.startHour,
-          ari.splaytime / 60,
-          ari.splaytime % 60
-        )
-      },
-      JsonDecoder[JsonAgentRunInterval].map[AgentRunInterval] { jari =>
-        val o = jari.overrides match {
-          case "true"  => Some(true)
-          case "false" => Some(false)
-          case _       => None
-        }
-        AgentRunInterval(o, jari.interval, jari.startMinute, jari.startHour, jari.splayHour * 60 + jari.splayMinute)
-      }
-    )
     implicit val codecAgentReportingProtocol: JsonCodec[AgentReportingProtocol] = {
       JsonCodec.string.transformOrFail[AgentReportingProtocol](
         s => AgentReportingProtocol.parse(s).left.map(_.fullMsg),
@@ -1951,17 +1908,9 @@ object NodeFactSerialisation {
     implicit val codecSecurityTag:    JsonCodec[SecurityTag]    = DeriveJsonCodec.gen
     implicit val codecNodeState:      JsonCodec[NodeState]      = JsonCodec.string.transformOrFail[NodeState](NodeState.parse, _.name)
     implicit val codecRudderSettings: JsonCodec[RudderSettings] = DeriveJsonCodec.gen
-    implicit val codecAgentType:      JsonCodec[AgentType]      =
-      JsonCodec.string.transformOrFail[AgentType](s => AgentType.fromValue(s).left.map(_.fullMsg), _.id)
     implicit val codecAgentVersion:   JsonCodec[AgentVersion]   = JsonCodec.string.transform[AgentVersion](AgentVersion(_), _.value)
     implicit val codecVersion:        JsonCodec[Version]        =
       JsonCodec.string.transformOrFail[Version](ParseVersion.parse, _.toVersionString)
-    implicit val codecJSecurityToken: JsonCodec[JSecurityToken] = DeriveJsonCodec.gen
-
-    implicit val codecSecturityToken: JsonCodec[SecurityToken] = JsonCodec(
-      JsonEncoder[JSecurityToken].contramap[SecurityToken](st => JSecurityToken(SecurityToken.kind(st), st.key)),
-      JsonDecoder[JSecurityToken].mapOrFail[SecurityToken](jst => SecurityToken.token(jst.kind, jst.token))
-    )
 
     implicit val codecAgentCapability: JsonCodec[AgentCapability] =
       JsonCodec.string.transform[AgentCapability](AgentCapability(_), _.value)
@@ -2024,16 +1973,6 @@ object NodeFactSerialisation {
           .orElse(decoder)
       )
     }
-//=======
-//    implicit val codecMachineUuid:    JsonCodec[MachineUuid]    = JsonCodec.string.transform[MachineUuid](MachineUuid(_), _.value)
-
-//    implicit val codecManufacturer:   JsonCodec[Manufacturer]   = JsonCodec.string.transform[Manufacturer](Manufacturer(_), _.name)
-//    implicit val codecMachine:        JsonCodec[MachineInfo]    = DeriveJsonCodec.gen
-//    implicit val codecMemorySize:     JsonCodec[MemorySize]     = JsonCodec.long.transform[MemorySize](MemorySize(_), _.size)
-//    implicit val codecSVersion:       JsonCodec[SVersion]       = JsonCodec.string.transform[SVersion](new SVersion(_), _.value)
-//    implicit val codecSoftwareEditor: JsonCodec[SoftwareEditor] =
-//      JsonCodec.string.transform[SoftwareEditor](SoftwareEditor(_), _.name)
-//>>>>>>> branches/rudder/8.1
   }
 
   import SimpleCodec.*
@@ -2061,12 +2000,11 @@ object NodeFactSerialisation {
     }
   }
 
-  implicit val decoderJValue:       JsonDecoder[JValue]       = JsonDecoder[Option[Json]].map {
+  implicit val decoderJValue: JsonDecoder[JValue] = JsonDecoder[Option[Json]].map {
     case None    => JNothing
     case Some(v) => recJsonToJValue(v)
   }
-  implicit val encoderJValue:       JsonEncoder[JValue]       = JsonEncoder[Option[Json]].contramap(recJValueToJson(_))
-  implicit val codecCustomProperty: JsonCodec[CustomProperty] = DeriveJsonCodec.gen
+  implicit val encoderJValue: JsonEncoder[JValue] = JsonEncoder[Option[Json]].contramap(recJValueToJson(_))
 
   implicit val codecInputDevice:    JsonCodec[InputDevice]    = DeriveJsonCodec.gen
   implicit val codecLocalGroup:     JsonCodec[LocalGroup]     = DeriveJsonCodec.gen
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala
index 87612842e98..d67256df04d 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactRepository.scala
@@ -38,13 +38,14 @@
 package com.normation.rudder.facts.nodes
 
 import com.normation.errors.*
-import com.normation.errors.IOResult
 import com.normation.inventory.domain.*
 import com.normation.inventory.services.core.ReadOnlySoftwareDAO
 import com.normation.rudder.domain.Constants
 import com.normation.rudder.domain.logger.NodeLoggerPure
 import com.normation.rudder.domain.nodes.NodeState
+import com.normation.rudder.tenants.DefaultTenantService
 import com.normation.rudder.tenants.TenantService
+import com.normation.zio.*
 import com.softwaremill.quicklens.*
 import scala.collection.MapView
 import zio.*
@@ -122,6 +123,12 @@ trait NodeFactRepository {
     }
   }
 
+  /*
+   * Get the number of active managed nodes.
+   * This should be made fast, because it's typically used in license check.
+   */
+  def getNumberOfManagedNodes(): IOResult[Int]
+
   /*
    * Get node on given status
    */
@@ -363,6 +370,16 @@ object CoreNodeFactRepository {
     new CoreNodeFactRepository(storage, softByName, tenants, p, a, cbs, savePreChecks, lock)
   }
 
+  // a version for tests
+  def makeNoop(
+      accepted:      Map[NodeId, CoreNodeFact],
+      pending:       Map[NodeId, CoreNodeFact] = Map(),
+      callbacks:     Chunk[NodeFactChangeEventCallback] = Chunk.empty,
+      savePreChecks: Chunk[NodeFact => IOResult[Unit]] = Chunk.empty
+  ): UIO[CoreNodeFactRepository] = for {
+    t <- DefaultTenantService.make(Nil)
+    r <- make(NoopFactStorage, NoopGetNodesBySoftwareName, t, pending, accepted, callbacks, savePreChecks)
+  } yield r
 }
 
 // we have some specialized services / materialized view for complex queries. Implementation can manage cache and
@@ -406,6 +423,19 @@ class CoreNodeFactRepository(
 ) extends NodeFactRepository {
   import NodeFactChangeEvent.*
 
+  // number of accepted, enambled node
+  private def coundEnabled(nodes: Map[NodeId, CoreNodeFact]) = nodes.count(_._2.rudderSettings.state.isEnabled)
+  private val enabledNodes:         Ref[Int]  = (for {
+    n <- acceptedNodes.get
+    r <- Ref.make(coundEnabled(n))
+  } yield r).runNow
+  private def updateEnabledCount(): UIO[Unit] = {
+    for {
+      n <- acceptedNodes.get
+      r <- enabledNodes.set(coundEnabled(n))
+    } yield r
+  }
+
   // debug log
 //  (for {
 //    p <- pendingNodes.get.map(_.values.map(_.id.value).mkString(", "))
@@ -488,6 +518,8 @@ class CoreNodeFactRepository(
     }
   }
 
+  override def getNumberOfManagedNodes(): IOResult[Int] = enabledNodes.get
+
   override def get(
       nodeId: NodeId
   )(implicit qc: QueryContext, status: SelectNodeStatus = SelectNodeStatus.Any): IOResult[Option[CoreNodeFact]] = {
@@ -686,6 +718,8 @@ class CoreNodeFactRepository(
                                    _ <- runCallbacks(es)
                                  } yield es
                                }
+        // update number of active nodes
+        _                   <- updateEnabledCount()
       } yield es
     )
   }
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactServiceProxies.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactServiceProxies.scala
deleted file mode 100644
index b9041251290..00000000000
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/facts/nodes/NodeFactServiceProxies.scala
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- *************************************************************************************
- * Copyright 2023 Normation SAS
- *************************************************************************************
- *
- * This file is part of Rudder.
- *
- * Rudder is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * In accordance with the terms of section 7 (7. Additional Terms.) of
- * the GNU General Public License version 3, the copyright holders add
- * the following Additional permissions:
- * Notwithstanding to the terms of section 5 (5. Conveying Modified Source
- * Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
- * Public License version 3, when you create a Related Module, this
- * Related Module is not considered as a part of the work and may be
- * distributed under the license agreement of your choice.
- * A "Related Module" means a set of sources files including their
- * documentation that, without modification of the Source Code, enables
- * supplementary functions or services in addition to those offered by
- * the Software.
- *
- * Rudder is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
-
- *
- *************************************************************************************
- */
-
-package com.normation.rudder.facts.nodes
-
-import com.normation.errors.IOResult
-import com.normation.eventlog.EventActor
-import com.normation.eventlog.ModificationId
-import com.normation.inventory.domain.AcceptedInventory
-import com.normation.inventory.domain.FullInventory
-import com.normation.inventory.domain.Inventory
-import com.normation.inventory.domain.InventoryError.Inconsistency
-import com.normation.inventory.domain.InventoryStatus
-import com.normation.inventory.domain.KeyStatus
-import com.normation.inventory.domain.MachineUuid
-import com.normation.inventory.domain.NodeId
-import com.normation.inventory.domain.NodeInventory
-import com.normation.inventory.domain.PendingInventory
-import com.normation.inventory.domain.RemovedInventory
-import com.normation.inventory.domain.SecurityToken
-import com.normation.inventory.domain.Software
-import com.normation.inventory.services.core.FullInventoryRepository
-import com.normation.inventory.services.core.ReadOnlySoftwareNameDAO
-import com.normation.inventory.services.provisioning.PipelinedInventorySaver
-import com.normation.inventory.services.provisioning.PostCommit
-import com.normation.inventory.services.provisioning.PreCommit
-import com.normation.rudder.domain.nodes.Node
-import com.normation.rudder.domain.nodes.NodeInfo
-import com.normation.rudder.domain.nodes.NodeKind
-import com.normation.rudder.repository.WoNodeRepository
-import com.normation.rudder.services.nodes.NodeInfoService
-import com.softwaremill.quicklens.*
-import org.joda.time.DateTime
-import zio.*
-import zio.syntax.*
-
-/*
- * This service is only used in InventoryProcessor. It is not so much a proxy than an actual implementation,
- * but it is a major port/change from 8.0 and feels right here.
- */
-class NodeFactInventorySaver(
-    backend:               NodeFactRepository,
-    val preCommitPipeline: Seq[PreCommit],
-    val basePostPipeline:  Seq[PostCommit[Unit]]
-) extends PipelinedInventorySaver[Unit] {
-
-  override def commitChange(inventory: Inventory): IOResult[Unit] = {
-    implicit val cc = ChangeContext.newForRudder()
-    backend.updateInventory(FullInventory(inventory.node, Some(inventory.machine)), Some(inventory.applications)).unit
-  }
-}
-
-/*
- * Proxy for node fact to full inventory / node inventory / machine inventory / node info and their repositories.
- */
-class NodeInfoServiceProxy(backend: NodeFactRepository) extends NodeInfoService {
-  import QueryContext.todoQC
-
-  override def getNodeInfo(nodeId: NodeId): IOResult[Option[NodeInfo]] = {
-    backend.get(nodeId)(todoQC, SelectNodeStatus.Accepted).map(_.map(_.toNodeInfo))
-  }
-
-  override def getNodeInfosSeq(nodeIds: Seq[NodeId]): IOResult[Seq[NodeInfo]] = {
-    backend
-      .getAll()(todoQC, SelectNodeStatus.Accepted)
-      .map(_.collect { case (id, n) if (nodeIds.contains(id)) => n.toNodeInfo }.toSeq)
-  }
-
-  // used in all plugins for checking license
-  override def getNumberOfManagedNodes: IOResult[Int] = {
-    backend.getAll()(QueryContext.systemQC, SelectNodeStatus.Accepted).map(_.size)
-  }
-
-  override def getAll(): IOResult[Map[NodeId, NodeInfo]] = {
-    backend.getAll()(todoQC, SelectNodeStatus.Accepted).map(_.mapValues(_.toNodeInfo).toMap)
-  }
-
-  // plugins: only use in tests
-  // 4 usages in rudder
-  override def getAllNodesIds(): IOResult[Set[NodeId]] = {
-    backend.getAll()(todoQC, SelectNodeStatus.Accepted).map(_.keySet.toSet)
-  }
-
-  // only used in plugin: rudder-plugins/datasources/src/main/scala/com/normation/plugins/datasources/api/DataSourceApiImpl.scala l214
-  override def getAllNodes(): IOResult[Map[NodeId, Node]] = {
-    backend.getAll()(todoQC, SelectNodeStatus.Accepted).map(_.mapValues(_.toNode).toMap)
-  }
-
-  // only use in tests in plugins
-  override def getAllNodeInfos(): IOResult[Seq[NodeInfo]] = {
-    backend.getAll()(todoQC, SelectNodeStatus.Accepted).map(_.map(_._2.toNodeInfo).toSeq)
-  }
-
-  override def getAllSystemNodeIds(): IOResult[Seq[NodeId]] = {
-    // for this one, it seems OK to use `systemQC`
-    backend
-      .getAll()(QueryContext.systemQC, SelectNodeStatus.Accepted)
-      .map(_.collect { case (_, n) if (n.rudderSettings.kind != NodeKind.Node) => n.id }.toSeq)
-  }
-
-  // plugins: only use in test
-  // rudder: 3 usages
-  override def getPendingNodeInfos(): IOResult[Map[NodeId, NodeInfo]] = {
-    backend.getAll()(todoQC, SelectNodeStatus.Pending).map(_.mapValues(_.toNodeInfo).toMap)
-  }
-
-  // plugins: only use in tests
-  // rudder: 2 usages
-  override def getPendingNodeInfo(nodeId: NodeId): IOResult[Option[NodeInfo]] = {
-    backend.get(nodeId)(todoQC, SelectNodeStatus.Pending).map(_.map(_.toNodeInfo))
-  }
-
-}
-
-/*
- * Proxy for full node inventory.
- * It is only used in mock and for testing compatibility with old data structures.
- *
- * We willfully chose to not implement machine repo because it doesn't make any sense with fact.
- * There is also a limit with software, since now they are directly in the node and they don't
- * have specific IDs. So they will need to be retrieved by node id.
- */
-class MockNodeFactFullInventoryRepositoryProxy(backend: NodeFactRepository)
-    extends FullInventoryRepository[Unit] with ReadOnlySoftwareNameDAO {
-  import QueryContext.todoQC
-
-  override def get(id: NodeId, inventoryStatus: InventoryStatus): IOResult[Option[FullInventory]] = {
-    backend.slowGetCompat(id, inventoryStatus, SelectFacts.noSoftware).map(_.map(_.toFullInventory))
-  }
-
-  override def get(id: NodeId): IOResult[Option[FullInventory]] = {
-    get(id, AcceptedInventory)
-  }
-
-  override def getMachineId(id: NodeId, inventoryStatus: InventoryStatus): IOResult[Option[(MachineUuid, InventoryStatus)]] = {
-    (Some((NodeFact.toMachineId(id), inventoryStatus))).succeed
-  }
-
-  override def save(serverAndMachine: FullInventory): IOResult[Unit] = {
-    // we must know if it's new or not to get back the correct facts.
-    // if the fact exists, we keep its status (use move to change it).
-    // if it does not yet, we use the given status BUT know that you should not
-    // use that to save node in accepted status directly.
-    backend.updateInventory(serverAndMachine, None)(ChangeContext.newForRudder()).unit
-  }
-
-  override def saveUserSetAttributes(node: NodeInventory): IOResult[Unit] = {
-    backend.updateInventory(FullInventory(node, None), None)(ChangeContext.newForRudder()).unit
-  }
-
-  override def delete(id: NodeId, inventoryStatus: InventoryStatus): IOResult[Unit] = {
-    // we need to only delete if the status is the one asked
-    backend.getStatus(id).flatMap { s =>
-      s match {
-        case RemovedInventory => ZIO.unit
-        case s                => ZIO.when(s == inventoryStatus)(backend.delete(id)(ChangeContext.newForRudder())).unit
-      }
-    }
-  }
-
-  override def move(id: NodeId, from: InventoryStatus, into: InventoryStatus): IOResult[Unit] = {
-    backend.changeStatus(id, into)(ChangeContext.newForRudder()).unit
-  }
-
-  override def moveNode(id: NodeId, from: InventoryStatus, into: InventoryStatus): IOResult[Unit] = {
-    backend.changeStatus(id, into)(ChangeContext.newForRudder()).unit
-  }
-
-  /*
-   * Used in:
-   * - CVE plugin: Services.scala l255
-   */
-  override def getSoftwareByNode(nodeIds: Set[NodeId], status: InventoryStatus): IOResult[Map[NodeId, Seq[Software]]] = {
-    def getAll(s: SelectNodeStatus): IOResult[Map[NodeId, Chunk[Software]]] = {
-      implicit val attrs = SelectFacts.none.copy(software = SelectFacts.all.software)
-
-      ZIO
-        .foreach(nodeIds.toList) {
-          case id =>
-            backend.slowGet(id)(todoQC, s, attrs).map(_.map(n => (n.id, n.software.map(_.toSoftware))))
-        }
-        .map(_.flatten.toMap)
-    }
-
-    status match {
-      case AcceptedInventory => getAll(SelectNodeStatus.Accepted)
-      case PendingInventory  => getAll(SelectNodeStatus.Pending)
-      case RemovedInventory  => Map().succeed
-    }
-  }
-
-  override def getNodesBySoftwareName(softName: String): IOResult[List[(NodeId, Software)]] = {
-    backend.getNodesBySoftwareName(softName)
-  }
-}
-
-/*
- * This one is only used in plugins, so we are not exposing QueryContext for now.
- * We removed its usage in rudder-rest NodeAPI and replaced it by bar NodeFactRepository
- */
-class WoFactNodeRepositoryProxy(backend: NodeFactRepository) extends WoNodeRepository {
-  import QueryContext.todoQC
-
-  override def updateNode(node: Node, modId: ModificationId, actor: EventActor, reason: Option[String]): IOResult[Node] = {
-    for {
-      opt  <- backend.get(node.id)(todoQC, SelectNodeStatus.Any)
-      fact <- opt match {
-                case None       => Inconsistency(s"Node with id '${node.id.value}' was not found").fail
-                case Some(fact) => CoreNodeFact.updateNode(fact, node).succeed
-              }
-      _    <- backend.save(NodeFact.fromMinimal(fact))(
-                ChangeContext(modId, actor, DateTime.now(), reason, None, todoQC.nodePerms),
-                SelectFacts.none
-              )
-    } yield fact.toNode
-  }
-
-  override def updateNodeKeyInfo(
-      nodeId:         NodeId,
-      agentKey:       Option[SecurityToken],
-      agentKeyStatus: Option[KeyStatus],
-      modId:          ModificationId,
-      actor:          EventActor,
-      reason:         Option[String]
-  ): IOResult[Unit] = {
-    if (agentKey.isEmpty && agentKeyStatus.isEmpty) ZIO.unit
-    else {
-      for {
-        node   <- backend.get(nodeId).notOptional(s"Cannot update node with id ${nodeId.value}: there is no node with that id")
-        newNode = node
-                    .modify(_.rudderAgent.securityToken)
-                    .setToIfDefined(agentKey)
-                    .modify(_.rudderSettings.keyStatus)
-                    .setToIfDefined(agentKeyStatus)
-        _      <- backend.save(NodeFact.fromMinimal(newNode))(
-                    ChangeContext(modId, actor, DateTime.now(), reason, None, todoQC.nodePerms),
-                    SelectFacts.none
-                  )
-      } yield ()
-    }
-  }
-}
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryProcessor.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryProcessor.scala
index 1b6f4d015f6..2028ca2b2ce 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryProcessor.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/inventory/InventoryProcessor.scala
@@ -43,6 +43,7 @@ import com.normation.errors.*
 import com.normation.errors.Chained
 import com.normation.errors.IOResult
 import com.normation.inventory.domain.CertifiedKey
+import com.normation.inventory.domain.FullInventory
 import com.normation.inventory.domain.Inventory
 import com.normation.inventory.domain.InventoryProcessingLogger
 import com.normation.inventory.domain.NodeId
@@ -50,7 +51,12 @@ import com.normation.inventory.domain.SecurityToken
 import com.normation.inventory.services.provisioning.InventoryDigestServiceV1
 import com.normation.inventory.services.provisioning.InventoryParser
 import com.normation.inventory.services.provisioning.InventorySaver
+import com.normation.inventory.services.provisioning.PipelinedInventorySaver
+import com.normation.inventory.services.provisioning.PostCommit
+import com.normation.inventory.services.provisioning.PreCommit
 import com.normation.rudder.domain.logger.ApplicationLogger
+import com.normation.rudder.facts.nodes.ChangeContext
+import com.normation.rudder.facts.nodes.NodeFactRepository
 import com.normation.rudder.hooks.HookEnvPairs
 import com.normation.rudder.hooks.PureHooksLogger
 import com.normation.rudder.hooks.RunHooks
@@ -152,6 +158,18 @@ object StatusLog {
   }
 }
 
+class NodeFactInventorySaver(
+    backend:               NodeFactRepository,
+    val preCommitPipeline: Seq[PreCommit],
+    val basePostPipeline:  Seq[PostCommit[Unit]]
+) extends PipelinedInventorySaver[Unit] {
+
+  override def commitChange(inventory: Inventory): IOResult[Unit] = {
+    implicit val cc = ChangeContext.newForRudder()
+    backend.updateInventory(FullInventory(inventory.node, Some(inventory.machine)), Some(inventory.applications)).unit
+  }
+}
+
 class InventoryProcessor(
     unmarshaller:    InventoryParser,
     inventorySaver:  InventorySaver[?],
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechnique.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechnique.scala
index 57bb837a286..135bf4af4fd 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechnique.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechnique.scala
@@ -244,14 +244,14 @@ object ParameterType {
     }
     def translate(value: String, paramType: ParameterType, agentType: AgentType): PureResult[String] = {
       (paramType, agentType) match {
-        case (Raw, _)                                                                         => Right(value)
-        case (StringParameter | HereString, AgentType.CfeCommunity | AgentType.CfeEnterprise) =>
+        case (Raw, _)                                               => Right(value)
+        case (StringParameter | HereString, AgentType.CfeCommunity) =>
           Right(s""""${value.replaceAll("""\\""", """\\\\""").replaceAll(""""""", """\\"""")}"""")
-        case (HereString, AgentType.Dsc)                                                      =>
+        case (HereString, AgentType.Dsc)                            =>
           translateDscHereString(value)
-        case (StringParameter, AgentType.Dsc)                                                 =>
+        case (StringParameter, AgentType.Dsc)                       =>
           Right(s""""${value.replaceAll("\"", "`\"")}"""")
-        case (_, _)                                                                           => Left(Unexpected("Cannot translate"))
+        case (_, _)                                                 => Left(Unexpected("Cannot translate"))
       }
     }
 
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechniqueReader.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechniqueReader.scala
index 482d4491b59..3add113f958 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechniqueReader.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/EditorTechniqueReader.scala
@@ -271,7 +271,7 @@ object GenericMethodSerialization {
   implicit val decodeAgentType:                        JsonDecoder[List[AgentType]]                  = JsonDecoder.string.mapOrFail(id => {
     id match {
       case "dsc"                => Right(AgentType.Dsc :: Nil)
-      case "cfengine-community" => Right(AgentType.CfeCommunity :: AgentType.CfeEnterprise :: Nil)
+      case "cfengine-community" => Right(AgentType.CfeCommunity :: Nil)
       case x                    => Left(s"Error: '${x}' is not recognized as an agent type")
     }
   })
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueSerializer.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueSerializer.scala
index c6ca828fd48..3ba45a1bc68 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueSerializer.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueSerializer.scala
@@ -125,8 +125,8 @@ class TechniqueSerializer(parameterTypeService: ParameterTypeService) {
 
     def serializeAgentSupport(agent: AgentType) = {
       agent match {
-        case AgentType.Dsc                                    => JString("dsc")
-        case AgentType.CfeCommunity | AgentType.CfeEnterprise => JString("cfengine-community")
+        case AgentType.Dsc          => JString("dsc")
+        case AgentType.CfeCommunity => JString("cfengine-community")
       }
     }
 
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/properties/MergeNodeProperties.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/properties/MergeNodeProperties.scala
index eeb591b55ba..f3b3ecc4344 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/properties/MergeNodeProperties.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/properties/MergeNodeProperties.scala
@@ -148,7 +148,7 @@ object GroupProp {
           GroupProp(
             group.properties,
             group.id,
-            And,
+            CriterionComposition.And,
             ResultTransformation.Identity,
             group.isDynamic,
             Nil, // terminal leaf
@@ -165,9 +165,10 @@ object GroupProp {
             q.criteria.flatMap {
               // we are only interested in subgroup criterion with AND, and we want to
               // keep order for overriding priority.
-              case CriterionLine(_, a, _, value) if (q.composition == And && a.cType.isInstanceOf[SubGroupComparator]) =>
+              case CriterionLine(_, a, _, value)
+                  if (q.composition == CriterionComposition.And && a.cType.isInstanceOf[SubGroupComparator]) =>
                 Some(value)
-              case _                                                                                                   => None
+              case _ => None
             },
             group.name
           )
@@ -308,9 +309,9 @@ object MergeNodeProperties {
    *   In that case, properties are merged according to the merge function.
    *
    * We know that we have all groups/subgroups in which the node is here.
-   * 
-   * The IOR chaining is necessary to recover partially from successful values 
-   * and still accumulate errors. It will be the responsibility of caller 
+   *
+   * The IOR chaining is necessary to recover partially from successful values
+   * and still accumulate errors. It will be the responsibility of caller
    * to discard or not the success part.
    */
   def checkPropertyMerge(
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ReportingConfiguration.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ReportingConfiguration.scala
index 00bde951273..8cc9f118fc4 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ReportingConfiguration.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/reports/ReportingConfiguration.scala
@@ -42,6 +42,7 @@ import com.normation.errors.Unexpected
 import enumeratum.*
 import net.liftweb.common.*
 import org.joda.time.Duration
+import zio.json.*
 
 /**
  * Class that contains all relevant information about the reporting configuration:
@@ -65,28 +66,20 @@ final case class HeartbeatConfiguration(
     heartbeatPeriod: Int
 )
 
+object HeartbeatConfiguration {
+  implicit val codecHeartbeatConfiguration: JsonCodec[HeartbeatConfiguration] = DeriveJsonCodec.gen
+}
+
 final case class AgentRunInterval(
     overrides:   Option[Boolean],
     interval:    Int, // in minute
     startMinute: Int,
     startHour:   Int,
     splaytime:   Int
-) {
-
-  def json: String = {
-
-    val overrideValue = overrides.map(_.toString).getOrElse("null")
-    val splayHour     = splaytime / 60
-    val splayMinute   = splaytime % 60
+)
 
-    s"""{ 'overrides'   : ${overrideValue}
-        , 'interval'    : ${interval}
-        , 'startHour'   : ${startHour}
-        , 'startMinute' : ${startMinute}
-        , 'splayHour'   : ${splayHour}
-        , 'splayMinute' : ${splayMinute}
-       }"""
-  }
+object AgentRunInterval {
+  implicit val codecAgentRunInterval: JsonCodec[AgentRunInterval] = DeriveJsonCodec.gen
 }
 
 final case class ResolvedAgentRunInterval(interval: Duration, heartbeatPeriod: Int)
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/DirectiveRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/DirectiveRepository.scala
index cf5c5b29395..83c116f374b 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/DirectiveRepository.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/DirectiveRepository.scala
@@ -94,7 +94,7 @@ final case class FullActiveTechnique(
   def toActiveTechnique(): ActiveTechnique = ActiveTechnique(
     id = id,
     techniqueName = techniqueName,
-    acceptationDatetimes = acceptationDatetimes.toMap,
+    acceptationDatetimes = AcceptationDateTime(acceptationDatetimes.toMap),
     directives = directives.map(_.id.uid),
     _isEnabled = isEnabled,
     policyTypes = policyTypes
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/json/JsonExctractorUtils.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/json/JsonExctractorUtils.scala
index c5b2444a0b9..e251f24bc38 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/json/JsonExctractorUtils.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/json/JsonExctractorUtils.scala
@@ -88,59 +88,23 @@ trait JsonExtractorUtils[A[_]] {
     }
   }
 
+  /*
+   * Still used in apiaccount API, tags
+   */
   def extractJsonString[T](json: JValue, key: String, convertTo: String => Box[T] = boxedIdentity[String]): Box[A[T]] = {
     extractJson(json, key, convertTo, { case JString(value) => value })
   }
-  def extractJsonStringMultipleKeys[T](
-      json:      JValue,
-      keys:      List[String],
-      convertTo: String => Box[T] = boxedIdentity[String]
-  ): Box[A[T]] = {
-    extractJson(json, keys, convertTo, { case JString(value) => value })
-  }
 
+  /*
+   * Still used in apiaccount API
+   */
   def extractJsonBoolean[T](json: JValue, key: String, convertTo: Boolean => Box[T] = boxedIdentity[Boolean]): Box[A[T]] = {
     extractJson(json, key, convertTo, { case JBool(value) => value })
   }
 
-  def extractJsonInt(json: JValue, key: String): Box[A[Int]] = {
-    extractJsonBigInt(json, key, i => Full(i.toInt))
-  }
-
-  def extractJsonBigInt[T](json: JValue, key: String, convertTo: BigInt => Box[T] = boxedIdentity[BigInt]): Box[A[T]] = {
-    extractJson(json, key, convertTo, { case JInt(value) => value })
-  }
-
-  def extractJsonObj[T](json: JValue, key: String, jsonValueFun: JObject => Box[T]):                    Box[A[T]] = {
-    extractJson(json, key, jsonValueFun, { case obj: JObject => obj })
-  }
-  def extractJsonObjMultipleKeys[T](json: JValue, keys: List[String], jsonValueFun: JObject => Box[T]): Box[A[T]] = {
-    extractJson(json, keys, jsonValueFun, { case obj: JObject => obj })
-  }
-
-  def extractJsonListString[T](
-      json:      JValue,
-      key:       String,
-      convertTo: List[String] => Box[T] = boxedIdentity[List[String]]
-  ): Box[A[T]] = {
-    json \ key match {
-      case JArray(values) =>
-        (for {
-          strings   <- traverse(values) {
-                         _ match {
-                           case JString(s) => Full(s)
-                           case x          => Failure(s"Error extracting a string from json: '${x}'")
-                         }
-                       }
-          converted <- convertTo(strings.toList)
-        } yield {
-          converted
-        }).map(monad.pure(_))
-      case JNothing       => emptyValue(key) ?~! s"Array of string is empty"
-      case _              => Failure(s"Not a good value for parameter ${key}")
-    }
-  }
-
+  /*
+   * Still used in tags, apiaccount API
+   */
   def extractJsonArray[T](json: JValue, key: String)(convertTo: JValue => Box[T]):        Box[A[List[T]]] = {
     val trueJson =
       if (key.isEmpty) json else json \ key
@@ -155,6 +119,9 @@ trait JsonExtractorUtils[A[_]] {
       case _              => Failure(s"Invalid json to extract a json array, current value is: ${compactRender(json)}")
     }
   }
+  /*
+   * Still used in tags, apiaccount API
+   */
   def extractJsonArray[T](json: JValue, keys: List[String])(convertTo: JValue => Box[T]): Box[A[List[T]]] = {
     keys.map(k => extractJsonArray(json, k)(convertTo)).reduce[Box[A[List[T]]]] {
       case (Full(res), _)                 => Full(res)
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDirectiveRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDirectiveRepository.scala
index 5ff56a38f11..316e80bda27 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDirectiveRepository.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDirectiveRepository.scala
@@ -74,10 +74,10 @@ import com.normation.rudder.services.user.PersonIdentService
 import com.normation.utils.StringUuidGenerator
 import com.unboundid.ldap.sdk.DN
 import com.unboundid.ldap.sdk.Filter
-import net.liftweb.json.JsonAST
 import org.joda.time.DateTime
 import scala.collection.immutable.SortedMap
 import zio.*
+import zio.json.*
 import zio.syntax.*
 
 class RoLDAPDirectiveRepository(
@@ -572,7 +572,7 @@ class RoLDAPDirectiveRepository(
         id = at.id,
         techniqueName = at.techniqueName,
         techniques = SortedMap(techniqueRepository.getByName(at.techniqueName).toSeq*),
-        acceptationDatetimes = SortedMap(at.acceptationDatetimes.toSeq*),
+        acceptationDatetimes = SortedMap(at.acceptationDatetimes.versions.toSeq*),
         directives = maps.directivesByActiveTechnique.getOrElse(at.id, Nil),
         isEnabled = at.isEnabled,
         policyTypes = at.policyTypes
@@ -1184,7 +1184,7 @@ class WoLDAPDirectiveRepository(
       newActiveTechnique = ActiveTechnique(
                              ActiveTechniqueId(techniqueName.value),
                              techniqueName,
-                             versions.map(x => x -> DateTime.now()).toMap,
+                             AcceptationDateTime(versions.map(x => x -> DateTime.now()).toMap),
                              policyTypes = policyTypes
                            )
       uptEntry           = mapper.activeTechnique2Entry(newActiveTechnique, categoryEntry.dn)
@@ -1323,9 +1323,10 @@ class WoLDAPDirectiveRepository(
       activeTechnique    <- getUPTEntry(con, uactiveTechniqueId, A_ACCEPTATION_DATETIME).notOptional(
                               s"Active technique with id '${uactiveTechniqueId.value}' was not found"
                             )
-      oldAcceptations    <- ZIO.fromEither(mapper.unserializeAcceptations(activeTechnique(A_ACCEPTATION_DATETIME).getOrElse("")))
+      oldAcceptations    <-
+        activeTechnique(A_ACCEPTATION_DATETIME).getOrElse("").fromJson[AcceptationDateTime].toIO
       saved              <- {
-        val json = JsonAST.compactRender(mapper.serializeAcceptations(oldAcceptations ++ datetimes))
+        val json = oldAcceptations.withNewVersions(datetimes).toJson
         activeTechnique.resetValuesTo(A_ACCEPTATION_DATETIME, json)
         con.save(activeTechnique)
       }
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala
index 26eac9d68f3..3e9be1c9ffb 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala
@@ -45,7 +45,6 @@ import com.normation.NamedZioLogger
 import com.normation.cfclerk.domain.*
 import com.normation.errors.*
 import com.normation.inventory.domain.*
-import com.normation.inventory.ldap.core.InventoryDit
 import com.normation.inventory.ldap.core.InventoryMapper
 import com.normation.inventory.ldap.core.InventoryMappingResult.*
 import com.normation.inventory.ldap.core.InventoryMappingRudderError
@@ -81,11 +80,7 @@ import com.normation.rudder.rule.category.RuleCategory
 import com.normation.rudder.rule.category.RuleCategoryId
 import com.normation.rudder.services.queries.*
 import com.unboundid.ldap.sdk.DN
-import net.liftweb.json.*
-import net.liftweb.json.JsonAST.JObject
-import net.liftweb.json.JsonDSL.*
 import org.joda.time.DateTime
-import scala.util.control.NonFatal
 import zio.*
 import zio.json.*
 import zio.syntax.*
@@ -107,7 +102,6 @@ object NodeStateEncoder {
 class LDAPEntityMapper(
     rudderDit:       RudderDit,
     nodeDit:         NodeDit,
-    inventoryDit:    InventoryDit,
     cmdbQueryParser: CmdbQueryParser,
     inventoryMapper: InventoryMapper
 ) extends NamedZioLogger {
@@ -132,7 +126,7 @@ class LDAPEntityMapper(
 
     node.nodeReportingConfiguration.agentRunInterval match {
       case Some(interval) =>
-        entry.resetValuesTo(A_SERIALIZED_AGENT_RUN_INTERVAL, compactRender(serializeAgentRunInterval(interval)))
+        entry.resetValuesTo(A_SERIALIZED_AGENT_RUN_INTERVAL, interval.toJson)
       case _              =>
     }
 
@@ -150,12 +144,7 @@ class LDAPEntityMapper(
 
     node.nodeReportingConfiguration.heartbeatConfiguration match {
       case Some(heatbeatConfiguration) =>
-        val json = {
-          import net.liftweb.json.JsonDSL.*
-          ("overrides"       -> heatbeatConfiguration.overrides) ~
-          ("heartbeatPeriod" -> heatbeatConfiguration.heartbeatPeriod)
-        }
-        entry.resetValuesTo(A_SERIALIZED_HEARTBEAT_RUN_CONFIGURATION, compactRender(json))
+        entry.resetValuesTo(A_SERIALIZED_HEARTBEAT_RUN_CONFIGURATION, heatbeatConfiguration.toJson)
       case _                           => // Save nothing if missing
     }
     entry.addValues(A_POLICY_MODE, node.policyMode.map(_.name).getOrElse(PolicyMode.defaultValue))
@@ -165,36 +154,14 @@ class LDAPEntityMapper(
     entry
   }
 
-  def serializeAgentRunInterval(agentInterval: AgentRunInterval): JObject = {
-    ("overrides"   -> agentInterval.overrides) ~
-    ("interval"    -> agentInterval.interval) ~
-    ("startMinute" -> agentInterval.startMinute) ~
-    ("startHour"   -> agentInterval.startHour) ~
-    ("splaytime"   -> agentInterval.splaytime)
-  }
-
-  def unserializeAgentRunInterval(value: String): AgentRunInterval = {
-    import net.liftweb.json.JsonParser.*
-    implicit val formats: Formats = DefaultFormats
-
-    parse(value).extract[AgentRunInterval]
-  }
-
-  def unserializeNodeHeartbeatConfiguration(value: String): HeartbeatConfiguration = {
-    import net.liftweb.json.JsonParser.*
-    implicit val formats: Formats = DefaultFormats
-
-    parse(value).extract[HeartbeatConfiguration]
-  }
-
   def entryToNode(e: LDAPEntry): PureResult[Node] = {
     if (e.isA(OC_RUDDER_NODE) || e.isA(OC_POLICY_SERVER_NODE)) {
       // OK, translate
       for {
         id                     <- nodeDit.NODES.NODE.idFromDn(e.dn).toRight(Inconsistency(s"Bad DN found for a Node: ${e.dn}"))
         date                   <- e.requiredAs[GeneralizedTime](_.getAsGTime, A_OBJECT_CREATION_DATE)
-        agentRunInterval        = e(A_SERIALIZED_AGENT_RUN_INTERVAL).map(unserializeAgentRunInterval(_))
-        heartbeatConf           = e(A_SERIALIZED_HEARTBEAT_RUN_CONFIGURATION).map(unserializeNodeHeartbeatConfiguration(_))
+        agentRunInterval        = e(A_SERIALIZED_AGENT_RUN_INTERVAL).flatMap(_.fromJson[AgentRunInterval].toOption)
+        heartbeatConf           = e(A_SERIALIZED_HEARTBEAT_RUN_CONFIGURATION).flatMap(_.fromJson[HeartbeatConfiguration].toOption)
         agentReportingProtocol <- e(A_AGENT_REPORTING_PROTOCOL) match {
                                     case None        => Right(None)
                                     case Some(value) => AgentReportingProtocol.parse(value).map(Some(_))
@@ -303,20 +270,10 @@ class LDAPEntityMapper(
   }
 
   def parseAgentInfo(nodeId: NodeId, inventoryEntry: LDAPEntry): IOResult[(List[AgentInfo], KeyStatus)] = {
-    val keys = inventoryEntry.valuesFor(A_PKEYS).map(Some(_))
     for {
       agentsName <- {
-        val agents = inventoryEntry.valuesFor(A_AGENTS_NAME).toSeq.map(Some(_)).toList
-        ZIO.foreach(agents.zipAll(keys, None, None)) {
-          case (Some(agent), key) => AgentInfoSerialisation.parseJson(agent, key)
-          case (None, _)          =>
-            (Err
-              .MissingMandatory(
-                s"There was a public key defined for Node ${nodeId.value}," +
-                " without a related agent defined, it should not happen"
-              ))
-              .fail
-        }
+        val agents = inventoryEntry.valuesFor(A_AGENTS_NAME).toList
+        ZIO.foreach(agents) { case agent => agent.fromJson[AgentInfo].toIO }
       }
       keyStatus  <- inventoryEntry(A_KEY_STATUS).map(KeyStatus(_)).getOrElse(Right(UndefinedKey)).toIO
     } yield {
@@ -556,38 +513,6 @@ class LDAPEntityMapper(
 
   //////////////////////////////    ActiveTechnique    //////////////////////////////
 
-  // two utilities to serialize / deserialize Map[TechniqueVersion,DateTime]
-  def unserializeAcceptations(value: String): PureResult[Map[TechniqueVersion, DateTime]] = {
-    import net.liftweb.json.JsonAST.JField
-    import net.liftweb.json.JsonAST.JString
-    import net.liftweb.json.JsonParser.*
-
-    parse(value) match {
-      case JObject(fields) =>
-        fields.collect { case JField(version, JString(date)) => (version, date) }.traverse {
-          case (v, d) =>
-            TechniqueVersion
-              .parse(v)
-              .leftMap(Unexpected.apply)
-              .flatMap(version => {
-                try {
-                  Right((version, GeneralizedTime(d).dateTime))
-                } catch {
-                  case NonFatal(ex) => Left(SystemError(s"Error when trying to parse '${d}' as a datetime", ex))
-                }
-              })
-        }.map(_.toMap)
-      case _               => Right(Map())
-    }
-  }
-
-  def serializeAcceptations(dates: Map[TechniqueVersion, DateTime]): JObject = {
-    dates.foldLeft(JObject(List())) {
-      case (js, (version, date)) =>
-        js ~ (version.serialize -> GeneralizedTime(date).toString)
-    }
-  }
-
   /**
    * Build a ActiveTechnique from and LDAPEntry.
    * children directives are left empty
@@ -607,10 +532,9 @@ class LDAPEntityMapper(
                                 }
         acceptationDatetimes <- e(A_ACCEPTATION_DATETIME) match {
                                   case Some(v) =>
-                                    unserializeAcceptations(v).leftMap(e =>
-                                      InventoryMappingRudderError.UnexpectedObject(e.fullMsg)
-                                    )
-                                  case None    => Right(Map.empty[TechniqueVersion, DateTime])
+                                    v.fromJson[AcceptationDateTime]
+                                      .leftMap(e => InventoryMappingRudderError.UnexpectedObject(e))
+                                  case None    => Right(AcceptationDateTime.empty)
                                 }
       } yield {
         ActiveTechnique(ActiveTechniqueId(id), refTechniqueUuid, acceptationDatetimes, Nil, isEnabled, policyTypes)
@@ -629,7 +553,7 @@ class LDAPEntityMapper(
       activeTechnique.id.value,
       parentDN,
       activeTechnique.techniqueName,
-      serializeAcceptations(activeTechnique.acceptationDatetimes),
+      activeTechnique.acceptationDatetimes.toJson,
       activeTechnique.isEnabled,
       activeTechnique.policyTypes
     )
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeRepository.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeRepository.scala
index 6cf25075a04..238f34bee16 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeRepository.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeRepository.scala
@@ -59,6 +59,7 @@ import com.normation.rudder.services.reports.CacheExpectedReportAction
 import com.normation.rudder.services.reports.InvalidateCache
 import org.joda.time.DateTime
 import zio.*
+import zio.json.*
 import zio.syntax.*
 
 class WoLDAPNodeRepository(
@@ -154,9 +155,8 @@ class WoLDAPNodeRepository(
         dn             = acceptedDit.NODES.NODE.dn(nodeId.value)
         result        <- if (agentsInfo == newInfo) LDIFNoopChangeRecord(dn).succeed
                          else {
-                           import com.normation.inventory.domain.AgentInfoSerialisation.*
                            val e = LDAPEntry(dn)
-                           e.addValues(A_AGENTS_NAME, newInfo._1.map(_.toJsonString)*)
+                           e.addValues(A_AGENTS_NAME, newInfo._1.map(_.toJson)*)
                            e.addValues(A_KEY_STATUS, newInfo._2.value)
 
                            con.save(e).chainError(s"Error when saving node entry in repository: ${e}")
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala
index 1c3e342853f..901eee79ca9 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchivers.scala
@@ -362,7 +362,7 @@ class TechniqueArchiverImpl(
     val filesToAdd = (TechniqueFiles.common ++
       (if (
          technique.agentConfigs
-           .collectFirst(a => a.agentType == AgentType.CfeCommunity || a.agentType == AgentType.CfeEnterprise)
+           .collectFirst(a => a.agentType == AgentType.CfeCommunity)
            .nonEmpty
        ) {
          TechniqueFiles.Generated.cfengineAll
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogDetailsService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogDetailsService.scala
index b11d954cc07..9d9a1cb3383 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogDetailsService.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogDetailsService.scala
@@ -46,7 +46,6 @@ import com.normation.eventlog.ModificationId
 import com.normation.inventory.domain.Certificate
 import com.normation.inventory.domain.KeyStatus
 import com.normation.inventory.domain.NodeId
-import com.normation.inventory.domain.PublicKey
 import com.normation.inventory.domain.SecurityToken
 import com.normation.rudder.api.*
 import com.normation.rudder.batch.CurrentDeploymentStatus
@@ -1089,7 +1088,8 @@ class EventLogDetailsServiceImpl(
       agentKey     <- getFromTo[SecurityToken](
                         (node \ "agentKey").headOption,
                         { x =>
-                          val s = x.text; if (s.contains("BEGIN CERTIFICATE")) Full(Certificate(s)) else Full(PublicKey(s))
+                          val s = x.text;
+                          if (s.contains("BEGIN CERTIFICATE")) Full(Certificate(s)) else Failure(s"Unrecognized security token")
                         }
                       )
       keyStatus    <- getFromTo[KeyStatus](
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogFactory.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogFactory.scala
index 2cb20835c8f..2567a460820 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogFactory.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogFactory.scala
@@ -63,6 +63,7 @@ import org.joda.time.DateTime
 import org.joda.time.format.ISODateTimeFormat
 import scala.xml.*
 import scala.xml.Text
+import zio.json.*
 
 trait EventLogFactory {
 
@@ -636,7 +637,7 @@ class EventLogFactoryImpl(
           SimpleDiff.toXml[Option[Query]](<query/>, x) { t =>
             t match {
               case None    => <none/>
-              case Some(y) => Text(y.toJSONString)
+              case Some(y) => Text(y.toJson)
             }
           }
         }) ++
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlSerialisationImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlSerialisationImpl.scala
index e3a58e8b383..d76c87fa245 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlSerialisationImpl.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlSerialisationImpl.scala
@@ -187,7 +187,7 @@ class ActiveTechniqueSerialisationImpl(xmlVersion: String) extends ActiveTechniq
         <isEnabled>{activeTechnique.isEnabled}</isEnabled>
         <policyTypes>{activeTechnique.policyTypes.toJson}</policyTypes>
         <versions>{
-        activeTechnique.acceptationDatetimes.map {
+        activeTechnique.acceptationDatetimes.versions.map {
           case (version, date) =>
             // we never serialize revision in xml
             <version name={version.version.toVersionString}>{date.toString(ISODateTimeFormat.dateTime)}</version>
@@ -248,7 +248,7 @@ class NodeGroupSerialisationImpl(xmlVersion: String) extends NodeGroupSerialisat
       <id>{group.id.withDefaultRev.serialize}</id>
         <displayName>{group.name}</displayName>
         <description>{group.description}</description>
-        <query>{group.query.map(_.toJSONString).getOrElse("")}</query>
+        <query>{group.query.map(_.toJson).getOrElse("")}</query>
         <isDynamic>{group.isDynamic}</isDynamic>
         <nodeIds>{
         if (group.isDynamic) {
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala
index 02d38330bc2..8497ff5eeaa 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/marshalling/XmlUnserialisationImpl.scala
@@ -472,7 +472,7 @@ class ActiveTechniqueUnserialisationImpl extends ActiveTechniqueUnserialisation
       ActiveTechnique(
         id = ActiveTechniqueId(id),
         techniqueName = TechniqueName(ptName),
-        acceptationDatetimes = acceptationMap,
+        acceptationDatetimes = AcceptationDateTime(acceptationMap),
         directives = Nil,
         _isEnabled = isEnabled,
         policyTypes = policyTypes
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NewNodeManager.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NewNodeManager.scala
index 792d259d513..4c328041a54 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NewNodeManager.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NewNodeManager.scala
@@ -46,12 +46,12 @@ import com.normation.inventory.ldap.core.LDAPConstants.*
 import com.normation.rudder.domain.logger.NodeLoggerPure
 import com.normation.rudder.domain.nodes.NodeState
 import com.normation.rudder.domain.policies.PolicyMode
+import com.normation.rudder.domain.queries.CriterionComposition.Or
 import com.normation.rudder.domain.queries.CriterionLine
 import com.normation.rudder.domain.queries.DitQueryData
 import com.normation.rudder.domain.queries.Equals
-import com.normation.rudder.domain.queries.NodeReturnType
-import com.normation.rudder.domain.queries.Or
 import com.normation.rudder.domain.queries.Query
+import com.normation.rudder.domain.queries.QueryReturnType.NodeReturnType
 import com.normation.rudder.domain.queries.ResultTransformation
 import com.normation.rudder.facts.nodes.ChangeContext
 import com.normation.rudder.facts.nodes.CoreNodeFact
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NodeInfoService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NodeInfoService.scala
index ff71e84eaf9..fe00ae40553 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NodeInfoService.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NodeInfoService.scala
@@ -37,109 +37,8 @@
 
 package com.normation.rudder.services.nodes
 
-import com.normation.errors.IOResult
-import com.normation.inventory.domain.*
 import com.normation.inventory.ldap.core.LDAPConstants.*
-import com.normation.ldap.sdk.*
 import com.normation.rudder.domain.RudderLDAPConstants.*
-import com.normation.rudder.domain.nodes.Node
-import com.normation.rudder.domain.nodes.NodeInfo
-import org.joda.time.DateTime
-
-/*
- * General logic for the cache implementation of NodeInfo.
- * The general idea is to limit at maximum:
- * - the number of request to LDAP server (because I/O, slow)
- * - the quantity of data on the wires.
- *
- * The general tactic is to have a local cache (a map of nodeid -> nodeinfo),
- * and before any access, we are checking if an update is necessary with
- * a very quick oracle.
- * The oracle only look for at least one entry modified since the last oracle
- * check, and if one is found, says the cache is dirty.
- *
- * We use an OpenLDAP specific query syntax to be able to perform one query
- * on 3 branches (nodes, inventory node, inventory machine) in one go. As
- * this is OpenLDAP specific, we had to to something a little different
- * for tests, and so we don't exactly test what we are doing for real.
- *
- *
- * Way to enhance current code:
- * - make the oracle be called only every X seconds (because we can tolerate such a
- *   a latency in datas, and frequently, call to nodeinfoservice are done in batch
- *   to fill several kind of informations (it should not, but the code is like that)
- */
-
-/**
- * A case class used to represent the minimal
- * information needed to get a NodeInfo
- */
-final case class LDAPNodeInfo(
-    nodeEntry:          LDAPEntry,
-    nodeInventoryEntry: LDAPEntry,
-    machineEntry:       Option[LDAPEntry]
-)
-
-trait NodeInfoService {
-
-  /**
-   * Return a NodeInfo from a NodeId. First check the ou=Node, then fetch the other data
-   */
-  def getNodeInfo(nodeId: NodeId): IOResult[Option[NodeInfo]]
-
-  def getNodeInfosSeq(nodeIds: Seq[NodeId]): IOResult[Seq[NodeInfo]]
-
-  /**
-   * Return the number of managed (ie non policy server, no rudder role nodes.
-   * Implementation of that method must as efficient as possible.
-   */
-  def getNumberOfManagedNodes: IOResult[Int]
-
-  /**
-   * Get all node infos.
-   * That method try to return the maximum
-   * of information, and will not totally fail if some information are
-   * missing (but the corresponding nodeInfos won't be present)
-   * So it is possible that getAllIds.size > getAll.size
-   */
-  def getAll(): IOResult[Map[NodeId, NodeInfo]]
-
-  /**
-   * Get all nodes id
-   */
-
-  def getAllNodesIds(): IOResult[Set[NodeId]]
-
-  /**
-   * Get all nodes.
-   * That method try to return the maximum
-   * of information, and will not totally fail if some information are
-   * missing (but the corresponding nodeInfos won't be present)
-   * So it is possible that getAllIds.size > getAll.size
-   */
-  def getAllNodes(): IOResult[Map[NodeId, Node]]
-
-  /**
-   * Get all nodes
-   * This returns a Seq for performance reasons - it is much faster
-   * to return a Seq than a Set, and for subsequent use it is also
-   * faster
-   */
-  def getAllNodeInfos(): IOResult[Seq[NodeInfo]]
-
-  /**
-   * Get all systen node ids, for example
-   * policy server node ids.
-   * @return
-   */
-  def getAllSystemNodeIds(): IOResult[Seq[NodeId]]
-
-  /**
-   * Getting something like a nodeinfo for pending / deleted nodes
-   */
-  def getPendingNodeInfos(): IOResult[Map[NodeId, NodeInfo]]
-  def getPendingNodeInfo(nodeId: NodeId): IOResult[Option[NodeInfo]]
-}
 
 object NodeInfoService {
 
@@ -182,7 +81,6 @@ object NodeInfoService {
       A_HOSTNAME,
       A_LIST_OF_IP,
       A_INVENTORY_DATE,
-      A_PKEYS,
       A_OS_NAME,
       A_OS_FULL_NAME,
       A_OS_VERSION,
@@ -209,15 +107,3 @@ object NodeInfoService {
   val A_MOD_TIMESTAMP = "modifyTimestamp"
 
 }
-
-/*
- * For test, we need a way to split the cache part from its retrieval.
- */
-
-// our cache is modelized with a Map of entries, their last modification timestamp, and the corresponding entryCSN
-final case class LocalNodeInfoCache(
-    nodeInfos:       Map[NodeId, (LDAPNodeInfo, NodeInfo)],
-    lastModTime:     DateTime,
-    lastModEntryCSN: Seq[String],
-    managedNodes:    Int
-)
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DeploymentService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DeploymentService.scala
index 8a9330b9330..2717a52d1eb 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DeploymentService.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/DeploymentService.scala
@@ -45,7 +45,6 @@ import com.normation.cfclerk.domain.ReportingLogic.FocusReport
 import com.normation.cfclerk.domain.SectionSpec
 import com.normation.cfclerk.domain.TechniqueName
 import com.normation.errors.*
-import com.normation.inventory.domain.AixOS
 import com.normation.inventory.domain.MemorySize
 import com.normation.inventory.domain.NodeId
 import com.normation.rudder.batch.UpdateDynamicGroups
@@ -1090,7 +1089,7 @@ trait PromiseGeneration_BuildNodeContext {
             propsCompiled     <- ZIO
                                    .foreach(mergedProps) { p =>
                                      for {
-                                       x     <- parseJValue(p.prop.toJson, contextEngine)
+                                       x     <- parseJValue(p.prop.toJsonObj, contextEngine)
                                        // we need to fetch only the value, and nothing else, for the property
                                        value  = GenericProperty.fromJsonValue(x.\("value"))
                                        result = NodeProperty(p.prop.config.getString("name"), value, None, None)
@@ -1385,10 +1384,7 @@ object BuildNodeConfiguration extends Loggable {
                                                           expandedVars      <- expandedVariables.accumulate {
                                                                                  case (k, v) =>
                                                                                    // js lib is specific to the node os, bind here to not leak eval between vars
-                                                                                   val jsLib = context.nodeInfo.os.os match {
-                                                                                     case AixOS => JsRudderLibBinding.Aix
-                                                                                     case _     => JsRudderLibBinding.Crypt
-                                                                                   }
+                                                                                   val jsLib = JsRudderLibBinding.Crypt
 
                                                                                    for {
                                                                                      _    <- counters.nbEvalJs.update(_ + 1)
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala
index 48fbdf0138e..f35e888dcbd 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/InterpolatedValueCompiler.scala
@@ -481,9 +481,9 @@ class InterpolatedValueCompilerImpl(p: PropertyEngineService) extends Interpolat
         s"[missing value for: $${data.${e}[${m.mkString("][")}] ${opt}]"
       case Property(path, opt)   =>
         agent match {
-          case AgentType.Dsc                                    =>
+          case AgentType.Dsc          =>
             s"$$($$node.properties[${path.mkString("][")}])"
-          case AgentType.CfeCommunity | AgentType.CfeEnterprise =>
+          case AgentType.CfeCommunity =>
             s"$${node.properties[${path.mkString("][")}]}"
         }
     }
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/JavascriptEngine.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/JavascriptEngine.scala
index 2ea4e6cc5f4..fd9e44c6eef 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/JavascriptEngine.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/JavascriptEngine.scala
@@ -38,7 +38,6 @@
 package com.normation.rudder.services.policies
 
 import com.normation.cfclerk.domain.AbstactPassword
-import com.normation.cfclerk.domain.AixPasswordHashAlgo
 import com.normation.cfclerk.domain.HashAlgoConstraint.*
 import com.normation.cfclerk.domain.Variable
 import com.normation.errors.*
@@ -68,7 +67,6 @@ import zio.syntax.*
 sealed trait HashOsType extends EnumEntry
 
 object HashOsType extends Enum[HashOsType] {
-  case object AixHash   extends HashOsType
   case object CryptHash extends HashOsType // linux, bsd,...
 
   val values: IndexedSeq[HashOsType] = findValues
@@ -118,22 +116,6 @@ trait JsLibPassword extends ImplicitGetBytes {
   @HostAccess.Export
   def cryptSha512(s: String, salt: String): String = Sha2Crypt.sha512Crypt(s, "$6$" + salt)
 
-  /// Aix specific
-
-  @HostAccess.Export
-  def aixMd5(s:    String): String = AixPasswordHashAlgo.smd5(s)
-  @HostAccess.Export
-  def aixSha256(s: String): String = AixPasswordHashAlgo.ssha256(s)
-  @HostAccess.Export
-  def aixSha512(s: String): String = AixPasswordHashAlgo.ssha512(s)
-
-  @HostAccess.Export
-  def aixMd5(s:    String, salt: String): String = AixPasswordHashAlgo.smd5(s, Some(salt))
-  @HostAccess.Export
-  def aixSha256(s: String, salt: String): String = AixPasswordHashAlgo.ssha256(s, Some(salt))
-  @HostAccess.Export
-  def aixSha512(s: String, salt: String): String = AixPasswordHashAlgo.ssha512(s, Some(salt))
-
   /// one automatically choosing correct hash also based of the kind of HashOsType
   /// method accessible from JS
 
@@ -178,32 +160,6 @@ trait JsLibPassword extends ImplicitGetBytes {
     }
   }
 
-  @HostAccess.Export
-  def aix(algo: String, s: String): String = {
-    algo.toLowerCase match {
-      case "md5"                => aixMd5(s)
-      case "sha-256" | "sha256" => aixSha256(s)
-      case "sha-512" | "sha512" => aixSha512(s)
-      case _                    => // unknown value, fail
-        throw new NoSuchAlgorithmException(
-          s"Evaluating script 'aix(${algo}, ${s})' failed, as algorithm ${algo} is not recognized"
-        )
-    }
-  }
-
-  @HostAccess.Export
-  def aix(algo: String, s: String, salt: String): String = {
-    algo.toLowerCase match {
-      case "md5"                => aixMd5(s, salt)
-      case "sha-256" | "sha256" => aixSha256(s, salt)
-      case "sha-512" | "sha512" => aixSha512(s, salt)
-      case _                    => // unknown value, fail
-        throw new NoSuchAlgorithmException(
-          s"Evaluating script 'unix(${algo}, ${s}, ${salt})' failed, as algorithm ${algo} is not recognized"
-        )
-    }
-  }
-
   @HostAccess.Export
   def auto(algo: String, s: String): String = {
     algo.toLowerCase match {
@@ -243,7 +199,7 @@ trait JsLibPassword extends ImplicitGetBytes {
  * - rudder.hash.sha512(value)
  *
  * ## Under the "rudder.password" namespace, salted hashing functions
- *    compatible with Unix crypt (Linux, BSD...) or AIX
+ *    compatible with Unix crypt (Linux, BSD...)
  * ### Automatically chosen based on the node type:
  * - rudder.password.md5(value [, salt])
  * - rudder.password.sha256(value [, salt])
@@ -254,20 +210,13 @@ trait JsLibPassword extends ImplicitGetBytes {
  * - rudder.password.cryptSha256(value [, salt])
  * - rudder.password.cryptSha512(value [, salt])
  *
- * ### Generates AIX password compatible hashes:
- * - rudder.password.aixMd5(value [, salt])
- * - rudder.password.aixSha256(value [, salt])
- * - rudder.password.aixSha512(value [, salt])
- *
  * ### Public methods (advertised to the users, fallback to the previous methods)
  * - rudder.password.auto(algo, password [, salt])
  * - rudder.password.unix(algo, password [, salt])
- * - rudder.password.aix(algo, password [, salt])
  *
  *   where algo can be MD5, SHA-512, SHA-256 (case insensitive, with or without -)
- *   * auto automatically choose the encryption based on the node type
+ *   * auto automatically choose the encryption based on the node type, currently only Unix
  *   * unix generated Unix crypt password compatible hashes (Linux, BSD, ...)
- *   * aix generates AIX password compatible hashes
  */
 
 import com.normation.rudder.services.policies.HashOsType.*
@@ -299,24 +248,6 @@ final class JsRudderLibImpl(
         @HostAccess.Export
         def sha512(s: String, salt: String): String = super.cryptSha512(s, salt)
 
-      }
-    case AixHash   =>
-      new JsLibPassword() {
-        /// method accessible from JS
-        @HostAccess.Export
-        def md5(s:    String): String = super.aixMd5(s)
-        @HostAccess.Export
-        def sha256(s: String): String = super.aixSha256(s)
-        @HostAccess.Export
-        def sha512(s: String): String = super.aixSha512(s)
-
-        @HostAccess.Export
-        def md5(s:    String, salt: String): String = super.aixMd5(s, salt)
-        @HostAccess.Export
-        def sha256(s: String, salt: String): String = super.aixSha256(s, salt)
-        @HostAccess.Export
-        def sha512(s: String, salt: String): String = super.aixSha512(s, salt)
-
       }
   }
 
@@ -357,13 +288,9 @@ object JsRudderLibBinding {
    * Be carefull, as bindings are mutable, we can't have
    * a val for bindings, else the same context is shared...
    *
-   * We have one for AIX and one for Crypt to specialize the
+   * We have one for Crypt to specialize the
    * "auto" methods
    */
-  object Aix extends JsRudderLibBinding {
-    val jsRudderLib = new JsRudderLibImpl(AixHash)
-    def bindings: Bindings = toBindings("rudder", jsRudderLib)
-  }
 
   object Crypt extends JsRudderLibBinding {
     val jsRudderLib = new JsRudderLibImpl(CryptHash)
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala
index 02a5c9498fd..1823b5170f5 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala
@@ -349,8 +349,8 @@ class SystemVariableServiceImpl(
       // The distribution is chosen based on agent type.
       val (nodesAgentWithCfserverDistrib, nodesAgentWithHttpDistrib) = childerNodesList.partition(x => {
         x._1.agentType match {
-          case AgentType.CfeCommunity | AgentType.CfeEnterprise => true
-          case _                                                => false
+          case AgentType.CfeCommunity => true
+          case _                      => false
         }
       })
 
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PathComputer.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PathComputer.scala
index eaddca7093d..b322a64a74e 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PathComputer.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PathComputer.scala
@@ -40,7 +40,6 @@ package com.normation.rudder.services.policies.write
 import com.normation.errors.*
 import com.normation.inventory.domain.AgentType
 import com.normation.inventory.domain.AgentType.CfeCommunity
-import com.normation.inventory.domain.AgentType.CfeEnterprise
 import com.normation.inventory.domain.NodeId
 import com.normation.rudder.facts.nodes.CoreNodeFact
 import net.liftweb.common.Loggable
@@ -75,8 +74,6 @@ class PathComputerImpl(
 
     communityAgentRootPath: String, // "/var/rudder/cfengine-community/inputs"
 
-    enterpriseAgentRootPath: String, // "/var/cfengine/inputs"
-
     chainDepthLimit: Int = 20 // max number of relay, to detect cycles
 ) extends PathComputer with Loggable {
 
@@ -123,9 +120,8 @@ class PathComputerImpl(
    */
   def getRootPath(agentType: AgentType): String = {
     agentType match {
-      case CfeEnterprise => enterpriseAgentRootPath
-      case CfeCommunity  => communityAgentRootPath
-      case x             => throw new IllegalArgumentException("Unrecognized agent type: %s".format(x))
+      case CfeCommunity => communityAgentRootPath
+      case x            => throw new IllegalArgumentException("Unrecognized agent type: %s".format(x))
     }
   }
 
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PolicyWriterService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PolicyWriterService.scala
index 24ccea2b2fd..3ca9e1c0c4f 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PolicyWriterService.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PolicyWriterService.scala
@@ -1122,7 +1122,6 @@ class PolicyWriterServiceImpl(
       "MANAGED_NODES_KEY",
       "MANAGED_NODES_NAME",
       "COMMUNITY",
-      "NOVA",
       "RUDDER_INVENTORY_VARS",
       "BUNDLELIST",
       "INPUTLIST"
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PrepareTemplateVariables.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PrepareTemplateVariables.scala
index 03d5f737bd3..9e26d1cb858 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PrepareTemplateVariables.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/policies/write/PrepareTemplateVariables.scala
@@ -140,9 +140,6 @@ class PrepareTemplateVariablesImpl(
     }
 
     val systemVariables = agentNodeConfig.config.nodeContext ++ List(
-      systemVariableSpecService
-        .get("NOVA")
-        .toVariable(if (agentNodeConfig.agentType == AgentType.CfeEnterprise) Seq("true") else Seq()),
       systemVariableSpecService
         .get("COMMUNITY")
         .toVariable(if (agentNodeConfig.agentType == AgentType.CfeCommunity) Seq("true") else Seq()),
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/CmdbQueryParser.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/CmdbQueryParser.scala
index d812fcdfabf..dd2f1e344ef 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/CmdbQueryParser.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/CmdbQueryParser.scala
@@ -40,6 +40,7 @@ package com.normation.rudder.services.queries
 import cats.implicits.*
 import com.normation.box.*
 import com.normation.rudder.domain.queries.*
+import com.normation.rudder.domain.queries.QueryReturnType.*
 import com.normation.rudder.services.queries.CmdbQueryParser.*
 import com.normation.utils.Control.traverse
 import net.liftweb.common.*
@@ -108,7 +109,7 @@ trait DefaultStringQueryParser extends StringQueryParser {
 
     for {
       comp  <- query.composition match {
-                 case None    => Full(And)
+                 case None    => Full(CriterionComposition.And)
                  case Some(s) =>
                    CriterionComposition.parse(s) match {
                      case Some(x) => Full(x)
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/DynGroupService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/DynGroupService.scala
index 9cd7b0e60de..04a76565321 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/DynGroupService.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/DynGroupService.scala
@@ -317,7 +317,7 @@ class CheckPendingNodeInDynGroups(
         blocked: List[DynGroup],
         done:    List[(NodeGroupId, Set[NodeId])]
     ): IOResult[List[(NodeGroupId, Set[NodeId])]] = {
-      import com.normation.rudder.domain.queries.And as CAnd
+      import com.normation.rudder.domain.queries.CriterionComposition.And as CAnd
 
       NodeLogger.PendingNode.Policies.trace("TODO   :" + todo.debugString)
       NodeLogger.PendingNode.Policies.trace("BLOCKED:" + blocked.debugString)
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/LdapQueryProcessor.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/LdapQueryProcessor.scala
index f93e19089ee..f6e907359eb 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/LdapQueryProcessor.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/LdapQueryProcessor.scala
@@ -50,6 +50,7 @@ import com.normation.ldap.sdk.syntax.*
 import com.normation.rudder.domain.*
 import com.normation.rudder.domain.nodes.NodeInfo
 import com.normation.rudder.domain.queries.*
+import com.normation.rudder.domain.queries.CriterionComposition.*
 import com.normation.rudder.facts.nodes.CoreNodeFact
 import com.normation.rudder.repository.ldap.LDAPEntityMapper
 import com.normation.zio.currentTimeMillis
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/NodeFactQueryProcessor.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/NodeFactQueryProcessor.scala
index 71c96151d85..9489f563115 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/NodeFactQueryProcessor.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/queries/NodeFactQueryProcessor.scala
@@ -214,7 +214,7 @@ class NodeFactQueryProcessor(
    * - LdapQuery (we want to have all lines of that kind grouped in a new query)
    */
   def analyzeQuery(query: Query)(implicit qc: QueryContext): IOResult[NodeFactMatcher] = {
-    val group = if (query.composition == And) GroupAnd else GroupOr
+    val group = if (query.composition == CriterionComposition.And) GroupAnd else GroupOr
 
     // we need a better pattern matching (extensible would be better) in place of `isInstanceOf`
     // we prefer coreNodeFact matcher on top of LDAP, since the former is quick in cache, the latter needs IO
@@ -251,8 +251,10 @@ class NodeFactQueryProcessor(
       // inverse now if needed, because we don't want to return root if not asked *even* when inverse is present
       val inv = if (query.transform == ResultTransformation.Invert) group.inverse(lineResult) else lineResult
       // finally, filter out root if need
-      val res =
-        if (query.returnType == NodeAndRootServerReturnType) inv else GroupAnd.compose(NodeFactMatcher.nodeAndRelayMatcher, inv)
+      val res = {
+        if (query.returnType == QueryReturnType.NodeAndRootServerReturnType) inv
+        else GroupAnd.compose(NodeFactMatcher.nodeAndRelayMatcher, inv)
+      }
       res
     }
   }
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerManagementService.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerManagementService.scala
index 27cb77b1465..2ce0944f12f 100644
--- a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerManagementService.scala
+++ b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerManagementService.scala
@@ -69,14 +69,14 @@ import com.normation.rudder.domain.policies.RuleId
 import com.normation.rudder.domain.policies.RuleUid
 import com.normation.rudder.domain.policies.Tags
 import com.normation.rudder.domain.queries.AgentComparator
-import com.normation.rudder.domain.queries.And
 import com.normation.rudder.domain.queries.Criterion
+import com.normation.rudder.domain.queries.CriterionComposition.And
 import com.normation.rudder.domain.queries.CriterionLine
 import com.normation.rudder.domain.queries.Equals
-import com.normation.rudder.domain.queries.NodeAndRootServerReturnType
 import com.normation.rudder.domain.queries.NodeCriterionMatcherString
 import com.normation.rudder.domain.queries.ObjectCriterion
 import com.normation.rudder.domain.queries.Query
+import com.normation.rudder.domain.queries.QueryReturnType.NodeAndRootServerReturnType
 import com.normation.rudder.domain.queries.ResultTransformation
 import com.normation.rudder.domain.queries.StringComparator
 import com.normation.rudder.repository.EventLogRepository
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/common/1.0/cf-serverd.cf b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/common/1.0/cf-serverd.cf
index e60778efd5f..ff8b39b41d4 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/common/1.0/cf-serverd.cf
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/common/1.0/cf-serverd.cf
@@ -40,11 +40,11 @@ bundle server access_rules
     any::
           "/var/rudder/share/c8813416-316f-4307-9b6a-ca9c109a9fb0/"
             maproot => {  @{def.acl}  },
-            admit_keys => { "MD5=081cf3aac62624ebbc83be7e23cb104d" };
+            admit_keys => { "MD5=eec3a3c2cf41b2736b7a0a9dece02142" };
 
           "/var/rudder/shared-files/c8813416-316f-4307-9b6a-ca9c109a9fb0/"
             maproot => {  @{def.acl}  },
-            admit_keys => { "MD5=081cf3aac62624ebbc83be7e23cb104d" };
+            admit_keys => { "MD5=eec3a3c2cf41b2736b7a0a9dece02142" };
 
               "/var/rudder/share/root/"
             maproot => {  @{def.acl}  },
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/rudder-service-relayd/1.0/relay/nodeslist.json b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/rudder-service-relayd/1.0/relay/nodeslist.json
index 7030c11a94a..baf7b10908e 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/rudder-service-relayd/1.0/relay/nodeslist.json
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/root-sys-var-false/rudder-service-relayd/1.0/relay/nodeslist.json
@@ -1,7 +1,7 @@
 {
       "c8813416-316f-4307-9b6a-ca9c109a9fb0": {
         "hostname": "node1.localhost",
-        "key-hash": "sha256//z2Ia9XiG1hRheyyBh9HbnRjJPuBnTJmF+wb6F3Be1PA=",
+        "key-hash": "sha256//QdgYBhJETcbCgKyRibjJVZQCm6mgaXzXKxrziLS5SEQ=",
         "policy-server": "root"
       }
     ,
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/testing_variables_in_conditions/1.0/metadata.xml b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/testing_variables_in_conditions/1.0/metadata.xml
index 435747f61f5..a486686e627 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/testing_variables_in_conditions/1.0/metadata.xml
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/expected-share/testing_variables_in_conditions/1.0/metadata.xml
@@ -4,7 +4,7 @@
   <DESCRIPTION></DESCRIPTION>
   <LONGDESCRIPTION></LONGDESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
-  <AGENT type="cfengine-community,cfengine-nova">
+  <AGENT type="cfengine-community">
     <BUNDLES>
       <NAME>testing_variables_in_conditions</NAME>
       <NAME>testing_variables_in_conditions_rudder_reporting</NAME>
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_any/1.0/metadata.xml b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_any/1.0/metadata.xml
index 412f223ac4e..fed5b53def9 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_any/1.0/metadata.xml
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_any/1.0/metadata.xml
@@ -4,7 +4,7 @@
   <DESCRIPTION>This Technique exists only to see if Rudder creates Technique correctly.</DESCRIPTION>
   <LONGDESCRIPTION></LONGDESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
-  <AGENT type="cfengine-community,cfengine-nova">
+  <AGENT type="cfengine-community">
     <BUNDLES>
       <NAME>technique_any</NAME>
     </BUNDLES>
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_any/2.0/metadata.xml b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_any/2.0/metadata.xml
index 92326050996..e5cdbe3bbc1 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_any/2.0/metadata.xml
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_any/2.0/metadata.xml
@@ -4,7 +4,7 @@
   <DESCRIPTION>This Technique exists only to see if Rudder creates Technique correctly.</DESCRIPTION>
   <LONGDESCRIPTION></LONGDESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
-  <AGENT type="cfengine-community,cfengine-nova">
+  <AGENT type="cfengine-community">
     <BUNDLES>
       <NAME>technique_any</NAME>
     </BUNDLES>
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_by_Rudder/1.0/metadata.xml b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_by_Rudder/1.0/metadata.xml
index bad4a930a2b..4d8ceee68b3 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_by_Rudder/1.0/metadata.xml
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_by_Rudder/1.0/metadata.xml
@@ -4,7 +4,7 @@
   <DESCRIPTION>This Technique exists only to see if Rudder creates Technique correctly.</DESCRIPTION>
   <LONGDESCRIPTION></LONGDESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
-  <AGENT type="cfengine-community,cfengine-nova">
+  <AGENT type="cfengine-community">
     <BUNDLES>
       <NAME>technique_by_Rudder</NAME>
       <NAME>technique_by_Rudder_rudder_reporting</NAME>
@@ -61,7 +61,7 @@
         <NAME>1AAACD71-C2D5-482C-BCFF-5EEE6F8DA9C2</NAME>
         <VARIABLENAME>technique_parameter</VARIABLENAME>
         <DESCRIPTION>technique parameter</DESCRIPTION>
-        <LONGDESCRIPTION> a long description, with line 
+        <LONGDESCRIPTION> a long description, with line
  break within</LONGDESCRIPTION>
         <CONSTRAINT>
           <TYPE>textarea</TYPE>
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_with_blocks/1.0/metadata.xml b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_with_blocks/1.0/metadata.xml
index fbf5892aaba..621415857dd 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_with_blocks/1.0/metadata.xml
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/technique_with_blocks/1.0/metadata.xml
@@ -1,7 +1,7 @@
 <TECHNIQUE name="technique with blocks">
   <DESCRIPTION></DESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
-  <AGENT type="cfengine-community,cfengine-nova">
+  <AGENT type="cfengine-community">
     <BUNDLES>
       <NAME>technique_with_blocks</NAME>
     </BUNDLES>
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/test_import_export_archive/1.0/metadata.xml b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/test_import_export_archive/1.0/metadata.xml
index 928ce4aaad9..fb28e27dd9e 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/test_import_export_archive/1.0/metadata.xml
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/ncf_techniques/test_import_export_archive/1.0/metadata.xml
@@ -1,7 +1,7 @@
 <TECHNIQUE name="test import/export archive">
   <DESCRIPTION></DESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
-  <AGENT type="cfengine-community,cfengine-nova">
+  <AGENT type="cfengine-community">
     <BUNDLES>
       <NAME>test import export archive</NAME>
     </BUNDLES>
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/systemSettings/misc/clockConfiguration/3.0/clockConfiguration.st b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/systemSettings/misc/clockConfiguration/3.0/clockConfiguration.st
index 0214108a025..bb7567962d3 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/systemSettings/misc/clockConfiguration/3.0/clockConfiguration.st
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/systemSettings/misc/clockConfiguration/3.0/clockConfiguration.st
@@ -385,20 +385,6 @@ bundle agent check_clock_configuration
         classes => cf2_if_else("ntp_hwclock_synced", "ntp_hwclock_sync_error"),
         comment => "synchronizing hardware clock";
 
-&if(NOVA)&
-  databases:
-
-    windows::
-
-      "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\W32Time\Parameters"
-
-        database_operation => "create",
-        database_rows => { "Type,REG_SZ,NTP", "NtpServer,REG_SZ,${serverskey}"},
-        database_type => "ms_registry",
-        comment => "Editing the windows registry to set the required NTP entries",
-        classes => kept_if_else("ntp_regkept", "ntp_regset", "ntp_regfail");
-&endif&
-
 }
 
 
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/systemSettings/misc/clockConfiguration/3.0/metadata.xml b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/systemSettings/misc/clockConfiguration/3.0/metadata.xml
index 85e497cd300..ce5b13a1466 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/systemSettings/misc/clockConfiguration/3.0/metadata.xml
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/configuration-repository/techniques/systemSettings/misc/clockConfiguration/3.0/metadata.xml
@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   <DESCRIPTION>Configure system clock (automatic updates via NTP, time zone, ...)</DESCRIPTION>
   <DEPRECATED>This version is deprecated, use 3.1 instead.</DEPRECATED>
 
-
-  <SYSTEMVARS>
-    <NAME>NOVA</NAME>
-  </SYSTEMVARS>
-
   <BUNDLES>
     <NAME>check_clock_configuration</NAME>
   </BUNDLES>
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/ldap-data/inventory-sample-data.ldif b/webapp/sources/rudder/rudder-core/src/test/resources/ldap-data/inventory-sample-data.ldif
index 9372eb0fa08..b25c6a1613f 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/ldap-data/inventory-sample-data.ldif
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/ldap-data/inventory-sample-data.ldif
@@ -259,7 +259,7 @@ osKernelVersion: nothing
 nodeId: node0
 cn: nothing
 localAdministratorAccountName: root
-agentName: {"agentType":"cfengine-nova","version":"8.0.0","securityToken":{"value":"-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUFuVwTpFusAbNC47G4JJXp0avZOowDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUwMB4XDTI0MDMwMTEwMDkxNloXDTM0\nMDIyNzEwMDkxNlowFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUwMIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEA1jtYN5n+Yr/i+eQT1t8u1+N9sFrSQzPtcuT8\ni9V7AjVSHV8DsEU5hSwaJVdI6uoOhR+6F88auUApTOvfipTYHfuTO0sTkitw/ymM\naqltr6k+bvDQVSws9A4rWARE9jI7qxQBaEaXXCqKPiYXofvbTteKsXGPYLZDmZeA\n3zrcz9kBcFJM5/BlNj89NlfxdRbmyAzUjc4FFhI/70hwGANSEFP8eNZrcgdoVgHq\n6z4VtSR7pd03uyeVkhXCA3YrVUxn0HA0McCXnhR1BZQW4zkiUQNFaOkXZJoM9Ue7\nYzoz7Id6Ly6hwbp6JGYB3/vTo7K9KTeiZFLh5gdKHdaGvq4I5iaI7VNmGVtTWwLB\noYbWU9awvUFcpqpXVOS1NK55X09D/Ffyq3LYB3Mi7oEx2NhFNYeqW3eaXsFheIMZ\nzr1DkcmLvdiRDAQbUPHJE2Ii9bCC/MXrrriYV1XaYQw13Wlde/W86AwsDAIzI8N3\n5wmEmPw0XPKaTvwIX8PfgSkHwvKVH6Uv0vICyvPQOI6N31zfiqeDsu62nhQAs9p9\n74hU+p9MoeNumX/789uO1IORgeWvh+UUDGMcRzwepnL4IwI+OuSReb+UMgkVq0Uf\n/JSvevmDkUUbgXHveGGnfgRC46pKNjBK57nxCUqMjTBKwz8q8df+QSZagrfeWpQz\nAouFi4MCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBReKetSxUz4\nNOYMMI/ByNWvTeceFTBSBgNVHSMESzBJgBReKetSxUz4NOYMMI/ByNWvTeceFaEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUwghQW5XBOkW6wBs0LjsbgklenRq9k\n6jALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBACMnzWZrRDl9RWn98zJF\nYTZPakotzi2AeH2isjnLWXTj7veqGEzvgnFYrHRG2/rNyCOxijmoeO84JhcAmmot\nUUzbzfChiDwp0v/+gKAWNXxz0khFylPF0CEu/c1OM6p+vT6jc8EL0A5FyLpanDl9\nRrF5i6f0vsZJmBKZAVkLBJ1XtLQBadxhV0/Q4DSfRr1soQvneTnDmNacFMgkQ4j0\nOwn3F8Yjb7z2HL38KAXbX3boWXN1BDMK/rYO9JHV1KVl1fLdmml2KPRM6G7DJ825\na2w3dUlozkJ0cV7HIkJlTjOFvshzEpqDlOzRYey0kqjmEykaz48QkqTVSG5b4qQP\nztJakKnI0QJuDiQYKPabPQPaUbFFQF9CQ1am+yuWU75H73exICTxf2RD/rzWFATb\nBLzXoqjDjW7O7Iebp1VF1C+Uoxb3By6MB2G+hGNZW5IBpsUN2OoGeWgdrFbmp065\nU1vWctg2b8WNiIUPTKzTNzPTJKCO22+d0CH2n+ACwAfjUyLZ5ZayYOZFpTuYYvJI\nxVsztD5BlcnzYhKBYyZUrp8XlwTybYG2eYIOVhChUus9Gq/Nslrk7I/fY6SrIubx\nLFwS1duez9EQFSQa9BqxXv5mZxC4TFBXpg8VaQeA5bFrOjV6yoftxwvUlw0WZX7H\n0/Jab5VPu8wL2nCqZYzPSIoo\n-----END CERTIFICATE-----","type":"certificate"},"capabilities":["acl","cfengine","curl","http_reporting","jq","xml","yaml"]}
+agentName: {"agentType":"cfengine-community","version":"8.0.0","securityToken":{"value":"-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUFuVwTpFusAbNC47G4JJXp0avZOowDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUwMB4XDTI0MDMwMTEwMDkxNloXDTM0\nMDIyNzEwMDkxNlowFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUwMIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEA1jtYN5n+Yr/i+eQT1t8u1+N9sFrSQzPtcuT8\ni9V7AjVSHV8DsEU5hSwaJVdI6uoOhR+6F88auUApTOvfipTYHfuTO0sTkitw/ymM\naqltr6k+bvDQVSws9A4rWARE9jI7qxQBaEaXXCqKPiYXofvbTteKsXGPYLZDmZeA\n3zrcz9kBcFJM5/BlNj89NlfxdRbmyAzUjc4FFhI/70hwGANSEFP8eNZrcgdoVgHq\n6z4VtSR7pd03uyeVkhXCA3YrVUxn0HA0McCXnhR1BZQW4zkiUQNFaOkXZJoM9Ue7\nYzoz7Id6Ly6hwbp6JGYB3/vTo7K9KTeiZFLh5gdKHdaGvq4I5iaI7VNmGVtTWwLB\noYbWU9awvUFcpqpXVOS1NK55X09D/Ffyq3LYB3Mi7oEx2NhFNYeqW3eaXsFheIMZ\nzr1DkcmLvdiRDAQbUPHJE2Ii9bCC/MXrrriYV1XaYQw13Wlde/W86AwsDAIzI8N3\n5wmEmPw0XPKaTvwIX8PfgSkHwvKVH6Uv0vICyvPQOI6N31zfiqeDsu62nhQAs9p9\n74hU+p9MoeNumX/789uO1IORgeWvh+UUDGMcRzwepnL4IwI+OuSReb+UMgkVq0Uf\n/JSvevmDkUUbgXHveGGnfgRC46pKNjBK57nxCUqMjTBKwz8q8df+QSZagrfeWpQz\nAouFi4MCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBReKetSxUz4\nNOYMMI/ByNWvTeceFTBSBgNVHSMESzBJgBReKetSxUz4NOYMMI/ByNWvTeceFaEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUwghQW5XBOkW6wBs0LjsbgklenRq9k\n6jALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBACMnzWZrRDl9RWn98zJF\nYTZPakotzi2AeH2isjnLWXTj7veqGEzvgnFYrHRG2/rNyCOxijmoeO84JhcAmmot\nUUzbzfChiDwp0v/+gKAWNXxz0khFylPF0CEu/c1OM6p+vT6jc8EL0A5FyLpanDl9\nRrF5i6f0vsZJmBKZAVkLBJ1XtLQBadxhV0/Q4DSfRr1soQvneTnDmNacFMgkQ4j0\nOwn3F8Yjb7z2HL38KAXbX3boWXN1BDMK/rYO9JHV1KVl1fLdmml2KPRM6G7DJ825\na2w3dUlozkJ0cV7HIkJlTjOFvshzEpqDlOzRYey0kqjmEykaz48QkqTVSG5b4qQP\nztJakKnI0QJuDiQYKPabPQPaUbFFQF9CQ1am+yuWU75H73exICTxf2RD/rzWFATb\nBLzXoqjDjW7O7Iebp1VF1C+Uoxb3By6MB2G+hGNZW5IBpsUN2OoGeWgdrFbmp065\nU1vWctg2b8WNiIUPTKzTNzPTJKCO22+d0CH2n+ACwAfjUyLZ5ZayYOZFpTuYYvJI\nxVsztD5BlcnzYhKBYyZUrp8XlwTybYG2eYIOVhChUus9Gq/Nslrk7I/fY6SrIubx\nLFwS1duez9EQFSQa9BqxXv5mZxC4TFBXpg8VaQeA5bFrOjV6yoftxwvUlw0WZX7H\n0/Jab5VPu8wL2nCqZYzPSIoo\n-----END CERTIFICATE-----","type":"certificate"},"capabilities":["acl","cfengine","curl","http_reporting","jq","xml","yaml"]}
 policyServerId:root-policy-server
 nodeHostname: node0.normation.com
 inventoryDate: 20130515123456.948Z
@@ -280,7 +280,7 @@ osKernelVersion: nothing
 nodeId: node0_0
 cn: nothing
 localAdministratorAccountName: root
-agentName: {"agentType":"cfengine-nova","version":"8.0.0","securityToken":{"value":"-----BEGIN CERTIFICATE-----\nMIIFVDCCAzygAwIBAgIUTI0mT02dO/54gV7iDUDuUwBytpEwDQYJKoZIhvcNAQEL\nBQAwGTEXMBUGCgmSJomT8ixkAQEMB25vZGUwXzAwHhcNMjQwMzAxMTA1MzA0WhcN\nMzQwMjI3MTA1MzA0WjAZMRcwFQYKCZImiZPyLGQBAQwHbm9kZTBfMDCCAiIwDQYJ\nKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPTRR9FSL/VAEk3PzaGdaE/XDSCb9qF4\nAMxcm2tC0C6y+V74KhzMUm5goZqkk+08CJzQH5awe5vNjt423z31SKpDvkJ2JbGI\nQEhVq2DNCOxxCttuRVbXJYUGaowapJAJ+F9otGtTp4gx/AlJFTkU25a946bt4YfZ\nwek/oJOceRfcnlNjoKsI9/7tb2FNPK3Ypi9sD2O8lt2rO+SrLi+FIj68Uek4rHl6\nO3DHsGXYYy3ksBHRNcWOFi9Vkr6yhnASNsxMLDY6u1O8XO/0LRuQMYqNqsn8shc/\nd/rDfYHS18esyPcysmBKV7grAArpGKoZmAKebCXdNolyhLtIt4rD/ROUoG9lQhqQ\nEsvpyeS8/ZW5H1wu5EfRDO/eegKjV57H+qlmoUBm2Jhr4LqcMGJFnxFkAf+LiKEB\nftG51UbCayZKSEqRqcEcwvDLriZrx5z6sQ9x1nZXARkgL6/PQxl3SBkFlm+hyJV8\nm/mqEMYJzEqWGiRjWmPSWHoEhLQbCpQWzddLUN4yfhxzFG5IkDuD2ZMSCJcBOc68\nJ0BomeJncuPLKCsZLwcQror2t4ho6CBsmvPdfD3yytr6gMX86KPWq6Q8EmQLJd7R\nW0/mMdxXKP3yfg/hkDfiVdjHVQ1cptYloWGAUzX2FtC3C3Ml4gh9HypL0b5FfPeh\ns4WZ3dlOD1Z3AgMBAAGjgZMwgZAwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUJtza\nJoOiz84pDnvljwWNdoOH43kwVAYDVR0jBE0wS4AUJtzaJoOiz84pDnvljwWNdoOH\n43mhHaQbMBkxFzAVBgoJkiaJk/IsZAEBDAdub2RlMF8wghRMjSZPTZ07/niBXuIN\nQO5TAHK2kTALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBALi+0u3rsTFr\nK8o7dntB/NzWhs9j/2P0jZl+AU/c8ZI/1Ev29pa+MCtTjvMNDp2kNBqW4AI24+me\nmBbSo73Jic/2ybECE/jnvORk1dgZxoFoUd8lOKyZiT8+lVNgFGnL/wmy7xEwvUaC\n5juKU2KD/DeM11YhIjm4DpuzmKupFpFxxyPb53RLg6mRQfIZjSEM5vCwWHTHpnTJ\n6+pDh9HYvi1xYIM9bEs4ucpEXE+ZTsRndeNyb86vYnpARaTtKc2anSyCgxT57b4V\nU93S05b5KBwB+jAGg2LIUAgR6YadQRH0uP+bA2d10nBUVKUt0926I9NlwozTZyVx\n8WbEt0Up9GOvAMfizNB+mPrbUy02KdHAcxBIm0SFJBFH0f8VOiaXEK4XZbQtf7LI\nPfGVcWOz/pAy+bcrOSptvFIBHl9ALCkYYHE3QBw/xWNN30NxkujCBpweBUKwiAFe\nANdBRPVrcdtBTmpgSxlOateIFoG1NvY7z3Vs3ZDexR6k28QTdHUgXrkL00bifoGR\n/TvEt0ZVDAGlBgp+g949wB/UMYF3IvFDH60FROeWcXaqPWIIKIzAkz4CpGripiPC\nSQUuhymJMXsCKofEOqXhhlyvgU2qaxN9Lb1t/zrKil05RM/WgtnIFOzqRZAtRmAb\nEZpyCS6HWQv0S4Bjzz1zfCByg7zKDZI1\n-----END CERTIFICATE-----\n","type":"certificate"},"capabilities":["acl","cfengine","curl","http_reporting","jq","xml","yaml"]}
+agentName: {"agentType":"cfengine-community","version":"8.0.0","securityToken":{"value":"-----BEGIN CERTIFICATE-----\nMIIFVDCCAzygAwIBAgIUTI0mT02dO/54gV7iDUDuUwBytpEwDQYJKoZIhvcNAQEL\nBQAwGTEXMBUGCgmSJomT8ixkAQEMB25vZGUwXzAwHhcNMjQwMzAxMTA1MzA0WhcN\nMzQwMjI3MTA1MzA0WjAZMRcwFQYKCZImiZPyLGQBAQwHbm9kZTBfMDCCAiIwDQYJ\nKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPTRR9FSL/VAEk3PzaGdaE/XDSCb9qF4\nAMxcm2tC0C6y+V74KhzMUm5goZqkk+08CJzQH5awe5vNjt423z31SKpDvkJ2JbGI\nQEhVq2DNCOxxCttuRVbXJYUGaowapJAJ+F9otGtTp4gx/AlJFTkU25a946bt4YfZ\nwek/oJOceRfcnlNjoKsI9/7tb2FNPK3Ypi9sD2O8lt2rO+SrLi+FIj68Uek4rHl6\nO3DHsGXYYy3ksBHRNcWOFi9Vkr6yhnASNsxMLDY6u1O8XO/0LRuQMYqNqsn8shc/\nd/rDfYHS18esyPcysmBKV7grAArpGKoZmAKebCXdNolyhLtIt4rD/ROUoG9lQhqQ\nEsvpyeS8/ZW5H1wu5EfRDO/eegKjV57H+qlmoUBm2Jhr4LqcMGJFnxFkAf+LiKEB\nftG51UbCayZKSEqRqcEcwvDLriZrx5z6sQ9x1nZXARkgL6/PQxl3SBkFlm+hyJV8\nm/mqEMYJzEqWGiRjWmPSWHoEhLQbCpQWzddLUN4yfhxzFG5IkDuD2ZMSCJcBOc68\nJ0BomeJncuPLKCsZLwcQror2t4ho6CBsmvPdfD3yytr6gMX86KPWq6Q8EmQLJd7R\nW0/mMdxXKP3yfg/hkDfiVdjHVQ1cptYloWGAUzX2FtC3C3Ml4gh9HypL0b5FfPeh\ns4WZ3dlOD1Z3AgMBAAGjgZMwgZAwDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUJtza\nJoOiz84pDnvljwWNdoOH43kwVAYDVR0jBE0wS4AUJtzaJoOiz84pDnvljwWNdoOH\n43mhHaQbMBkxFzAVBgoJkiaJk/IsZAEBDAdub2RlMF8wghRMjSZPTZ07/niBXuIN\nQO5TAHK2kTALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBALi+0u3rsTFr\nK8o7dntB/NzWhs9j/2P0jZl+AU/c8ZI/1Ev29pa+MCtTjvMNDp2kNBqW4AI24+me\nmBbSo73Jic/2ybECE/jnvORk1dgZxoFoUd8lOKyZiT8+lVNgFGnL/wmy7xEwvUaC\n5juKU2KD/DeM11YhIjm4DpuzmKupFpFxxyPb53RLg6mRQfIZjSEM5vCwWHTHpnTJ\n6+pDh9HYvi1xYIM9bEs4ucpEXE+ZTsRndeNyb86vYnpARaTtKc2anSyCgxT57b4V\nU93S05b5KBwB+jAGg2LIUAgR6YadQRH0uP+bA2d10nBUVKUt0926I9NlwozTZyVx\n8WbEt0Up9GOvAMfizNB+mPrbUy02KdHAcxBIm0SFJBFH0f8VOiaXEK4XZbQtf7LI\nPfGVcWOz/pAy+bcrOSptvFIBHl9ALCkYYHE3QBw/xWNN30NxkujCBpweBUKwiAFe\nANdBRPVrcdtBTmpgSxlOateIFoG1NvY7z3Vs3ZDexR6k28QTdHUgXrkL00bifoGR\n/TvEt0ZVDAGlBgp+g949wB/UMYF3IvFDH60FROeWcXaqPWIIKIzAkz4CpGripiPC\nSQUuhymJMXsCKofEOqXhhlyvgU2qaxN9Lb1t/zrKil05RM/WgtnIFOzqRZAtRmAb\nEZpyCS6HWQv0S4Bjzz1zfCByg7zKDZI1\n-----END CERTIFICATE-----\n","type":"certificate"},"capabilities":["acl","cfengine","curl","http_reporting","jq","xml","yaml"]}
 nodeHostname: node0_0.normation.com
 policyServerId:root-policy-server
 
@@ -309,7 +309,6 @@ policyServerId:root-policy-server
 ipHostNumber: 192.168.56.101
 ipHostNumber: 127.0.0.1
 environmentVariable: {"name":"SHELL","value":"/bin/sh"}
-publicKey: "test"
 customProperty:{"name":"datacenter", "value":"Paris"}
 customProperty:{"name":"from_inv", "value":{ "key1":"custom prop value", "key2":"some more json"}}
 process: {"pid":1,"commandName":"init [2]","cpuUsage":0.0,"memory":0.2000000
@@ -333,13 +332,12 @@ ram: 1
 software: softwareId=soft0,ou=Software,ou=Inventories,cn=rudder-configuration
 software: softwareId=soft1,ou=Software,ou=Inventories,cn=rudder-configuration
 localAdministratorAccountName: root
-agentName: {"agentType":"cfengine-nova","version":"8.0.0","securityToken":{"value":"-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUa5KQZfiMQMdAiC8DL3ZeAPWFMIowDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUyMB4XDTI0MDMwMTExMDA1MVoXDTM0\nMDIyNzExMDA1MVowFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUyMIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAt6v+CruJAthA/5yXXlaKPKb9CXTvVcEG5UcI\nI8nBabkWfKsc+2gMF2TkOf1e9YdtyiQ2ZSkZ0ywD3bLBieyynRO/LA/hUd6PJiBU\nkGgGs984CC1nDBil0d6TKQNKw1IfGtEpmaK+NjytivQ300oCFMndrCKp0zTXKPEO\nSpikk3Zl1hJws1lgW9Zy1SoApL53N8Xm8KG/CfJCBe1rSAOSRYesBdDTUaTnHUS+\njyk5YYPgbPEZCeRm3k7fKE8G7ciFVM1S4v5mv4NZqTGHIZQRYkdizrvLpzIdUMtM\nGKh6OB43ITl1YfRgbjgqPQD5uyt3Wywle/2vkLS05KVsmOaPx1lECVwyOKEkg7Y3\nwqwvBKkfFKXuULH35lGFi8BDZII6D8MgbKa/xmgLMYF62O8moO+nTrZMnfhH6+d0\n9P2BhKSjQBEH45THWS7+ds71Y8HngDBohYX1WCMXLB+mRUNzERL/5LmrC7uV4YKQ\nP4W2WU+nIn12+nisN91zhYqpCCkMZnjc/g9Z20cJhOIj4nlb6S78GWxZ7DB8iajH\npOuqplNSML6ykKieMS1leX9I8EcecMt20oWYapWIlnVmdSlSfneab1t49Halv4Sk\nSLp85FzdlUeeDehTjyOnTGz/2tI1kLqY55LVcMVAklk/aU+b3Ph5FcFA8EAUf/f+\nVwwXMLECAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSWd+e/ady1\n3i8Mg6OZSbqIdmlNLjBSBgNVHSMESzBJgBSWd+e/ady13i8Mg6OZSbqIdmlNLqEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUyghRrkpBl+IxAx0CILwMvdl4A9YUw\nijALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJp8kOG4dXHy1TJc/eLv\nZuFARlBdN4y/99bgn8IvDBXmQ1b4DY4VNpRcvymW1A4DAqqWG8Baf9DqxkkiIwJP\nPfTW6VobMtDiwBmUyQcBtgAasu1Twb00bFD8XV2pDykR9JyLYutThTGA326RjZ/S\nepGidM2Sa2QXMDErzcJJn3bnhPBBgjZQypXqTCDT/Wc0EMD6wasXm9WBA9sduKr/\nupio3xFPDW1gSaztNuqM1/i+mdd5PGakuPuBJWP5PZS0FEtAlarlUtmfJzUHTUx/\nmfkXoJEAdgne2qC/V7i5P8HBZyDkaKLTpbN4daEXllVVptV3o8GEs0xrnWMpWJGd\n62gIMflnjjVxbfXEj2itMjE/CeHVCSf4/Az6e9UM6NWBjwVxx7EImXsfm2Rvtumf\nwHuGmuzxHwxIXXU2wG3Ar8yInjPqtySfMUrALGsPT3djqDUvNuZ6WNysV4HqISBl\nX5ZUw9RNVMlI67P1PZhg869KQWG/1IvJiSZ1PHARkOROMYk8PN0MNJjKLU1/euT9\nmJqpLK8PocR+17+pYf6b5m1HUXeOqmZwGjpDxGUsEctY5mmqQMNJ/QgLBqyFMN6I\n3XTtkVoxC6EbofZ6rzpQFPxcI5XDTl/RFWGGoFwykKi7/H6Q9nEumvm57ipqDAwA\nFwkEXpNhAy6vLrecQOebw0dE\n-----END CERTIFICATE-----\n","type":"certificate"},"capabilities":["acl","cfengine","curl","http_reporting","jq","xml","yaml"]}
+agentName: {"agentType":"cfengine-community","version":"8.0.0","securityToken":{"value":"-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUa5KQZfiMQMdAiC8DL3ZeAPWFMIowDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUyMB4XDTI0MDMwMTExMDA1MVoXDTM0\nMDIyNzExMDA1MVowFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUyMIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAt6v+CruJAthA/5yXXlaKPKb9CXTvVcEG5UcI\nI8nBabkWfKsc+2gMF2TkOf1e9YdtyiQ2ZSkZ0ywD3bLBieyynRO/LA/hUd6PJiBU\nkGgGs984CC1nDBil0d6TKQNKw1IfGtEpmaK+NjytivQ300oCFMndrCKp0zTXKPEO\nSpikk3Zl1hJws1lgW9Zy1SoApL53N8Xm8KG/CfJCBe1rSAOSRYesBdDTUaTnHUS+\njyk5YYPgbPEZCeRm3k7fKE8G7ciFVM1S4v5mv4NZqTGHIZQRYkdizrvLpzIdUMtM\nGKh6OB43ITl1YfRgbjgqPQD5uyt3Wywle/2vkLS05KVsmOaPx1lECVwyOKEkg7Y3\nwqwvBKkfFKXuULH35lGFi8BDZII6D8MgbKa/xmgLMYF62O8moO+nTrZMnfhH6+d0\n9P2BhKSjQBEH45THWS7+ds71Y8HngDBohYX1WCMXLB+mRUNzERL/5LmrC7uV4YKQ\nP4W2WU+nIn12+nisN91zhYqpCCkMZnjc/g9Z20cJhOIj4nlb6S78GWxZ7DB8iajH\npOuqplNSML6ykKieMS1leX9I8EcecMt20oWYapWIlnVmdSlSfneab1t49Halv4Sk\nSLp85FzdlUeeDehTjyOnTGz/2tI1kLqY55LVcMVAklk/aU+b3Ph5FcFA8EAUf/f+\nVwwXMLECAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSWd+e/ady1\n3i8Mg6OZSbqIdmlNLjBSBgNVHSMESzBJgBSWd+e/ady13i8Mg6OZSbqIdmlNLqEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUyghRrkpBl+IxAx0CILwMvdl4A9YUw\nijALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJp8kOG4dXHy1TJc/eLv\nZuFARlBdN4y/99bgn8IvDBXmQ1b4DY4VNpRcvymW1A4DAqqWG8Baf9DqxkkiIwJP\nPfTW6VobMtDiwBmUyQcBtgAasu1Twb00bFD8XV2pDykR9JyLYutThTGA326RjZ/S\nepGidM2Sa2QXMDErzcJJn3bnhPBBgjZQypXqTCDT/Wc0EMD6wasXm9WBA9sduKr/\nupio3xFPDW1gSaztNuqM1/i+mdd5PGakuPuBJWP5PZS0FEtAlarlUtmfJzUHTUx/\nmfkXoJEAdgne2qC/V7i5P8HBZyDkaKLTpbN4daEXllVVptV3o8GEs0xrnWMpWJGd\n62gIMflnjjVxbfXEj2itMjE/CeHVCSf4/Az6e9UM6NWBjwVxx7EImXsfm2Rvtumf\nwHuGmuzxHwxIXXU2wG3Ar8yInjPqtySfMUrALGsPT3djqDUvNuZ6WNysV4HqISBl\nX5ZUw9RNVMlI67P1PZhg869KQWG/1IvJiSZ1PHARkOROMYk8PN0MNJjKLU1/euT9\nmJqpLK8PocR+17+pYf6b5m1HUXeOqmZwGjpDxGUsEctY5mmqQMNJ/QgLBqyFMN6I\n3XTtkVoxC6EbofZ6rzpQFPxcI5XDTl/RFWGGoFwykKi7/H6Q9nEumvm57ipqDAwA\nFwkEXpNhAy6vLrecQOebw0dE\n-----END CERTIFICATE-----\n","type":"certificate"},"capabilities":["acl","cfengine","curl","http_reporting","jq","xml","yaml"]}
 policyServerId:root-policy-server
 nodeHostname: node2.normation.com
 inventoryDate: 20150515123456.948Z
 ipHostNumber: 192.168.56.102
 ipHostNumber: 127.0.0.1
-publicKey: "test"
 environmentVariable: {"name":"PWD","value":"/var/rudder"}
 environmentVariable: {"name":"SUDO_GID","value":"1000"}
 
@@ -360,7 +358,6 @@ nodeHostname: node3.normation.com
 inventoryDate: 20160515123456.948Z
 ipHostNumber: 192.168.56.103
 ipHostNumber: 127.0.0.1
-publicKey: "test"
 environmentVariable: {"name":"PATH","value":"/usr/local/sbin:/usr/local/bin:
  /usr/sbin:/usr/bin:/sbin:/bin:/var/rudder/cfengine-community/bin"}
 
@@ -399,7 +396,6 @@ agentName: {"agentType":"dsc","version":"8.0.0","securityToken":{"value":"-----B
 policyServerId:root-policy-server
 nodeHostname: node5.normation.com
 inventoryDate: 20180515123456.948Z
-publicKey: "test"
 
 dn: nodeId=node6,ou=Nodes,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration
 objectClass: top
@@ -417,7 +413,6 @@ agentName: {"agentType":"cfengine-community","version":"8.0.0","securityToken":{
 policyServerId:root-policy-server
 nodeHostname: node6.normation.com
 inventoryDate: 20190515123456.948Z
-publicKey: "test"
 
 dn: nodeId=node7,ou=Nodes,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration
 objectClass: top
@@ -437,7 +432,6 @@ agentName: {"agentType":"cfengine-community","version":"8.0.0","securityToken":{
 policyServerId:root-policy-server
 nodeHostname: node7.normation.com
 inventoryDate: 20200515123456.948Z
-publicKey: "test"
 
 ###################################################################################################
 # Logicial Elements #
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/ldap-data/schema/099-0-inventory.ldif b/webapp/sources/rudder/rudder-core/src/test/resources/ldap-data/schema/099-0-inventory.ldif
index a860ee72e78..f8bc8307ccc 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/ldap-data/schema/099-0-inventory.ldif
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/ldap-data/schema/099-0-inventory.ldif
@@ -216,12 +216,6 @@ attributeTypes: ( 1.3.6.1.4.1.35061.1.1.300.7
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
   EQUALITY generalizedTimeMatch
   ORDERING generalizedTimeOrderingMatch )
-attributeTypes: ( 1.3.6.1.4.1.35061.1.1.300.8
-  NAME 'publicKey'
-  DESC 'A public key in PEM representation'
-  EQUALITY caseIgnoreMatch
-  SUBSTR caseIgnoreSubstringsMatch
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
 attributeTypes: ( 1.3.6.1.4.1.35061.1.1.300.9
   NAME 'nodeTechniques'
   DESC 'Name of techniques applied to that node'
@@ -248,7 +242,7 @@ attributeTypes: ( 1.3.6.1.4.1.35061.1.1.300.12
   ORDERING generalizedTimeOrderingMatch )
 attributeTypes: ( 1.3.6.1.4.1.35061.1.1.300.13
   NAME 'agentName'
-  DESC 'List of name of the agent (Nova, Community, ...)'
+  DESC 'List of name of the agent (Dsc, Community, ...)'
   EQUALITY caseIgnoreMatch
   SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
@@ -856,7 +850,7 @@ objectClasses: ( 1.3.6.1.4.1.35061.1.2.14
   ABSTRACT
   MUST ( nodeId $ localAdministratorAccountName $ nodeHostname $
   policyServerId $ osName $ osVersion $ osKernelVersion )
-  MAY ( description $ cn $ publicKey $ agentName $ hostedVm $ container $
+  MAY ( description $ cn $ agentName $ hostedVm $ container $
   software $  localAccountName $ osServicePack $
   nodeTechniques $ ram $ swap $ confirmed $
   inventoryDate $ receiveDate $ ipHostNumber $ osFullName $
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-physical-v2.json b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-physical-v2.json
index 965105af77c..49a42c325f4 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-physical-v2.json
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-physical-v2.json
@@ -26,8 +26,8 @@
     "user": "machine-user",
     "version": "3.15.3",
     "securityToken": {
-      "kind": "certificate",
-      "token": "-----BEGIN CERTIFICATE-----\\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\\nRlYSlie1YMo1Yy2jzZhP\\n-----END CERTIFICATE-----"
+      "type": "certificate",
+      "value": "-----BEGIN CERTIFICATE-----\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\nRlYSlie1YMo1Yy2jzZhP\n-----END CERTIFICATE-----"
     },
     "capabilities": []
   },
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-physical.json b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-physical.json
index 3c7781c907c..625d43297a5 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-physical.json
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-physical.json
@@ -25,8 +25,8 @@
     "user": "machine-user",
     "version": "3.15.3",
     "securityToken": {
-      "kind": "certificate",
-      "token": "-----BEGIN CERTIFICATE-----\\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\\nRlYSlie1YMo1Yy2jzZhP\\n-----END CERTIFICATE-----"
+      "type": "certificate",
+      "value": "-----BEGIN CERTIFICATE-----\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\nRlYSlie1YMo1Yy2jzZhP\n-----END CERTIFICATE-----"
     },
     "capabilities": []
   },
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown-v2.json b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown-v2.json
index 965445d0006..f33d4d9830a 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown-v2.json
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown-v2.json
@@ -26,8 +26,8 @@
     "user": "machine-user",
     "version": "3.15.3",
     "securityToken": {
-      "kind": "certificate",
-      "token": "-----BEGIN CERTIFICATE-----\\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\\nRlYSlie1YMo1Yy2jzZhP\\n-----END CERTIFICATE-----"
+      "type": "certificate",
+      "value": "-----BEGIN CERTIFICATE-----\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\nRlYSlie1YMo1Yy2jzZhP\n-----END CERTIFICATE-----"
     },
     "capabilities": []
   },
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown-vm-v2.json b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown-vm-v2.json
index 494aabe3564..3cbb8c65aa8 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown-vm-v2.json
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown-vm-v2.json
@@ -27,8 +27,8 @@
     "user": "machine-user",
     "version": "3.15.3",
     "securityToken": {
-      "kind": "certificate",
-      "token": "-----BEGIN CERTIFICATE-----\\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\\nRlYSlie1YMo1Yy2jzZhP\\n-----END CERTIFICATE-----"
+      "type": "certificate",
+      "value": "-----BEGIN CERTIFICATE-----\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\nRlYSlie1YMo1Yy2jzZhP\n-----END CERTIFICATE-----"
     },
     "capabilities": []
   },
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown-vm.json b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown-vm.json
index 82187133400..1b16322785d 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown-vm.json
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown-vm.json
@@ -25,8 +25,8 @@
     "user": "machine-user",
     "version": "3.15.3",
     "securityToken": {
-      "kind": "certificate",
-      "token": "-----BEGIN CERTIFICATE-----\\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\\nRlYSlie1YMo1Yy2jzZhP\\n-----END CERTIFICATE-----"
+      "type": "certificate",
+      "value": "-----BEGIN CERTIFICATE-----\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\nRlYSlie1YMo1Yy2jzZhP\n-----END CERTIFICATE-----"
     },
     "capabilities": []
   },
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown.json b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown.json
index 593825ddfc2..101c58d7da3 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown.json
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-001-machine-unknown.json
@@ -25,8 +25,8 @@
     "user": "machine-user",
     "version": "3.15.3",
     "securityToken": {
-      "kind": "certificate",
-      "token": "-----BEGIN CERTIFICATE-----\\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\\nRlYSlie1YMo1Yy2jzZhP\\n-----END CERTIFICATE-----"
+      "type": "certificate",
+      "value": "-----BEGIN CERTIFICATE-----\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\nRlYSlie1YMo1Yy2jzZhP\n-----END CERTIFICATE-----"
     },
     "capabilities": []
   },
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-930dccb0-5b06-4385-ab7a-80a7e56eb969-v2.json b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-930dccb0-5b06-4385-ab7a-80a7e56eb969-v2.json
index f63d34acae7..412830f22bf 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-930dccb0-5b06-4385-ab7a-80a7e56eb969-v2.json
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-930dccb0-5b06-4385-ab7a-80a7e56eb969-v2.json
@@ -1524,8 +1524,8 @@
       "http_reporting"
     ],
     "securityToken": {
-      "kind": "certificate",
-      "token": "-----BEGIN CERTIFICATE-----\\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\\nRlYSlie1YMo1Yy2jzZhP\\n-----END CERTIFICATE-----"
+      "type": "certificate",
+      "value": "-----BEGIN CERTIFICATE-----\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\nRlYSlie1YMo1Yy2jzZhP\n-----END CERTIFICATE-----"
     }
   },
   "creationDate": "2024-05-16T15:20:12Z",
diff --git a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-930dccb0-5b06-4385-ab7a-80a7e56eb969.json b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-930dccb0-5b06-4385-ab7a-80a7e56eb969.json
index ff869eb6ba3..75dc238eb3a 100644
--- a/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-930dccb0-5b06-4385-ab7a-80a7e56eb969.json
+++ b/webapp/sources/rudder/rudder-core/src/test/resources/node-facts/node-930dccb0-5b06-4385-ab7a-80a7e56eb969.json
@@ -1523,8 +1523,8 @@
       "http_reporting"
     ],
     "securityToken": {
-      "kind": "certificate",
-      "token": "-----BEGIN CERTIFICATE-----\\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\\nRlYSlie1YMo1Yy2jzZhP\\n-----END CERTIFICATE-----"
+      "type": "certificate",
+      "value": "-----BEGIN CERTIFICATE-----\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\nRlYSlie1YMo1Yy2jzZhP\n-----END CERTIFICATE-----"
     }
   },
   "creationDate": "2024-05-16T15:20:12Z",
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/HashAlgoTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/HashAlgoTest.scala
deleted file mode 100644
index a3b77076743..00000000000
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/HashAlgoTest.scala
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *************************************************************************************
- * Copyright 2016 Normation SAS
- *************************************************************************************
- *
- * This file is part of Rudder.
- *
- * Rudder is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * In accordance with the terms of section 7 (7. Additional Terms.) of
- * the GNU General Public License version 3, the copyright holders add
- * the following Additional permissions:
- * Notwithstanding to the terms of section 5 (5. Conveying Modified Source
- * Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
- * Public License version 3, when you create a Related Module, this
- * Related Module is not considered as a part of the work and may be
- * distributed under the license agreement of your choice.
- * A "Related Module" means a set of sources files including their
- * documentation that, without modification of the Source Code, enables
- * supplementary functions or services in addition to those offered by
- * the Software.
- *
- * Rudder is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
-
- *
- *************************************************************************************
- */
-
-package com.normation.cfclerk.domain
-
-import com.normation.cfclerk.domain.AixPasswordHashAlgo.ShaSpec
-import org.junit.runner.RunWith
-import org.specs2.mutable.*
-import org.specs2.runner.JUnitRunner
-
-@RunWith(classOf[JUnitRunner])
-class HashAlgoTest extends Specification {
-
-  /*
-   * As we are relying on some JCE hashing algo, we may be in case where
-   * the algo is not present. We must account of that to not have spurious
-   * falling tests.
-   */
-  private def isAvailable(sha: ShaSpec) = {
-    AixPasswordHashAlgo.getSecretKeFactory(sha).isDefined
-  }
-
-  val sha1Available:   Boolean = isAvailable(ShaSpec.SHA1)
-  val sha256Available: Boolean = isAvailable(ShaSpec.SHA256)
-  val sha512Available: Boolean = isAvailable(ShaSpec.SHA512)
-
-  "Aix hashing" should {
-
-    "calculate the expected smd5 hash" in {
-
-      val pwd  = "secret"
-      val salt = "tyiOfoE4" // max 8 chars in md5_crypt
-
-      AixPasswordHashAlgo.smd5(pwd, Some(salt)) must be_==("{smd5}tyiOfoE4$r5HleyKHVdL3dg9ouzcZ80")
-    }
-
-    "calculate the expected ssha1 hash" in {
-
-      val pwd      = "secret"
-      val salt     = "tyiOfoE4WXucUfh/"
-      val expected = if (sha1Available) {
-        "{ssha1}12$tyiOfoE4WXucUfh/$1olYn48enIIKGOOs0ve/GE.k.sF"
-      } else {
-        "{smd5}tyiOfoE4$r5HleyKHVdL3dg9ouzcZ80"
-      }
-
-      AixPasswordHashAlgo.ssha1(pwd, Some(salt), 12) must be_==(expected)
-    }
-
-    "calculate the expected ssha256 hash" in {
-
-      val pwd      = "secret"
-      val salt     = "tyiOfoE4WXucUfh/"
-      val expected = if (sha256Available) {
-        "{ssha256}12$tyiOfoE4WXucUfh/$YDkcqbY5oKk4lwQ4pVKPy8o4MqcfVpp1ZxxvSfP0.wS"
-      } else if (sha1Available) {
-        "{ssha1}12$tyiOfoE4WXucUfh/$1olYn48enIIKGOOs0ve/GE.k.sF"
-      } else {
-        "{smd5}tyiOfoE4$r5HleyKHVdL3dg9ouzcZ80"
-      }
-
-      AixPasswordHashAlgo.ssha256(pwd, Some(salt), 12) must be_==(expected)
-    }
-
-    "calculate the expected ssha512 hash" in {
-
-      val pwd      = "secret"
-      val salt     = "tyiOfoE4WXucUfh/"
-      val expected = if (sha512Available) {
-        "{ssha512}10$tyiOfoE4WXucUfh/$qaLbOhKx3fwIu93Hkh4Z89Vr.otLYEhRGN3b3SAZFD3mtxhqWZmY2iJKf0KB/5fuwlERv14pIN9h4XRAZtWH.."
-      } else if (sha1Available) {
-        "{ssha1}10$tyiOfoE4WXucUfh/$WoHzlMSRBEZW4wygWnlWMxDn..3"
-      } else {
-        "{smd5}tyiOfoE4$r5HleyKHVdL3dg9ouzcZ80"
-      }
-
-      AixPasswordHashAlgo.ssha512(pwd, Some(salt), 10) must be_==(expected)
-    }
-
-  }
-
-}
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/VariableTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/VariableTest.scala
index 732650ec182..1e5c0eceb99 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/VariableTest.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/domain/VariableTest.scala
@@ -61,7 +61,7 @@ class VariableTest extends Specification {
     }
   }
 
-  val nbVariables = 28
+  val nbVariables = 27
 
   val refName         = "name"
   val refDescription  = "description"
@@ -161,7 +161,6 @@ class VariableTest extends Specification {
         rawVar
       )
       variables must haveKeys((1 to 6).map("password" + _)*)
-      variables must haveKeys(Seq("", "_AIX").map(s => "password_master" + s)*)
 
     }
   }
@@ -489,14 +488,6 @@ class VariableTest extends Specification {
         case _                      => ko("Variable is not a password input")
       }
     }
-
-    "uses others inputs" in {
-      v.spec.constraint.usedFields === Set("password_master_AIX")
-    }
-
-    "we have a derived password variable" in {
-      variables("password_master_AIX").spec.constraint.typeName === AixDerivedPasswordVType
-    }
   }
 
   // predef variables
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/TechniqueRepositoryTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/TechniqueRepositoryTest.scala
index f2164e0a749..9797657020f 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/TechniqueRepositoryTest.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/cfclerk/services/TechniqueRepositoryTest.scala
@@ -42,6 +42,7 @@ import com.normation.cfclerk.domain.*
 import com.normation.errors.*
 import com.normation.eventlog.EventActor
 import com.normation.eventlog.ModificationId
+import com.normation.rudder.domain.policies.AcceptationDateTime
 import com.normation.rudder.domain.policies.ActiveTechnique
 import com.normation.rudder.domain.policies.ActiveTechniqueCategory
 import com.normation.rudder.domain.policies.ActiveTechniqueCategoryId
@@ -158,7 +159,7 @@ class TechniqueRepositoryTest extends Specification with Loggable with AfterAll
         reason:        Option[String]
     ): IOResult[ActiveTechnique] = {
       updatedTechniques = techniqueName.value :: updatedTechniques
-      ActiveTechnique(ActiveTechniqueId("empty"), techniqueName, Map()).succeed
+      ActiveTechnique(ActiveTechniqueId("empty"), techniqueName, AcceptationDateTime.empty).succeed
     }
     // ALL the following methods are useless for our test
     override def getFullDirectiveLibrary(): IOResult[FullActiveTechniqueCategory] = {
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala
index 135e050fd2d..a5aa98b05bb 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/MockServices.scala
@@ -1719,15 +1719,38 @@ object MockNodes {
 
   // a valid, not used pub key
   // cfengine key hash is: 081cf3aac62624ebbc83be7e23cb104d
-  val PUBKEY =
-    """-----BEGIN RSA PUBLIC KEY-----
-MIIBCAKCAQEAlntroa72gD50MehPoyp6mRS5fzZpsZEHu42vq9KKxbqSsjfUmxnT
-Rsi8CDvBt7DApIc7W1g0eJ6AsOfV7CEh3ooiyL/fC9SGATyDg5TjYPJZn3MPUktg
-YBzTd1MMyZL6zcLmIpQBH6XHkH7Do/RxFRtaSyicLxiO3H3wapH20TnkUvEpV5Qh
-zUkNM8vHZuu3m1FgLrK5NCN7BtoGWgeyVJvBMbWww5hS15IkCRuBkAOK/+h8xe2f
-hMQjrt9gW2qJpxZyFoPuMsWFIaX4wrN7Y8ZiN37U2q1G11tv2oQlJTQeiYaUnTX4
-z5VEb9yx2KikbWyChM1Akp82AV5BzqE80QIBIw==
------END RSA PUBLIC KEY-----"""
+  val CERTIFICATE_NODE1 =
+    """-----BEGIN CERTIFICATE-----
+MIIFTjCCAzagAwIBAgIUO0kEJ2Fwb4MWT2yBVqR+UX4osMcwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUxMB4XDTI0MTEwMjE2MTIxOVoXDTM0
+MTAzMTE2MTIxOVowFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUxMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAptzhnQCPvgOwjn6LCfVhTMAs10hwYj5YxqOX
+i8MPiFT4Rlrn6xyB24O7E+O2EL/IUYSk5Lbp2OGSJWvNe1d+KbESpmGoM1UnAa8j
+VsW+HY/uJ23THKAhe9ykOxWObSp/sSwFhw6C0p7SriI72uW/fJ40XCh2m2FuJuQP
+YHjNOR5P/cOLhKs/cEkt3icMxyfipor+kcqC/GsCPtwwXFwnS5yWlmRxVSzkI1fZ
+6B403aHMe5PSqD0kxWX8roR/9sIVRvLVbxQtiuyM2xUeSuIlg3bho9wN4/shhqKv
+q3zqJQy86YZVC9jRmX21BeQukTWiu3uqppxVcyTM5Wzf3jrE7A+2Iea6ZvMFA0fq
+D39CgXhkuCGdGaBQtVzuYBASyECUEmMgQMb99rnlONVVVdFQHS26+c1fR1rn+Iyq
+kGOmrTRSaf1F8OLnvAY9UhXi/oJNDh57y+Y+X11XY2mBgmt/zRFN05HxD0UpsvlS
+p850QzmoO7qusRY5CnrX40HHhhB9wr5lhKTVEAgoEhrYvC/wDWLBElECNQzC99ye
+FUR2T1sc1qsmDVki5eivm086viHt231plJIXKtAdTLc2EXYxtNiVowXKbhujtwOR
+gIcG9YXEwc7woXnpxOJHYlFfB9TKMKzc8FfKVZnOibp0Ceenpxj0nUItlLJMoEaM
+G4upElcCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBT9f5l3IkLI
+dwooamw/OugzXWT8RjBSBgNVHSMESzBJgBT9f5l3IkLIdwooamw/OugzXWT8RqEb
+pBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUxghQ7SQQnYXBvgxZPbIFWpH5Rfiiw
+xzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAF0LWEG8O3W18U0r+6v1
+pSS1UqcP0HI3M27+Pq2Gk+/s9DRlgeyPmSYTGMdbP1eL5lR5BubUrZlKmXCneda+
+Vl4akoNaYXHFKpRIKm4y2ezX6XRugblurc+tL3V17UAhYjSglL/5yRXiLrJKACOP
+0NNjjrqn2JM2PfD29Ge6K+yir92V8aOByElZVYNH4f9Avc+zzg4yBDTONutZ2TBx
+cPZ3s2Z7bsbOYhJey+j99Oc/puyUNyvh5R/hLV5QP+FA/N8JR8N2IeaIwF8/Kyhu
+MTSajF4pLY1N8YbQA0jd6zwz6NvRu5HBJ+u53JX4kyMc8mMAG0PZz6pUmAwlqq7V
+EqsjDVYHB19WKh9gaJkKNkft7IsB1b7exklGRPUuR/Sb4a5rgl47a3EM38KCVfFX
+BBNUhCn0Lt3lKs4RUXxLSh36ptEPre9qkWtdTnjR+T6KLxVonLdNQSOeqRplb4la
+Uu/CwaqyaPf39pzyXLNdZszknsXk+ih1+Kn/X7cTTUjNsvlMRqlh/wW2Ss0FK3R3
+7GObkgYD5hHVDrH5tp9gh0a0r0GT3bT4119BgE8zgwqMGbOHkg5ENT+nyL0b0niZ
+0ITz1f3/arh35zGKGr1mueUrJuSLeRG1v62+Mire+5PIliT+tQM7Bk8TptlSIl37
+3jccIfXR+UOVrHdSl0QmGOxb
+-----END CERTIFICATE-----"""
 
   val emptyNodeReportingConfiguration: ReportingConfiguration = ReportingConfiguration(None, None, None)
 
@@ -1765,7 +1788,7 @@ z5VEb9yx2KikbWyChM1Akp82AV5BzqE80QIBIw==
     List("127.0.0.1", "192.168.0.100"),
     DateTime.parse("2021-01-30T01:20+01:00"),
     UndefinedKey,
-    Seq(AgentInfo(CfeCommunity, Some(AgentVersion("7.0.0")), PublicKey(PUBKEY), Set())),
+    Seq(AgentInfo(CfeCommunity, Some(AgentVersion("7.0.0")), Certificate(CERTIFICATE_NODE1), Set())),
     rootId,
     rootAdmin,
     None,
@@ -1845,7 +1868,7 @@ z5VEb9yx2KikbWyChM1Akp82AV5BzqE80QIBIw==
     List("192.168.0.10"),
     DateTime.parse("2021-01-30T01:20+01:00"),
     UndefinedKey,
-    Seq(AgentInfo(CfeCommunity, Some(AgentVersion("7.0.0")), PublicKey(PUBKEY), Set())),
+    Seq(AgentInfo(CfeCommunity, Some(AgentVersion("7.0.0")), Certificate(CERTIFICATE_NODE1), Set())),
     rootId,
     admin1,
     None,
@@ -2074,7 +2097,7 @@ z5VEb9yx2KikbWyChM1Akp82AV5BzqE80QIBIw==
         Nil,
         DateTime.now,
         UndefinedKey,
-        Seq(AgentInfo(CfeCommunity, None, PublicKey("rsa public key"), Set())),
+        Seq(AgentInfo(CfeCommunity, None, Certificate("node certificate"), Set())),
         NodeId("root"),
         "",
         None,
@@ -2311,9 +2334,9 @@ class MockNodes() {
         byLine <- lines.traverse(filterForLine(_, nodes))
       } yield {
         combine match {
-          case And =>
+          case CriterionComposition.And =>
             (nodes :: byLine).reduce((a, b) => a.intersect(b))
-          case Or  =>
+          case CriterionComposition.Or  =>
             (Nil :: byLine).reduce((a, b) => a ++ b)
         }
       }
@@ -2331,10 +2354,6 @@ class MockNodes() {
     override def processOnlyId(query: Query)(implicit qc: QueryContext): Box[Seq[NodeId]] = process(query).map(_.toSeq)
   }
 
-  val nodeInfoService         = new NodeInfoServiceProxy(nodeFactRepo)
-  val fullInventoryRepository = new MockNodeFactFullInventoryRepositoryProxy(nodeFactRepo)
-  val woNodeRepository        = new WoFactNodeRepositoryProxy(nodeFactRepo)
-
   object newNodeManager extends NewNodeManager {
     implicit val qc: QueryContext = QueryContext.todoQC
 
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/NodeKeyHashTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/NodeKeyHashTest.scala
deleted file mode 100644
index 42d53a1d76a..00000000000
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/domain/nodes/NodeKeyHashTest.scala
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- *************************************************************************************
- * Copyright 2016 Normation SAS
- *************************************************************************************
- *
- * This file is part of Rudder.
- *
- * Rudder is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * In accordance with the terms of section 7 (7. Additional Terms.) of
- * the GNU General Public License version 3, the copyright holders add
- * the following Additional permissions:
- * Notwithstanding to the terms of section 5 (5. Conveying Modified Source
- * Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
- * Public License version 3, when you create a Related Module, this
- * Related Module is not considered as a part of the work and may be
- * distributed under the license agreement of your choice.
- * A "Related Module" means a set of sources files including their
- * documentation that, without modification of the Source Code, enables
- * supplementary functions or services in addition to those offered by
- * the Software.
- *
- * Rudder is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
-
- *
- *************************************************************************************
- */
-
-package com.normation.rudder.domain.nodes
-
-import com.normation.inventory.domain.PublicKey
-import com.normation.zio.*
-import net.liftweb.common.*
-import org.junit.runner.RunWith
-import org.specs2.mutable.*
-import org.specs2.runner.*
-
-@RunWith(classOf[JUnitRunner])
-class NodeKeyHashTest extends Specification with Loggable {
-
-  // Keys are sanitized in LDAP, we remove header and footer
-  val key: PublicKey = PublicKey("""
-MIIBCAKCAQEAv76gYG9OaFpc0eBeUXDM3WsRWyuHco3DpWnKrrpqQwylpEH26gRb
-cu/L5KWc1ihj1Rv/AU3dkQL5KdXatSrWOLUMmYcQc5DYSnZacbdHIGLn11w1PHsw
-9P2pivwQyIF3k4zqANtlZ3iZN4AXZpURI4VVhiBYPwZ4XgHPibcuJHiyNyymiHpT
-HX9H0iaEIwyJMPjzRH+piFRmSeUylHfQLqb6AkD3Dg3Nxe9pbxNbk1saqgHFF4kd
-Yh3O5rVto12XqisGWIbsmsT0XFr6V9+/sde/lpjI4AEcHR8oFYX5JP9/SXPuRJfQ
-lEl8vn5PHTY0mMrNAcM7+rzpkOW2c7b8bwIBIw==
-""")
-
-  val key2: PublicKey = PublicKey("""-----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA1BYbjAvs2htHI9CKhJS68+krvOBQWObqDdEDK3QXESWa0e7gcGao
-zI4vFrFqlsSmra73ws59uDjf/GCbXanU7TDF38eopV08218qT1oHUpYVmUlLbn6A
-ONzhBbPyPEDs4cshadh2YDSWpfwOED+vHhZaM6JETSV6HM7N0+kMya1wgYD2MsZ/
-l9NSdea9BtCd1KHw/Bx7MANOi3KGKwuAeUslo/WtVnAcW7K76b5GC7yIg5L6CIDW
-YOpGe63otvVi3IOWheH1x6FVHD+wsOC0lDZNzb82XGf5hZarGAxIVeQuGFf0OLVH
-eDCco6N4drw5BsJTUdW59N4KSbg/VRGWpwIDAQAB
------END RSA PUBLIC KEY-----""")
-
-  "Producing the magic MD5 hash" should {
-    "give the same result as CFEngine" in {
-      NodeKeyHash.getCfengineMD5Digest(key).runNow must beEqualTo("8d3270d42486e8d6436d06ed5cc5034f")
-    }
-  }
-
-  "Producing the magic SHA256 hash" should {
-    "give the same result as CFEngine" in {
-      NodeKeyHash.getCfengineSHA256Digest(key2).runNow must beEqualTo(
-        "7be4ef500c22672a67e56a48c00dc29db1131a1e6be044c794f63a6f854f6dec"
-      )
-    }
-  }
-
-  "Producing the standard sha-256 hash" should {
-    "give the same result as the relay server API" in {
-      NodeKeyHash.getHexSha256Digest(key).runNow must beEqualTo(
-        "02dee6f141495cad9813183696d0e66f8e8b2939af0d801e368f3873ed632276"
-      )
-    }
-  }
-
-  "Producing the standard sha-256 hash" should {
-    "give the same result as the relay server API" in {
-      NodeKeyHash.getB64Sha256Digest(key2).runNow must beEqualTo("eNiEhcP+Lsk4lL6OhBTuFdCtWi+PXnHIGbawpDfMQqQ=")
-    }
-  }
-
-}
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/MockLdapFactStorage.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/MockLdapFactStorage.scala
index 341fbd974d0..f0113151130 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/MockLdapFactStorage.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/MockLdapFactStorage.scala
@@ -133,7 +133,7 @@ class MockLdapFactStorage {
   val rudderDit  = new RudderDit(new DN("ou=Rudder, cn=rudder-configuration"))
   val inventoryDitService: InventoryDitService = new InventoryDitServiceImpl(pendingDIT, acceptedDIT, removedDIT)
   val inventoryMapper             = new InventoryMapper(inventoryDitService, pendingDIT, acceptedDIT, removedDIT)
-  val ldapMapper                  = new LDAPEntityMapper(rudderDit, nodeDit, acceptedDIT, null, inventoryMapper)
+  val ldapMapper                  = new LDAPEntityMapper(rudderDit, nodeDit, null, inventoryMapper)
   val ldapFullInventoryRepository = new FullInventoryRepositoryImpl(inventoryDitService, inventoryMapper, ldap, 100)
   val softwareGet                 = new ReadOnlySoftwareDAOImpl(inventoryDitService, ldapRo, inventoryMapper)
   val softwareSave                = new NameAndVersionIdFinder("check_name_and_version", ldapRo, inventoryMapper, acceptedDIT)
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestCoreNodeFactInventory.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestCoreNodeFactInventory.scala
index 6189670d006..e54090881fc 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestCoreNodeFactInventory.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestCoreNodeFactInventory.scala
@@ -587,7 +587,7 @@ class TestCoreNodeFactInventory extends Specification with BeforeAfterAll {
         .getAttributeValue("environmentVariable") must beEqualTo("""{"name":"envVAR","value":"envVALUE"}""")) and
       (mockLdapFactStorage.testServer
         .getEntry("nodeId=node7,ou=Nodes,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration")
-        .getAttributeValue("process") must beEqualTo("""{"pid":4242,"commandName":"process 4242 command line"}""")) and
+        .getAttributeValue("process") must beEqualTo("""{"pid":4242,"name":"process 4242 command line"}""")) and
       (mockLdapFactStorage.testServer.entryExists(
         "networkInterface=eth0,nodeId=node7,ou=Nodes,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration"
       ) must beTrue) and
@@ -675,21 +675,71 @@ class TestCoreNodeFactInventory extends Specification with BeforeAfterAll {
     // node7 is "initializing" in ldap sample data
     val res = (for {
       node <- factRepo.get(node7id).notOptional("node7 must be here")
-      diff <- factRepo.save(node.modify(_.rudderSettings.state).setTo(NodeState.PreparingEOL))(testChangeContext)
+      diff <- factRepo.save(node.modify(_.rudderSettings.state).setTo(NodeState.Enabled))(testChangeContext)
     } yield diff).either.runNow
 
     (mockLdapFactStorage.testServer
       .getEntry("nodeId=node7,ou=Nodes,cn=rudder-configuration")
       .getAttribute("state")
-      .getValue === """preparing-eol""") and
+      .getValue === """enabled""") and
     (res must beRight) and {
       res.forceGet.event match {
         case NodeFactChangeEvent.Updated(oldNode, newNode, _) =>
-          (oldNode.rudderSettings.state === NodeState.Initializing) and (newNode.rudderSettings.state === NodeState.PreparingEOL)
+          (oldNode.rudderSettings.state === NodeState.Initializing) and (newNode.rudderSettings.state === NodeState.Enabled)
 
         case x => ko(s"bad change event, get ${x}")
       }
     }
+
+    "the count of active nodes changes if we disable one" >> {
+      factStorage.clearCallStack
+      val (n1, n2) = (for {
+        n1   <- factRepo.getNumberOfManagedNodes()
+        node <- factRepo
+                  .get(node7id)(QueryContext.testQC, SelectNodeStatus.Accepted)
+                  .notOptional("node7 must be here")
+
+        updated = node
+                    .modify(_.rudderSettings.state)
+                    .setTo(NodeState.Ignored)
+
+        _  <- factRepo.save(updated)(testChangeContext)
+        n2 <- factRepo.getNumberOfManagedNodes()
+
+      } yield (n1, n2)).runNow
+
+      val numberOfNodes = 9
+      (mockLdapFactStorage.testServer
+        .getEntry("nodeId=node7,ou=Nodes,cn=rudder-configuration")
+        .getAttribute("state")
+        .getValue === """ignored""") and
+      (res must beRight) and
+      n1 === numberOfNodes and n2 === (numberOfNodes - 1)
+    }
+
+    "node certificate serialisation is correct with ZIO in LDAP" >> {
+      mockLdapFactStorage.testServer
+        .getEntry("nodeId=node7,ou=Nodes,ou=Accepted Inventories,ou=Inventories,cn=rudder-configuration")
+        .getAttributeValue("agentName") must beEqualTo(
+        """{"agentType":"cfengine-community","version":"8.0.0","securityToken":{"type":"certificate","value":"-----BEGIN CERTIFICATE-----\n""" +
+        """MIIFTjCCAzagAwIBAgIUfa0+S+CyJahRzuwNNOFLNQQjIH8wDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MB4XDTI0MDMwMTExMDIxM1oXDTM0\n""" +
+        """MDIyNzExMDIxM1owFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAsmBUYI1A5vqkOTCW24m/mQhBaRu4WaAUXDAr\n""" +
+        """ArdIAAMN0KyHhEXP1/X32Flw90E0VjtUH4P+DYLBozXYWhJrUxdWLyn3TRSbv3Kr\npXoCWhMhMp8OK2s/mG+rfiMpTXIwaMhPnBaJFNV3c+bkijGAMHtFjl3+leXJvNZ7\n""" +
+        """w3bIg4cA3e77kz7EWMyqxOUvvLMyY6wpd03ahe/By+iLgtOkgUwl9hMqMU8tJeaz\nNIeUporsHk5rrk8bSf6Mxxdknm43Sk6oflnueNCIUFdd4rS2JLieMugsTh8n/oH+\n""" +
+        """k29ZyirE3ikhftmZ3vY8GQ3IcIzaXwiAOGnCKcze79zVx5jmOTGSZitGZaU/cZc6\nLjzEp+ZDmE8caVIksiA+hIlaZeBXNHB+YRv/gV1Rbt7kS1am+XUZJSfVFf+99YqE\n""" +
+        """lZ5p0hqJsczkBb2RuMxWxxsWO3pesPUNCuL/yaeggTIp7eK06tQWi1EfXr40ctrf\noimbzMAKNBpRKWruL7652SlF75Usaq+PaPi1TtqYQjLRZmbpr+IR4uMeKnEMIZPw\n""" +
+        """3dLDKBV6d71XkTAalCmcJU+fgYrRmgz1dEnaZDIXY+f+fYR15hsFpDrZ0avHgkzJ\nca/nT/rKeX7136BttxVSbZaTU9hnmjAvl+v0BF+JUWPQ3VPTcrmyUNAICt8xdVae\n""" +
+        """uo1tsvkCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSRG0uHQRIA\ngl91YqzSjaeaw+F7PDBSBgNVHSMESzBJgBSRG0uHQRIAgl91YqzSjaeaw+F7PKEb\n""" +
+        """pBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3ghR9rT5L4LIlqFHO7A004Us1BCMg\nfzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBABR2vTH/6WlqjaTZ/hQc\n""" +
+        """B+crqRlFimqCiVTRdX6qfkt0tLX2dK6scHNTBT04ORLjLTAn0KbcOUz3k6i0mIqB\nnG5UjqCFEQR+i2V4Hz7aK6+7LBQuwXWRhDhvO5xMn7MxjvP0LGgNf5iiA4r/N22L\n""" +
+        """EMc1prDESIOGmWdKg9XlfLxd877R2d8/3hXyT82Y2uJHO25b53skj4pbUOWLsGSw\nd4FBNnWqM+7Hbg2v9xFvmtfs2G2Inqk4Xjtjnj8qkVk3ft6KzClUIMXGXQ8QqaRp\n""" +
+        """YPkTJm5g2UBYDiguD/tlz3VmbsNYU6fkap7DKqhttbaseIx1zDwdAv4jtVOWDyjx\nWq4b7pljYiczfRa84X/9v1x05pT3raELy5udY+Pxmnz+hOXOM+jY5bzSKS24b8rS\n""" +
+        """5Sklmutm0IdflMKd5vNrXd9yPFLu3QzN50ArzHHXczwBLgjaMlZsPAp1wITlqM7+\nWCjy3qM5/KgAjH3L24MPTq23o9PokBVh1NH7lesZqgJPgsj+OG7FMQDvKzg7ytrs\n""" +
+        """QlIDF1c8Ko+9/RrnRVAS8C4GZOqbmMmfJjMp09GBz2d0ixlTusF6m6iwfIVMf/nI\nP/V0D7STRiV62cfnZ3e0w8kIeZwWAgXI7RMHJU3skLyurUu8yxkp635IQyzQsW2A\n""" +
+        """Yo7t7O7fxjqD9yVI2QfkERZ7\n-----END CERTIFICATE-----\n"},"capabilities":["acl","cfengine","curl","http_reporting","jq","xml","yaml"]}"""
+      )
+    }
+
   }
 
   "Inventory properties must be retrieved and not seen new each time (#25704)" >> {
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestFullInventoryRepoProxy.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestFullInventoryRepoProxy.scala
deleted file mode 100644
index 31be2c156d7..00000000000
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestFullInventoryRepoProxy.scala
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- *************************************************************************************
- * Copyright 2023 Normation SAS
- *************************************************************************************
- *
- * This file is part of Rudder.
- *
- * Rudder is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * In accordance with the terms of section 7 (7. Additional Terms.) of
- * the GNU General Public License version 3, the copyright holders add
- * the following Additional permissions:
- * Notwithstanding to the terms of section 5 (5. Conveying Modified Source
- * Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
- * Public License version 3, when you create a Related Module, this
- * Related Module is not considered as a part of the work and may be
- * distributed under the license agreement of your choice.
- * A "Related Module" means a set of sources files including their
- * documentation that, without modification of the Source Code, enables
- * supplementary functions or services in addition to those offered by
- * the Software.
- *
- * Rudder is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
-
- *
- *************************************************************************************
- */
-
-package com.normation.rudder.facts.nodes
-
-import com.normation.errors.*
-import com.normation.inventory.domain.*
-import com.normation.inventory.services.core.FullInventoryRepository
-import com.normation.rudder.tenants.DefaultTenantService
-import com.normation.zio.*
-import com.normation.zio.ZioRuntime
-import com.softwaremill.quicklens.*
-import org.joda.time.DateTime
-import org.junit.runner.*
-import org.specs2.mutable.*
-import org.specs2.runner.*
-import zio.*
-import zio.concurrent.ReentrantLock
-import zio.syntax.*
-
-final case class SystemError(cause: Throwable) extends RudderError {
-  def msg = "Error in test"
-}
-
-/*
- * A class to trace semantic changes between full ldap repo with ldap
- * and with fact backend (see com/normation/inventory/ldap/core/TestInventory.scala
- * for original results)
- */
-//@silent("a type was inferred to be `\\w+`; this may indicate a programming error.")
-@RunWith(classOf[JUnitRunner])
-class TestFullInventoryRepoProxy extends Specification {
-
-  implicit class RunThing[E, T](thing: ZIO[Any, E, T])      {
-    def testRun = ZioRuntime.unsafeRun(thing.either)
-  }
-  implicit class RunOptThing[A](thing: IOResult[Option[A]]) {
-    def testRunGet: A = ZioRuntime.unsafeRun(thing.either) match {
-      case Right(Some(a)) => a
-      case Right(None)    => throw new RuntimeException(s"Error in test: found None, expected Some")
-      case Left(err)      => throw new RuntimeException(s"Error in test: ${err}")
-    }
-  }
-
-  implicit class TestIsOK[E, T](thing: ZIO[Any, E, T]) {
-    def isOK = thing.testRun must beRight
-  }
-
-  implicit class ForceGetE[E, A](opt: Either[E, A]) {
-    def forceGet: A = opt match {
-      case Right(x)  => x
-      case Left(err) => throw new Exception(s"error in Test: ${err}")
-    }
-  }
-
-  // TODO WARNING POC: this can't work on a machine with lots of node
-  val callbackLog = Ref.make(Chunk.empty[NodeFactChangeEvent]).runNow
-
-  def resetLog = callbackLog.set(Chunk.empty).runNow
-
-  def getLogName = callbackLog.get.map(_.map(_.name)).runNow
-
-  val pendingRef  = (Ref.make(Map[NodeId, CoreNodeFact]())).runNow
-  val acceptedRef = (Ref.make(Map[NodeId, CoreNodeFact]())).runNow
-
-  def resetStorage = (for {
-    _ <- pendingRef.set(Map())
-    _ <- acceptedRef.set(Map())
-  } yield ()).runNow
-
-  object noopNodeBySoftwareName extends GetNodesBySoftwareName {
-    override def apply(softName: String): IOResult[List[(NodeId, Software)]] = {
-      Nil.succeed
-    }
-  }
-
-  val factRepo = {
-    // we avoid save pre-checks here because it's too clumsy to have correct inventories
-    val testSavePrechecks = Chunk.empty[NodeFact => IOResult[Unit]]
-
-    for {
-      callbacks <- Ref.make(Chunk.empty[NodeFactChangeEventCallback])
-      lock      <- ReentrantLock.make()
-      tenants   <- DefaultTenantService.make(Nil)
-      r          = new CoreNodeFactRepository(
-                     NoopFactStorage,
-                     noopNodeBySoftwareName,
-                     tenants,
-                     pendingRef,
-                     acceptedRef,
-                     callbacks,
-                     testSavePrechecks,
-                     lock
-                   )
-      _         <- r.registerChangeCallbackAction(CoreNodeFactChangeEventCallback("trail", e => callbackLog.update(_.appended(e.event))))
-      //      _         <- r.registerChangeCallbackAction(new NodeFactChangeEventCallback("log", e => effectUioUnit(println(s"**** ${e.name}"))))
-    } yield {
-      r
-    }
-  }.runNow
-  // needed because the in memory LDAP server is not used with connection pool
-  sequential
-
-  val allStatus = Seq(RemovedInventory, PendingInventory, AcceptedInventory)
-
-  val testAgent = NodeFact
-    .defaultRudderAgent("administrator")
-    .modify(_.securityToken)
-    .setTo(Certificate("""-----BEGIN CERTIFICATE-----
-                         |MIIFqDCCA5CgAwIBAgIUIb+ayWHZfmGiz8uiCqVsfjhYWgQwDQYJKoZIhvcNAQEL
-                         |BQAwNjE0MDIGCgmSJomT8ixkAQEMJDJiYjRlMDFiLWJlN2UtNGM5ZS05YzMwLTE3
-                         |N2FhZGE0NDg2OTAeFw0yMDAyMjUxNDI3MzRaFw0zMDAyMjIxNDI3MzRaMDYxNDAy
-                         |BgoJkiaJk/IsZAEBDCQyYmI0ZTAxYi1iZTdlLTRjOWUtOWMzMC0xNzdhYWRhNDQ4
-                         |NjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQColq7aeax/Dm+EjSGT
-                         |Lc7zzqQQocQbSVj7qzGo1htNyjjmroiTHuC+TwOGlWqGkDICa9bbDhq6XaGU+QSq
-                         |CcT62Q6Mtu/JUfmh+G1pRxHIGLJ7y3piOAHU3fV8oyMuAg/pmnn1P9nduT1odUWN
-                         |Kz0AOgAwOkXfY+jppbc8Ob45oEbdM4PGlrf3+NB2mRFh+VqwY2bMepb5Qym0BgYB
-                         |stwrrTgzOYeMkg6W5EJTxKtyvnslbaQkY0T6Dpm3PqkGCX0kNdd1Fs+Yb++o3uld
-                         |jCsGleO9ri+lyG0BCRyJ9X7wHZGqzyqmkPMJRav2S3maOOF5bcg9ljShvMRlCFLF
-                         |dHJ+Mk6DkVZO0eSx4FtAHkBkMg2KSYiLKg/90cLfPLGYpHyrL2XQFwdwOxzAteQ7
-                         |c98+szrTX/5jSIeeUrTOwQAu4enixi7OqMqxnJJyzK83TXFukCiuF+HOkmx87tim
-                         |zxce9HtafU65OLA+mSZ9xCUMPYFXoIpHNlvbe0vRomr71ktIX1YoK+5mI59IRulr
-                         |rtAKhZQRLpO4Tvzzev/Yuxf0C4lVTiszA6LleOlbYRUd/OWB0BKouFJA6a+3uJbo
-                         |DYDNQWaFYtBjntmob8Ygf6bO8wI5avn+9G3l9EL0+Zu7l780c1nvuH7TRm8ghiQJ
-                         |W8q94uJegU4rrT4YMf+++vHHfQIDAQABo4GtMIGqMAkGA1UdEwQCMAAwHQYDVR0O
-                         |BBYEFGy6++zu6pnflFHT9vKkc0lOtWacMHEGA1UdIwRqMGiAFGy6++zu6pnflFHT
-                         |9vKkc0lOtWacoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkMmJiNGUwMWItYmU3ZS00
-                         |YzllLTljMzAtMTc3YWFkYTQ0ODY5ghQhv5rJYdl+YaLPy6IKpWx+OFhaBDALBgNV
-                         |HQ8EBAMCA7gwDQYJKoZIhvcNAQELBQADggIBAGkSqpSlpxpIHAimFSA5A4CS0wSg
-                         |0KLiaMP17w83XKH88JZ9Dsp+hYu2xMH/Ewx/XdrcKJ2m0NQDNj3DCagvQGTNqvQq
-                         |RSNaXRI3L2GOt6w84dURE6vjX3wlq2IaKTRuq6+fEd61zJYq2vw8o/CqiOLoHVm6
-                         |2iitLBq+hiutnNKcAOqlqdN5eZdfiNu7irlqK70W9YNSXXcogwLCNZ4PVd/knZmj
-                         |VvgI2CHyjkfaaUYGC2KP9hzBkvWxlcoV16AOIICIjDPO/s+ykdhLGqm4FQdlOyZa
-                         |Do8lRMGe8SctvIvtLCUs3BC6S1B4AUJXT82uR7ay6RDU7chf/n1Bqb5ZGbQeGWFA
-                         |YMXcEHGTLzIb96bz8DvOArROTsZFgXT6gn/3u038VRBOnN8RS9Z8op0wwlJSKRDD
-                         |chjuXxDlh9CrwFYiVc1BYPNwNsEFxbPaL3hDRc+c9o2RPXqEY/Cde3d1ni8anduD
-                         |f6lyjhZNMqJiwh5Y6jlV5YHgW4U0SxNQnHtJ8oMrz/TmIB/8P6aQTCgx4v5grax+
-                         |TpQF7heIRmdhRXU4LZjtfWD8UOdOm5Bn7gDXBUFYzBCbIpUIOriqeC7lgZY17Zz6
-                         |8kNWDWHgMP3cZt8MTSEJtk6RqWQM3VTH69zugCTrDRoFwpTZqx7h5gOaCRHyRtfi
-                         |sXWKTgIrV31P4GyU
-                         |-----END CERTIFICATE-----""".stripMargin))
-
-  // shortcut to create a machine with the name has ID in the given status
-  def machine(name: String, status: InventoryStatus)                                         = MachineInventory(
-    MachineUuid(name),
-    status,
-    PhysicalMachineType,
-    None,
-    None,
-    Some(DateTime.parse("2023-01-11T10:20:30.000Z")), // now, node and inventory always have the same
-    Some(DateTime.parse("2023-02-22T15:25:35.000Z")), // inventory and received date
-    Some(Manufacturer("manufacturer")),
-    None,
-    Nil,
-    Nil,
-    Nil,
-    Nil,
-    Nil,
-    Nil,
-    Nil,
-    Nil,
-    Nil
-  )
-  // shortcut to create a node with the name has ID and the given machine, in the
-  // given status, has container.
-  def node(name: String, status: InventoryStatus, container: (MachineUuid, InventoryStatus)) = NodeInventory(
-    NodeSummary(
-      NodeId(name),
-      status,
-      "root",
-      "localhost",
-      Linux(
-        Debian,
-        "foo",
-        new Version("1.0"),
-        None,
-        new Version("1.0")
-      ),
-      NodeId("root"),
-      CertifiedKey
-    ),
-    inventoryDate = Some(DateTime.parse("2023-01-11T10:20:30.000Z")),
-    receiveDate = Some(DateTime.parse("2023-02-22T15:25:35.000Z")),
-    agents = Seq(testAgent.toAgentInfo), // always present now
-    machineId = Some(container)
-  )
-
-  def full(n: NodeInventory, m: MachineInventory) = FullInventory(n, Some(m))
-
-  val repo: FullInventoryRepository[Unit] = new MockNodeFactFullInventoryRepositoryProxy(factRepo)
-
-  "Saving, finding and moving node" should {
-
-    "Save node for machine, whatever the presence or status of the machine" in {
-      resetStorage
-      val mid = MachineUuid("foo")
-
-      val n1 = node("acceptedNode", AcceptedInventory, (mid, AcceptedInventory))
-      val n2 = node("pendingNode", PendingInventory, (mid, AcceptedInventory))
-      val n3 = node("removedNode", RemovedInventory, (mid, AcceptedInventory))
-
-      (
-        repo.save(FullInventory(n1, None)).isOK
-        and repo.save(FullInventory(n2, None)).isOK
-        and repo.save(FullInventory(n3, None)).isOK
-      )
-    }
-
-    "find back the machine after a move" in {
-      resetStorage
-      val m = machine("findBackMachine", PendingInventory)
-      val n = node("findBackNode", PendingInventory, (m.id, m.status))
-
-      (
-        repo.save(full(n, m)).isOK
-        and repo.move(n.main.id, PendingInventory, AcceptedInventory).isOK
-        and {
-          val FullInventory(node, machine) = repo.get(n.main.id, AcceptedInventory).testRunGet
-          (
-            machine === Some(m.copy(status = AcceptedInventory)) and
-            node === n
-              .modify(_.main.status)
-              .setTo(AcceptedInventory)
-              .modify(_.machineId)
-              .setTo(Some((m.id, AcceptedInventory)))
-          )
-        }
-      )
-    }
-
-    "don't accept to have a machine in a different status than the node" in {
-      resetStorage
-      val m = machine("differentMachine", AcceptedInventory)
-      val n = node("differentNode", PendingInventory, (m.id, AcceptedInventory))
-      (
-        repo.save(full(n, m)).isOK
-        and {
-          val FullInventory(node, machine) = repo.get(n.main.id, PendingInventory).testRunGet
-          (
-            (node === n.modify(_.machineId).setTo(Some((m.id, PendingInventory)))) and
-            (machine === Some(m.modify(_.status).setTo(PendingInventory)))
-          )
-        }
-      )
-    }
-
-    "use the given machine in full inventory whatever the ID given in node" in {
-      resetStorage
-      val m = machine("invisibleMachine", PendingInventory)
-      val n = node("invisibleNode", PendingInventory, (MachineUuid("something else"), AcceptedInventory))
-      (
-        repo.save(full(n, m)).isOK
-        and {
-          val FullInventory(node, machine) = repo.get(n.main.id, PendingInventory).testRunGet
-
-          (
-            node === n.modify(_.machineId).setTo(Some((m.id, PendingInventory)))
-            and machine === Some(m.modify(_.status).setTo(PendingInventory))
-          )
-        }
-      )
-    }
-
-    "machine, even with the same 'id', are bound to their node" in {
-      resetStorage
-      val m  = machine("hardcoreMachine", RemovedInventory)
-      val n0 = node("h-n0", PendingInventory, (m.id, PendingInventory))
-      val n1 = node("h-n1", PendingInventory, (m.id, PendingInventory))
-      val n2 = node("h-n2", AcceptedInventory, (m.id, AcceptedInventory))
-      val n3 = node("h-n3", RemovedInventory, (m.id, RemovedInventory))
-
-      (
-        repo.save(FullInventory(n0, Some(m))).isOK and repo.save(FullInventory(n1, Some(m))).isOK and
-        repo.save(FullInventory(n2, Some(m))).isOK and repo.save(FullInventory(n3, Some(m))).isOK
-        and repo.move(n0.main.id, PendingInventory, AcceptedInventory).isOK
-        and {
-          val FullInventory(node0, m0) = repo.get(n0.main.id, AcceptedInventory).testRunGet
-          val FullInventory(node1, m1) = repo.get(n1.main.id, PendingInventory).testRunGet
-          val FullInventory(node2, m2) = repo.get(n2.main.id, AcceptedInventory).testRunGet
-          val node3                    = repo.get(n3.main.id, RemovedInventory).either.runNow
-
-          // expected machine value
-          val n0now                     = n0.modify(_.main.status).setTo(AcceptedInventory)
-          // update node's machine info to what is normalized
-          def updated(n: NodeInventory) = {
-            (
-              n.modify(_.machineId).setTo(Some((m.id, n.main.status))),
-              m.modify(_.status).setTo(n.main.status)
-            )
-          }
-
-          val (n0_, m0_) = updated(n0now)
-          val (n1_, m1_) = updated(n1)
-          val (n2_, m2_) = updated(n2)
-
-          (
-            m0 === Some(m0_) and m1 === Some(m1_) and m2 === Some(m2_) and
-            node0 === n0_
-            and node1 === n1_
-            and node2 === n2_
-            and (node3 must beLeft) // no move to delete
-          )
-        }
-      )
-    }
-
-  }
-
-  "Trying to add specific Windows" should {
-
-    "Allow to save and read it back" in {
-      resetStorage
-      val nodeId = NodeId("windows-2012")
-
-      val node = NodeInventory(
-        NodeSummary(
-          nodeId,
-          AcceptedInventory,
-          "administrator",
-          "localhost",
-          Windows(
-            Windows2012,
-            "foo",
-            new Version("1.0"),
-            None,
-            new Version("1.0")
-          ),
-          NodeId("root"),
-          UndefinedKey
-        ),
-        inventoryDate = Some(DateTime.parse("2023-01-11T10:20:30.000Z")),
-        receiveDate = Some(DateTime.parse("2023-02-22T15:25:35.000Z")),
-        agents = Seq(testAgent.toAgentInfo), // always present now
-        machineId = None
-      )
-
-      repo.save(FullInventory(node, None)).isOK and {
-        val FullInventory(n, m) = repo.get(nodeId, AcceptedInventory).testRunGet
-        // here since we don't have a machine, one is generated with the uuid pattern "machine-for-${nodeId}"
-        n === node.modify(_.machineId).setTo(Some((MachineUuid("machine-for-windows-2012"), AcceptedInventory)))
-      }
-    }
-
-  }
-
-  "Software updates" should {
-
-    "are correctly serialized" in {
-      val d0  = "2022-01-01T00:00:00Z"
-      val dt0 = JsonSerializers.parseSoftwareUpdateDateTime(d0).toOption
-      val id0 = "RHSA-2020-4566"
-      val id1 = "CVE-2021-4034"
-
-      val updates = List(
-        SoftwareUpdate(
-          "app1",
-          Some("2.15.6~RC1"),
-          Some("x86_64"),
-          Some("yum"),
-          SoftwareUpdateKind.Defect,
-          None,
-          Some("Some explanation"),
-          Some(SoftwareUpdateSeverity.Critical),
-          dt0,
-          Some(List(id0, id1))
-        ),
-        SoftwareUpdate(
-          "app2",
-          Some("1-23-RELEASE-1"),
-          Some("x86_64"),
-          Some("apt"),
-          SoftwareUpdateKind.None,
-          Some("default-repo"),
-          None,
-          None,
-          None,
-          None
-        ), // we can have several time the same app
-
-        SoftwareUpdate(
-          "app2",
-          Some("1-24-RELEASE-64"),
-          Some("x86_64"),
-          Some("apt"),
-          SoftwareUpdateKind.Security,
-          Some("security-backports"),
-          None,
-          Some(SoftwareUpdateSeverity.Other("backport")),
-          None,
-          Some(List(id1))
-        )
-      )
-
-      val jsonString = List(
-        s"""{"name":"app1","version":"2.15.6~RC1","arch":"x86_64","from":"yum","kind":"defect","description":"Some explanation","severity":"critical","date":"${d0}","ids":["${id0}","${id1}"]}""",
-        s"""{"name":"app2","version":"1-23-RELEASE-1","arch":"x86_64","from":"apt","kind":"none","source":"default-repo"}""",
-        s"""{"name":"app2","version":"1-24-RELEASE-64","arch":"x86_64","from":"apt","kind":"security","source":"security-backports","severity":"backport","ids":["${id1}"]}"""
-      ).mkString("[", ",", "]")
-
-      import zio.json.*
-      import JsonSerializers.implicits.*
-
-      updates.toJson === jsonString
-    }
-  }
-
-  step {
-    success
-  }
-
-}
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestNodeFactSerialisation.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestNodeFactSerialisation.scala
index ab97b3d7ce4..c9721e961c1 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestNodeFactSerialisation.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestNodeFactSerialisation.scala
@@ -66,7 +66,39 @@ class TestNodeFactSerialisation extends Specification with JsonSpecMatcher {
           "machine-user",
           AgentVersion("3.15.3"),
           Certificate(
-            "-----BEGIN CERTIFICATE-----\\nMIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL\\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw\\nYTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy\\nBgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5\\nNjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4\\n+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R\\nzqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr\\n26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY\\nug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0\\ngay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0\\nVS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi\\n0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96\\nXX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I\\nw5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs\\nBR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij\\n3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD\\nVR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa\\ny8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw\\nNi00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL\\nBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0\\n8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq\\nw4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW\\nDYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql\\ncWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY\\nuSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA\\n1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx\\ntY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf\\nqbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV\\nHzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C\\nsGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd\\nRlYSlie1YMo1Yy2jzZhP\\n-----END CERTIFICATE-----"
+            """-----BEGIN CERTIFICATE-----
+              |MIIFqzCCA5OgAwIBAgIUJO5/m8PZResSZZjA8L9zSRvkaXkwDQYJKoZIhvcNAQEL
+              |BQAwNjE0MDIGCgmSJomT8ixkAQEMJDkzMGRjY2IwLTViMDYtNDM4NS1hYjdhLTgw
+              |YTdlNTZlYjk2OTAeFw0yNDA1MDIxMzQ2NTRaFw0zNDA0MzAxMzQ2NTRaMDYxNDAy
+              |BgoJkiaJk/IsZAEBDCQ5MzBkY2NiMC01YjA2LTQzODUtYWI3YS04MGE3ZTU2ZWI5
+              |NjkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC6vbgDy39n/TGO0B/4
+              |+Q+cd0c2IrIsfVYqyOnDn52sf4zGfSBfcmEtdvJSIb9Qp2ATGtKUh162/SOHOj5R
+              |zqKW5tE4Danj8dxs2V0AUl5/rvlvl4RqN22gyQZirJ7Z5WtAPCAKmH5oiG/Igblr
+              |26X2FmiPeei08caZNh48OykAa50sNdsFE2VkZr0mI/hltXxgjEKxPiQBvm0gTvQY
+              |ug/qgfxXwqQzgIHCmryB4IPIMSY/8LDNnY5BVk8vFlW44M7+m/U3ALPlYk+6kax0
+              |gay9hNuMQlEPj+22OjMetBt7tPQd/VhZTL9RNLj736qLuCy8wV+60O4QrWXnkgK0
+              |VS9IOgU+MP6mqT5Xrx18QCr0yTRgfaGXQz8XcAC/3fbdPMc4zhQwsR+2gHm8XjXi
+              |0iXkYDK/TgkjvkTAePdZbQrjADnTZF/eQaxt7r9V1TEFJAvMsHorMUgurXW9JO96
+              |XX+hT6Qp7BKFepOX/fCkped1HV1SUod7N0L/xkD5oZVhz4a1Z5ImEdRMRVgtm2+I
+              |w5ng1mujcaa/2iHEmenjK6mLcOh+IXrTEXRoV5JBGmTxEYvdKn9Lvv0LJUwc3WFs
+              |BR6/AHBAhvd0U2IHMuxki3AaTM+A6atKUo4Hk2MC967Ecz3Tg06YIoZxJPqo2Qij
+              |3ib2izzRFuzuVuECO9DNI51OewIDAQABo4GwMIGtMAwGA1UdEwQFMAMBAf8wHQYD
+              |VR0OBBYEFIjIpuhURlIay8ffm0w4enOJvoeHMHEGA1UdIwRqMGiAFIjIpuhURlIa
+              |y8ffm0w4enOJvoeHoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkOTMwZGNjYjAtNWIw
+              |Ni00Mzg1LWFiN2EtODBhN2U1NmViOTY5ghQk7n+bw9lF6xJlmMDwv3NJG+RpeTAL
+              |BgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAJRQHHK9RD6ByGOFJ+8w3yH0
+              |8QJ78uZe3K+N2dWwbLo6XSV9nvtkfyuUxsaBTTgXSmvkSlGNrCFnWW5vaea/R1Rq
+              |w4zGlyS4UzBD31rc2kKl5/yIljYiufYsbMmYqh8Sy/U75msp4inRzVlyxX1FtkgW
+              |DYr8nrcHbD94xuT7HTFX8HFAUOsGhEGDYXGvY94iJ4Jx7p5bWiVDbIME7Bf72+Ql
+              |cWUapVCXVbuqWW6qw048EGcwjmMXJXNJgBth39yX2cEWklkSENuYwSLAloetUmYY
+              |uSl6Y20pTKjSdUTBGIu0uN+0740LuiMlQ1nbdrBBasgLxH/1TfAp927zuQCPKANA
+              |1O7OuhrF3gwLOVDjkycAhQb9nynZgpexmFkOMklXVYNWKp6s88thB3gTRCT01GFx
+              |tY5WzobFShmv6AEmUWYutFG5k7fwNKGI6VEUVoQlNiHeDW4VV4AFrfK+/vNnJepf
+              |qbSyRhS8QBgqt4KbwMdarVEZTvVrc6JhfnTSzXig6dO8bVA1EVLp0xyCd5eoplEV
+              |HzhAz2MOrfOUmBjo2HcHA4tpcuE+ImNWuQiDfTdjqkZWRO5pBwbvnVLOGCqtaH1C
+              |sGM8wv+QA1Y2NhgzADIb6u4PjXcBy6hqyAFKtvJ2J1pBL1Vtu4rTf9zhZ62HSqBd
+              |RlYSlie1YMo1Yy2jzZhP
+              |-----END CERTIFICATE-----""".stripMargin
           ),
           Chunk.empty
         ),
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala
index 5ec8a231814..ebb75ee8504 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/facts/nodes/TestSaveInventory.scala
@@ -61,6 +61,7 @@ import com.normation.rudder.inventory.InventoryProcessor
 import com.normation.rudder.inventory.InventoryProcessStatus
 import com.normation.rudder.inventory.InventoryProcessStatus.Saved
 import com.normation.rudder.inventory.InventoryProcessStatus.SaveError
+import com.normation.rudder.inventory.NodeFactInventorySaver
 import com.normation.rudder.inventory.SaveInventoryInfo
 import com.normation.rudder.tenants.DefaultTenantService
 import com.normation.utils.DateFormaterService
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriter.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriter.scala
index b40de3660b3..b5ab565d3f7 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriter.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/ncf/TestEditorTechniqueWriter.scala
@@ -349,7 +349,7 @@ class TestEditorTechniqueWriter extends Specification with ContentMatchers with
     Nil,
     ParameterId("package_name"),
     "package_install_version",
-    AgentType.CfeCommunity :: AgentType.CfeEnterprise :: AgentType.Dsc :: Nil,
+    AgentType.CfeCommunity :: AgentType.Dsc :: Nil,
     "",
     None,
     None,
@@ -362,7 +362,7 @@ class TestEditorTechniqueWriter extends Specification with ContentMatchers with
       MethodParameter(ParameterId("service_name"), "", defaultConstraint, StringParameter) :: Nil,
       ParameterId("service_name"),
       "service_start",
-      AgentType.CfeCommunity :: AgentType.CfeEnterprise :: AgentType.Dsc :: Nil,
+      AgentType.CfeCommunity :: AgentType.Dsc :: Nil,
       "Service start",
       None,
       None,
@@ -375,7 +375,7 @@ class TestEditorTechniqueWriter extends Specification with ContentMatchers with
       MethodParameter(ParameterId("package_name"), "", defaultConstraint, StringParameter) :: Nil,
       ParameterId("package_name"),
       "package_install",
-      AgentType.CfeCommunity :: AgentType.CfeEnterprise :: Nil,
+      AgentType.CfeCommunity :: Nil,
       "Package install",
       None,
       None,
@@ -388,7 +388,7 @@ class TestEditorTechniqueWriter extends Specification with ContentMatchers with
       MethodParameter(ParameterId("command"), "", defaultConstraint, StringParameter) :: Nil,
       ParameterId("command"),
       "command_execution",
-      AgentType.CfeCommunity :: AgentType.CfeEnterprise :: AgentType.Dsc :: Nil,
+      AgentType.CfeCommunity :: AgentType.Dsc :: Nil,
       "",
       None,
       None,
@@ -415,7 +415,7 @@ class TestEditorTechniqueWriter extends Specification with ContentMatchers with
       MethodParameter(ParameterId("old_class_prefix"), "", defaultConstraint, StringParameter) :: Nil,
       ParameterId("message"),
       "_logger",
-      AgentType.CfeCommunity :: AgentType.CfeEnterprise :: Nil,
+      AgentType.CfeCommunity :: Nil,
       "",
       None,
       None,
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/GlobalParamMigration61Test.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/GlobalParamMigration61Test.scala
index a6e788cdf90..0d8a8349c62 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/GlobalParamMigration61Test.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/GlobalParamMigration61Test.scala
@@ -101,7 +101,7 @@ class GlobalParamMigration61Test extends Specification {
       val criterionObjects: Map[String, ObjectCriterion] = Map()
     }
 
-    new LDAPEntityMapper(rudderDit, nodeDit, acceptedNodesDitImpl, cmdbQueryParser, inventoryMapper)
+    new LDAPEntityMapper(rudderDit, nodeDit, cmdbQueryParser, inventoryMapper)
   }
 
   val baseParam: GlobalParameter = GlobalParameter.parse("test", GitVersion.DEFAULT_REV, "", None, "", None).forceGet
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/LDAPEntityMapperTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/LDAPEntityMapperTest.scala
new file mode 100644
index 00000000000..bdee5270b65
--- /dev/null
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/repository/ldap/LDAPEntityMapperTest.scala
@@ -0,0 +1,119 @@
+/*
+ *************************************************************************************
+ * Copyright 2024 Normation SAS
+ *************************************************************************************
+ *
+ * This file is part of Rudder.
+ *
+ * Rudder is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In accordance with the terms of section 7 (7. Additional Terms.) of
+ * the GNU General Public License version 3, the copyright holders add
+ * the following Additional permissions:
+ * Notwithstanding to the terms of section 5 (5. Conveying Modified Source
+ * Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
+ * Public License version 3, when you create a Related Module, this
+ * Related Module is not considered as a part of the work and may be
+ * distributed under the license agreement of your choice.
+ * A "Related Module" means a set of sources files including their
+ * documentation that, without modification of the Source Code, enables
+ * supplementary functions or services in addition to those offered by
+ * the Software.
+ *
+ * Rudder is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
+
+ *
+ *************************************************************************************
+ */
+
+package com.normation.rudder.repository.ldap
+
+import com.normation.cfclerk.domain.TechniqueVersion
+import com.normation.ldap.sdk.GeneralizedTime
+import com.normation.rudder.domain.policies.AcceptationDateTime
+import com.normation.rudder.facts.nodes.MockLdapFactStorage
+import com.normation.rudder.reports.AgentRunInterval
+import com.normation.rudder.reports.HeartbeatConfiguration
+import org.junit.runner.*
+import org.specs2.mutable.*
+import org.specs2.runner.*
+import zio.json.*
+
+/**
+ * A test to check that the Normation OID is not defined in
+ * rudder.schema.
+ *
+ * We let-it in that file to be able the generate derived
+ * schema (for example for UnboundID DS) from it
+ */
+@RunWith(classOf[JUnitRunner])
+class LDAPEntityMapperTest extends Specification {
+
+  val mock = new MockLdapFactStorage()
+
+  "Agent schedule regarding json serialisation" should {
+
+    "be able to read LDAP format without splay hour/min" in {
+
+      val json1 = """{"overrides":true,"interval":20,"startMinute":11,"startHour":0,"splaytime":8}"""
+      val i1    = AgentRunInterval(Some(true), 20, 11, 0, 8)
+      val json2 = """{"overrides":null,"interval":13,"startMinute":42,"startHour":4,"splaytime":8}"""
+      val i2    = AgentRunInterval(None, 13, 42, 4, 8)
+
+      (json1.fromJson[AgentRunInterval] must beRight(i1)) and
+      (json2.fromJson[AgentRunInterval] must beRight(i2))
+    }
+  }
+
+  "HeartbeatConfiguration" >> {
+
+    val json = """{"overrides":true,"heartbeatPeriod":20}"""
+    val h    = HeartbeatConfiguration(true, 20)
+
+    (json.fromJson[HeartbeatConfiguration] must beRight(h)) and
+    h.toJson === json
+  }
+
+  "active technique acceptationTimestamp map" >> {
+    implicit class GetGT(s: String) {
+      def getGT = {
+        GeneralizedTime.parse(s) match {
+          case Some(gt) => gt.dateTime
+          case None     => throw new IllegalArgumentException(s"Can not parse GeneralizedTime from: ${s}")
+        }
+      }
+    }
+
+    implicit class GetTV(s: String) {
+      def getTV = {
+        TechniqueVersion.parse(s) match {
+          case Left(err) => throw new IllegalArgumentException(s"Can not parse technique version from '${s}': ${err}")
+          case Right(tv) => tv
+        }
+      }
+    }
+
+    val json =
+      """{"2.1":"20151023163856.291Z","4.0":"20180118172119.866Z","2.0":"20150121155441.663Z","4.1":"20220125202025.198Z"}"""
+    val map  = AcceptationDateTime(
+      Map(
+        "2.1".getTV -> "20151023163856.291Z".getGT,
+        "4.0".getTV -> "20180118172119.866Z".getGT,
+        "2.0".getTV -> "20150121155441.663Z".getGT,
+        "4.1".getTV -> "20220125202025.198Z".getGT
+      )
+    )
+    (json.fromJson[AcceptationDateTime] must beRight(map)) and
+    (map.toJson === json)
+  }
+
+}
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/marshalling/TestXmlUnserialisation.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/marshalling/TestXmlUnserialisation.scala
index 21b611faa6d..5ea5b3df5c3 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/marshalling/TestXmlUnserialisation.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/marshalling/TestXmlUnserialisation.scala
@@ -162,7 +162,7 @@ class TestXmlUnserialisation extends Specification with BoxSpecMatcher {
           "xml" -> "hack:<img src=\"https://hackme.net/h.jpg\"/>"
         )
       ),
-      Some(Query(NodeReturnType, And, Identity, List())),
+      Some(Query(QueryReturnType.NodeReturnType, CriterionComposition.And, Identity, List())),
       isDynamic = true,
       serverList = Set(),
       _isEnabled = true
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/TestMergeGroupProperties.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/TestMergeGroupProperties.scala
index 26a52ce8072..107110eb50d 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/TestMergeGroupProperties.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/nodes/TestMergeGroupProperties.scala
@@ -57,6 +57,8 @@ import com.normation.rudder.domain.properties.ParentProperty
 import com.normation.rudder.domain.properties.PropertyProvider
 import com.normation.rudder.domain.properties.SuccessNodePropertyHierarchy
 import com.normation.rudder.domain.queries.*
+import com.normation.rudder.domain.queries.CriterionComposition.*
+import com.normation.rudder.domain.queries.QueryReturnType.*
 import com.normation.rudder.domain.queries.ResultTransformation.*
 import com.normation.rudder.facts.nodes.NodeFact
 import com.normation.rudder.properties.GroupProp
@@ -76,12 +78,6 @@ import scala.reflect.ClassTag
 import zio.Chunk
 import zio.NonEmptyChunk
 
-/*
- * This class test the JsEngine. 6.0
- * It must works identically on Java 7 and Java 8.
- *
- */
-
 @RunWith(classOf[JUnitRunner])
 class TestMergeGroupProperties extends Specification {
 
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala
index 8cfdc103290..db6f47535f4 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/NodeConfigData.scala
@@ -39,15 +39,7 @@ package com.normation.rudder.services.policies
 
 import ch.qos.logback.classic.Logger
 import com.normation.GitVersion
-import com.normation.cfclerk.domain.PredefinedValuesVariableSpec
-import com.normation.cfclerk.domain.SectionSpec
-import com.normation.cfclerk.domain.Technique
-import com.normation.cfclerk.domain.TechniqueId
-import com.normation.cfclerk.domain.TechniqueName
-import com.normation.cfclerk.domain.TechniqueVersion
-import com.normation.cfclerk.domain.TechniqueVersionHelper
-import com.normation.cfclerk.domain.TrackerVariableSpec
-import com.normation.cfclerk.domain.Variable
+import com.normation.cfclerk.domain.*
 import com.normation.cfclerk.services.impl.GitTechniqueReader
 import com.normation.cfclerk.services.impl.SystemVariableSpecServiceImpl
 import com.normation.cfclerk.services.impl.TechniqueRepositoryImpl
@@ -57,58 +49,13 @@ import com.normation.cfclerk.xmlparsers.VariableSpecParser
 import com.normation.errors.IOResult
 import com.normation.eventlog.EventActor
 import com.normation.eventlog.ModificationId
-import com.normation.inventory.domain.AcceptedInventory
-import com.normation.inventory.domain.AgentType.CfeCommunity
-import com.normation.inventory.domain.AgentType.Dsc
-import com.normation.inventory.domain.AgentVersion
-import com.normation.inventory.domain.Certificate
-import com.normation.inventory.domain.Debian
-import com.normation.inventory.domain.EnvironmentVariable
-import com.normation.inventory.domain.Linux
-import com.normation.inventory.domain.MachineInventory
-import com.normation.inventory.domain.MachineUuid
-import com.normation.inventory.domain.MemorySize
-import com.normation.inventory.domain.NodeId
-import com.normation.inventory.domain.NodeInventory
-import com.normation.inventory.domain.NodeSummary
-import com.normation.inventory.domain.NodeTimezone
-import com.normation.inventory.domain.PendingInventory
-import com.normation.inventory.domain.PublicKey
-import com.normation.inventory.domain.UndefinedKey
-import com.normation.inventory.domain.Version
-import com.normation.inventory.domain.VirtualMachineType
+import com.normation.inventory.domain.*
+import com.normation.inventory.domain.AgentType.*
 import com.normation.inventory.domain.VmType.*
-import com.normation.inventory.domain.Windows
-import com.normation.inventory.domain.Windows2012
 import com.normation.rudder.domain.Constants
-import com.normation.rudder.domain.nodes.MachineInfo
-import com.normation.rudder.domain.nodes.Node
-import com.normation.rudder.domain.nodes.NodeGroup
-import com.normation.rudder.domain.nodes.NodeGroupCategoryId
-import com.normation.rudder.domain.nodes.NodeGroupId
-import com.normation.rudder.domain.nodes.NodeGroupUid
-import com.normation.rudder.domain.nodes.NodeInfo
-import com.normation.rudder.domain.nodes.NodeKind
-import com.normation.rudder.domain.nodes.NodeState
-import com.normation.rudder.domain.policies.ActiveTechniqueCategoryId
-import com.normation.rudder.domain.policies.ActiveTechniqueId
-import com.normation.rudder.domain.policies.AllTarget
-import com.normation.rudder.domain.policies.AllTargetExceptPolicyServers
-import com.normation.rudder.domain.policies.Directive
-import com.normation.rudder.domain.policies.DirectiveId
-import com.normation.rudder.domain.policies.DirectiveUid
-import com.normation.rudder.domain.policies.FullGroupTarget
-import com.normation.rudder.domain.policies.FullOtherTarget
-import com.normation.rudder.domain.policies.FullRuleTargetInfo
-import com.normation.rudder.domain.policies.GlobalPolicyMode
-import com.normation.rudder.domain.policies.GroupTarget
-import com.normation.rudder.domain.policies.PolicyMode
-import com.normation.rudder.domain.policies.PolicyMode.Enforce
-import com.normation.rudder.domain.policies.PolicyModeOverrides
-import com.normation.rudder.domain.policies.PolicyServerTarget
-import com.normation.rudder.domain.policies.Rule
-import com.normation.rudder.domain.policies.RuleId
-import com.normation.rudder.domain.policies.RuleUid
+import com.normation.rudder.domain.nodes.*
+import com.normation.rudder.domain.policies.*
+import com.normation.rudder.domain.policies.PolicyMode.*
 import com.normation.rudder.domain.reports.NodeModeConfig
 import com.normation.rudder.facts.nodes.CoreNodeFact
 import com.normation.rudder.facts.nodes.IpAddress
@@ -135,14 +82,7 @@ import com.normation.utils.StringUuidGeneratorImpl
 import com.normation.zio.*
 import com.softwaremill.quicklens.*
 import java.io.File
-import java.nio.file.Files
-import java.nio.file.FileSystemNotFoundException
-import java.nio.file.FileSystems
-import java.nio.file.FileVisitResult
-import java.nio.file.Path
-import java.nio.file.Paths
-import java.nio.file.SimpleFileVisitor
-import java.nio.file.StandardCopyOption
+import java.nio.file.*
 import java.nio.file.attribute.BasicFileAttributes
 import net.liftweb.common.Full
 import org.apache.commons.io.FileUtils
@@ -223,54 +163,74 @@ object NodeConfigData {
   val machine2Pending:  MachineInventory =
     MachineInventory(MachineUuid("machine2"), PendingInventory, VirtualMachineType(VMWare), Some("machine2"))
 
-  // a valid, not used pub key
-  // cfengine key hash is: 081cf3aac62624ebbc83be7e23cb104d
-  val PUBKEY =
-    """-----BEGIN RSA PUBLIC KEY-----
-MIIBCAKCAQEAlntroa72gD50MehPoyp6mRS5fzZpsZEHu42vq9KKxbqSsjfUmxnT
-Rsi8CDvBt7DApIc7W1g0eJ6AsOfV7CEh3ooiyL/fC9SGATyDg5TjYPJZn3MPUktg
-YBzTd1MMyZL6zcLmIpQBH6XHkH7Do/RxFRtaSyicLxiO3H3wapH20TnkUvEpV5Qh
-zUkNM8vHZuu3m1FgLrK5NCN7BtoGWgeyVJvBMbWww5hS15IkCRuBkAOK/+h8xe2f
-hMQjrt9gW2qJpxZyFoPuMsWFIaX4wrN7Y8ZiN37U2q1G11tv2oQlJTQeiYaUnTX4
-z5VEb9yx2KikbWyChM1Akp82AV5BzqE80QIBIw==
------END RSA PUBLIC KEY-----"""
+  // certificate with subject "root"
+  val ROOT_CERT = """-----BEGIN CERTIFICATE-----
+                    |MIIFSzCCAzOgAwIBAgIUQyKUmUkU8F/ua6sp8CV9d1UMT60wDQYJKoZIhvcNAQEL
+                    |BQAwFjEUMBIGCgmSJomT8ixkAQEMBHJvb3QwHhcNMjQxMTAyMTYyMDI1WhcNMzQx
+                    |MDMxMTYyMDI1WjAWMRQwEgYKCZImiZPyLGQBAQwEcm9vdDCCAiIwDQYJKoZIhvcN
+                    |AQEBBQADggIPADCCAgoCggIBANe05osdzZ4McYtyAe320mexC+chYPEcQ0j6Jt4g
+                    |YnHK0PUch/2Rrjn0NBhcP+VeQK1mLCorSknNuGQdnzMBpLvXrB5o79EULJWtqvEZ
+                    |TVCTxYfab+JTtK7NakkqPd8qeZHu3pJtDCpyonbKL8uRems/e0Xt0u9I/euT9Gwr
+                    |7A/cH7VJc2XheotK/cIW9xKSlTwqakeGxywdjJ7Sf7Yt55hBRLRQowL2uqrl45hq
+                    |389TvMJt91o+iPLRaln8xHa45COI0c2NeJ+JB+0dRpLDXCYJj+4GjV8T5tGn6hw0
+                    |35p7P1g0QWzcGS5Grw7f0punLBAld0+5XqHjjIAvTinB9q5KlVCXCq5k0V224BRL
+                    |VyfEhIIhHwZhtL4pNyZbITNdQb6ICWdDXtrl0AcyuaKboOE7wVcIYj5dDA/HHjTE
+                    |JjI1i5GnYT3s6L0KiPmuf2aAedcM6ZVAGFw8VKtQ+D5eZgljMK5u+Exw+S01D5Hs
+                    |rMPtrzJQzyDRLyxOHdnTpQ2G957eJtH988HQ2a/e1Bw9+PiSIi0MPP6XUbtsaHh8
+                    |VOTPDqJDKzjOXrB8A6tSHVcX3PZGCcYztuta4HxCsqt+Dw2zWw0gV3VcEh3Cm7vM
+                    |YUqHSKGVqP7Hrx7bma6xud9lh3nSBlPvKp6SgPGSZmg3Repz+2REk+cX9MM+Q+SS
+                    |8fFvAgMBAAGjgZAwgY0wDAYDVR0TBAUwAwEB/zAdBgNVHQ4EFgQUBALyYy06Lx6I
+                    |WmPx6LtWgdti9BswUQYDVR0jBEowSIAUBALyYy06Lx6IWmPx6LtWgdti9BuhGqQY
+                    |MBYxFDASBgoJkiaJk/IsZAEBDARyb290ghRDIpSZSRTwX+5rqynwJX13VQxPrTAL
+                    |BgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAGPSzHyD3R0CpbGLZT8v4kgq
+                    |VmOnh9QAwX4HyjyGRJknYGZF29Ko6I1HEt8QZ6D8GVPFlmRFBB77VKD95ytXX/ec
+                    |jKPV3RWPTGrOCbfP95Z0EBKS/wA0gUOVcKRVQls7G6MQs/XagPtD5YgI7fzUBjeC
+                    |mJprmw+RbS46IVAZL6JF3mSIdTo9TskFyhCGwbZ40jZLASDKRl352GCFi1u2SDTV
+                    |gWr+Td52hkYYzS33OxrKwXskoXlZzlRcI9/Ra+8Ue+2TVMeY8eGqYrS0dgCcOsRB
+                    |GtWAhBhkSYHXO+rOG1RCpkJGM5Yzn1MKaI49EJmd3L/9Pm7QBl3ebgPJTwksYCGS
+                    |xMTSzbctettF1Ua3+y5ba2p7pvUH62nX+s4w2L22wis1twMdJaL9oSi9wh2+XKut
+                    |aHx1uSPohedHA5xe8dP6OLF/2IjIrqQL+g6+R1sa+EFeyAUddk117FubvpKFy4UH
+                    |Xa62iiprZMRrS+IY8IW/bzpVPz+m3boHaLthV4DdJfz17V6WFZdyNoUJIwYrtePe
+                    |eMZ/1amw7aItLh0djfMhqmJsuP83ZZi+I10i3l01BboRRS9bQpeSS+EUrh1fkl40
+                    |ymRUWzJv4vvtQXYuPrgpOtGRP2Ns4BQ7o4QavZk39F5pSxRTmpqAss0sOXN+ipOU
+                    |mvKlpCQ0VrI+Q3/ET3TV
+                    |-----END CERTIFICATE-----""".stripMargin
 
   // a valid, not used certificate
   // cfengine has is: eec3a3c2cf41b2736b7a0a9dece02142
   // sha256 in hexa: 41d8180612444dc6c280ac9189b8c95594029ba9a0697cd72b1af388b4b94844
-  val CERT =
-    """-----BEGIN CERTIFICATE-----
-MIIFgTCCA2mgAwIBAgIUXpY2lv7l+hkx4mVP324d9O1qJh0wDQYJKoZIhvcNAQEL
-BQAwUDEYMBYGA1UEAwwPV0lOLUdOR0RIUFZIVlROMTQwMgYKCZImiZPyLGQBAQwk
-YjczZWE0NTEtYzQyYS00MjBkLWE1NDAtNDdiNDQ1ZTU4MzEzMB4XDTE5MDcxMjE2
-MTYxMloXDTI3MDkyODE2MTYxMlowUDEYMBYGA1UEAwwPV0lOLUdOR0RIUFZIVlRO
-MTQwMgYKCZImiZPyLGQBAQwkYjczZWE0NTEtYzQyYS00MjBkLWE1NDAtNDdiNDQ1
-ZTU4MzEzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApW5up//FLSHr
-J14iIX7aSTGiVvJ5XTXHXxmx3O1MyFIrNoWoonmR7Wkii+FIcxk8LVajjMaBVP32
-ZbfEr1BqljV/XULTO4ivQoqJCfoq/2O5O2Apyh1XJmp8q82CZRz/ZzxKmFAeYgYE
-KPbzr/SeLkNvo9zaYZLMGT1Zle8pu7gBWF8DPFg1r77Y1zfSSRTRMSXQk0BVN5uR
-2Ru8A53ZI7yDOB73pNXbtV++XdBzbwzBDG24NY80o+bbGSCRgizeDqNBeVjzOzyf
-wRp6KFuLrwfksnUcWcwMBz3af6d5uh5hrDII63t30u3eVdmGYUb9oi5JjCOtcJta
-r3EhwoeEoeioAxpJebe0Q0OEbEICh4Z/oxGYaG/rn9UZ3Hhw9sdngihiTx/sQ8yg
-CGURXr/tQSw1knrmU7Fe1TytfcEhaGhnfjRXhUHXP75ycp4mdp3uRsHSKT7VN95H
-lCVxZGUMkE9w8CZQTH2RmL6E5r0VqilktViWmuf31h2DPzg9rvBj+rQpBvgQzUiv
-1TzuFzsuLKBp3KMpxHrnIxEMS2ERj1Kr7mAxW3xZVt3dYrw8SdbfozJ4x/d8ciKu
-ovN0BBrPIn0wS6v7hT2mMtneEG/xbXZFjL8XqVwIooRCDOhw4UfWb71CdpBNZ8ln
-tje4Ri0/C7l5ZJGYJNOpZFBlpDXmMTkCAwEAAaNTMFEwHQYDVR0OBBYEFHJaeKBJ
-FcPOMwPGxt8uNESLRJ2YMB8GA1UdIwQYMBaAFHJaeKBJFcPOMwPGxt8uNESLRJ2Y
-MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAAjUW4YmUjYz6K50
-uuN/WT+vRtPAKjTcKPi397O0sa1EZDq7gJt2gbYBMyqDFyoivKeec2umXzm7n0o5
-yDJ1jwgl0ORxqtCmjzPuwbY9EL8dBycACsr8KorXct2vseC+uxNWnsLbUVs3iTbI
-AG5dtXpytZJXioVvR/Hi6DnJ8hP6wQLKJYw3E91jjIdfUBWT1GRzjTHo6VBxlvQd
-KFS8JeHMaUJjWiXeI8ZYPjLCDL2Fxs6hlgySBaZSbGySraFwt9l4RDVnUxexMloc
-ZECALfJg4fISgZodHXRxVBKEUv71ebSqYfJt8f8LeyfLVK/MY9rmpdV8DGQieaaV
-YdhslUYx6vTnk/0Q/LbeHXI2cm2qBP1oyPusydTWWc6TowCLhHqTJ+eAB2X/RjT/
-MTe/B3GGKgn1lgB37qF2hVDWtrDvNzE4OGQCNBR/iJDHz5+8MV+4FDT0/7ruTP0B
-iMDtuT7Jrk9O/UhAZyG4uyUm+kpcPIevGy2ZVQUgk/zIqLH+R4QrRebXRLrNsKuP
-o07htJltXDGDSekSDgK3OnZwLOyTUrz1zMmGqGbqRCwOQAWcZBWLrIjUjM0k9vPy
-qYUqf4FphVwX4JqDhm8JSS/et/0431MjMfQC/qauAhPBITgRjlDVEVvGB40aiNLk
-ootapja6lKOaIpqp0kmmYN7gFIhp
------END CERTIFICATE-----"""
+  val CERT = """-----BEGIN CERTIFICATE-----
+               |MIIFgTCCA2mgAwIBAgIUXpY2lv7l+hkx4mVP324d9O1qJh0wDQYJKoZIhvcNAQEL
+               |BQAwUDEYMBYGA1UEAwwPV0lOLUdOR0RIUFZIVlROMTQwMgYKCZImiZPyLGQBAQwk
+               |YjczZWE0NTEtYzQyYS00MjBkLWE1NDAtNDdiNDQ1ZTU4MzEzMB4XDTE5MDcxMjE2
+               |MTYxMloXDTI3MDkyODE2MTYxMlowUDEYMBYGA1UEAwwPV0lOLUdOR0RIUFZIVlRO
+               |MTQwMgYKCZImiZPyLGQBAQwkYjczZWE0NTEtYzQyYS00MjBkLWE1NDAtNDdiNDQ1
+               |ZTU4MzEzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApW5up//FLSHr
+               |J14iIX7aSTGiVvJ5XTXHXxmx3O1MyFIrNoWoonmR7Wkii+FIcxk8LVajjMaBVP32
+               |ZbfEr1BqljV/XULTO4ivQoqJCfoq/2O5O2Apyh1XJmp8q82CZRz/ZzxKmFAeYgYE
+               |KPbzr/SeLkNvo9zaYZLMGT1Zle8pu7gBWF8DPFg1r77Y1zfSSRTRMSXQk0BVN5uR
+               |2Ru8A53ZI7yDOB73pNXbtV++XdBzbwzBDG24NY80o+bbGSCRgizeDqNBeVjzOzyf
+               |wRp6KFuLrwfksnUcWcwMBz3af6d5uh5hrDII63t30u3eVdmGYUb9oi5JjCOtcJta
+               |r3EhwoeEoeioAxpJebe0Q0OEbEICh4Z/oxGYaG/rn9UZ3Hhw9sdngihiTx/sQ8yg
+               |CGURXr/tQSw1knrmU7Fe1TytfcEhaGhnfjRXhUHXP75ycp4mdp3uRsHSKT7VN95H
+               |lCVxZGUMkE9w8CZQTH2RmL6E5r0VqilktViWmuf31h2DPzg9rvBj+rQpBvgQzUiv
+               |1TzuFzsuLKBp3KMpxHrnIxEMS2ERj1Kr7mAxW3xZVt3dYrw8SdbfozJ4x/d8ciKu
+               |ovN0BBrPIn0wS6v7hT2mMtneEG/xbXZFjL8XqVwIooRCDOhw4UfWb71CdpBNZ8ln
+               |tje4Ri0/C7l5ZJGYJNOpZFBlpDXmMTkCAwEAAaNTMFEwHQYDVR0OBBYEFHJaeKBJ
+               |FcPOMwPGxt8uNESLRJ2YMB8GA1UdIwQYMBaAFHJaeKBJFcPOMwPGxt8uNESLRJ2Y
+               |MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAAjUW4YmUjYz6K50
+               |uuN/WT+vRtPAKjTcKPi397O0sa1EZDq7gJt2gbYBMyqDFyoivKeec2umXzm7n0o5
+               |yDJ1jwgl0ORxqtCmjzPuwbY9EL8dBycACsr8KorXct2vseC+uxNWnsLbUVs3iTbI
+               |AG5dtXpytZJXioVvR/Hi6DnJ8hP6wQLKJYw3E91jjIdfUBWT1GRzjTHo6VBxlvQd
+               |KFS8JeHMaUJjWiXeI8ZYPjLCDL2Fxs6hlgySBaZSbGySraFwt9l4RDVnUxexMloc
+               |ZECALfJg4fISgZodHXRxVBKEUv71ebSqYfJt8f8LeyfLVK/MY9rmpdV8DGQieaaV
+               |YdhslUYx6vTnk/0Q/LbeHXI2cm2qBP1oyPusydTWWc6TowCLhHqTJ+eAB2X/RjT/
+               |MTe/B3GGKgn1lgB37qF2hVDWtrDvNzE4OGQCNBR/iJDHz5+8MV+4FDT0/7ruTP0B
+               |iMDtuT7Jrk9O/UhAZyG4uyUm+kpcPIevGy2ZVQUgk/zIqLH+R4QrRebXRLrNsKuP
+               |o07htJltXDGDSekSDgK3OnZwLOyTUrz1zMmGqGbqRCwOQAWcZBWLrIjUjM0k9vPy
+               |qYUqf4FphVwX4JqDhm8JSS/et/0431MjMfQC/qauAhPBITgRjlDVEVvGB40aiNLk
+               |ootapja6lKOaIpqp0kmmYN7gFIhp
+               |-----END CERTIFICATE-----""".stripMargin
 
   val emptyNodeReportingConfiguration: ReportingConfiguration = ReportingConfiguration(None, None, None)
 
@@ -329,7 +289,7 @@ ootapja6lKOaIpqp0kmmYN7gFIhp
       rootId,
       None
     ),
-    RudderAgent(CfeCommunity, admin1, AgentVersion("6.0.0"), PublicKey(PUBKEY), Chunk.empty),
+    RudderAgent(CfeCommunity, admin1, AgentVersion("6.0.0"), Certificate(CERT), Chunk.empty),
     Chunk.empty,
     DateTime.now,
     DateTime.now,
@@ -506,7 +466,7 @@ ootapja6lKOaIpqp0kmmYN7gFIhp
         rootId,
         None
       ),
-      RudderAgent(CfeCommunity, admin1, AgentVersion("6.0.0"), PublicKey("rsa public key"), Chunk.empty),
+      RudderAgent(CfeCommunity, admin1, AgentVersion("6.0.0"), Certificate("node certificate"), Chunk.empty),
       Chunk.empty,
       DateTime.now,
       DateTime.now,
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestJsEngine.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestJsEngine.scala
index a5cc5176b31..3c57f267482 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestJsEngine.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestJsEngine.scala
@@ -253,33 +253,13 @@ class TestJsEngine extends Specification {
     val sha256Variable = variableSpec.toVariable(Seq(s"${JsEngine.EVALJS}rudder.password.sha256('secret')"))
     val sha512Variable = variableSpec.toVariable(Seq(s"${JsEngine.DEFAULT_EVAL}rudder.password.sha512('secret', '01234567')"))
 
-    val md5VariableAIX = variableSpec.toVariable(Seq(s"${JsEngine.EVALJS}rudder.password.aixMd5('secret')"))
-
     "get the correct hashed value for Linux sha256" in {
       contextEnabled(engine => engine.eval(sha256Variable, JsRudderLibBinding.Crypt)) must beVariableValue(_.startsWith("$5$"))
     }
 
-    "get the correct hashed value for Aix sha256" in {
-      contextEnabled(engine => engine.eval(sha256Variable, JsRudderLibBinding.Aix)) must beVariableValue(x =>
-        (x.startsWith("{ssha256}") | x.startsWith("{ssha1}"))
-      ) // PBKDF2WithHmacSHA256 may not be available
-    }
-
     "get the correct hashed value for Linux sha512" in {
       contextEnabled(engine => engine.eval(sha512Variable, JsRudderLibBinding.Crypt)) must beVariableValue(_.startsWith("$6$"))
     }
-
-    "get the correct hashed value for Aix sha512" in {
-      contextEnabled(engine => engine.eval(sha512Variable, JsRudderLibBinding.Aix)) must beVariableValue(x =>
-        (x.startsWith("{ssha512}") | x.startsWith("{ssha1}"))
-      ) // PBKDF2WithHmacSHA512 may not be available
-    }
-
-    "get the correct hashed value for Aix md5" in {
-      contextEnabled(engine => engine.eval(md5VariableAIX, JsRudderLibBinding.Aix)) must beVariableValue(
-        _.startsWith("{smd5}")
-      )
-    }
   }
 
   "When using the Rudder JS Library and advertised method, one" should {
@@ -287,37 +267,18 @@ class TestJsEngine extends Specification {
     val sha256Variable = variableSpec.toVariable(Seq(s"${JsEngine.EVALJS}rudder.password.auto('sha256', 'secret')"))
     val sha512Variable =
       variableSpec.toVariable(Seq(s"${JsEngine.DEFAULT_EVAL}rudder.password.auto('SHA-512', 'secret', '01234567')"))
-    val md5VariableAIX = variableSpec.toVariable(Seq(s"${JsEngine.EVALJS}rudder.password.aix('MD5', 'secret')"))
     val invalidAlgo    = variableSpec.toVariable(Seq(s"${JsEngine.EVALJS}rudder.password.auto('foo', 'secret')"))
 
     "get the correct hashed value for Linux sha256" in {
       contextEnabled(engine => engine.eval(sha256Variable, JsRudderLibBinding.Crypt)) must beVariableValue(_.startsWith("$5$"))
     }
 
-    "get the correct hashed value for Aix sha256" in {
-      contextEnabled(engine => engine.eval(sha256Variable, JsRudderLibBinding.Aix)) must beVariableValue(x =>
-        (x.startsWith("{ssha256}") | x.startsWith("{ssha1}"))
-      ) // PBKDF2WithHmacSHA256 may not be available
-    }
-
     "get the correct hashed value for Linux sha512" in {
       contextEnabled(engine => engine.eval(sha512Variable, JsRudderLibBinding.Crypt)) must beVariableValue(_.startsWith("$6$"))
     }
 
-    "get the correct hashed value for Aix sha512" in {
-      contextEnabled(engine => engine.eval(sha512Variable, JsRudderLibBinding.Aix)) must beVariableValue(x =>
-        (x.startsWith("{ssha512}") | x.startsWith("{ssha1}"))
-      ) // PBKDF2WithHmacSHA512 may not be available
-    }
-
-    "get the correct hashed value for Aix md5" in {
-      contextEnabled(engine => engine.eval(md5VariableAIX, JsRudderLibBinding.Aix)) must beVariableValue(
-        _.startsWith("{smd5}")
-      )
-    }
-
     "fail when we ask for a wrong password" in {
-      contextEnabled(engine => engine.eval(invalidAlgo, JsRudderLibBinding.Aix)) must beFailure("(?s)Invalid script.*".r)
+      contextEnabled(engine => engine.eval(invalidAlgo, JsRudderLibBinding.Crypt)) must beFailure("(?s)Invalid script.*".r)
     }
   }
 }
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestWriteNodeCertificatesPem.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestWriteNodeCertificatesPem.scala
index 47bfa8868d2..239276d5d83 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestWriteNodeCertificatesPem.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/TestWriteNodeCertificatesPem.scala
@@ -43,7 +43,6 @@ import ch.qos.logback.classic.spi.ILoggingEvent
 import ch.qos.logback.core.OutputStreamAppender
 import com.normation.inventory.domain.Certificate
 import com.normation.inventory.domain.NodeId
-import com.normation.inventory.domain.PublicKey
 import com.normation.rudder.facts.nodes.CoreNodeFact
 import com.normation.zio.ZioRuntime
 import com.softwaremill.quicklens.*
@@ -124,7 +123,8 @@ class TestWriteNodeCertificatesPem extends Specification {
                         |TZEW7+Ri43DsMyRwYiCafuVThL+J
                         |-----END CERTIFICATE-----""".stripMargin
 
-  val root:  CoreNodeFact = NodeConfigData.factRoot.modify(_.rudderAgent.securityToken).setTo(PublicKey(NodeConfigData.PUBKEY))
+  val root:  CoreNodeFact =
+    NodeConfigData.factRoot.modify(_.rudderAgent.securityToken).setTo(Certificate(NodeConfigData.ROOT_CERT))
   val node1: CoreNodeFact = NodeConfigData.fact1.modify(_.rudderAgent.securityToken).setTo(Certificate(cert1))
   val node2: CoreNodeFact = NodeConfigData.fact2.modify(_.rudderAgent.securityToken).setTo(Certificate(cert2))
 
@@ -136,13 +136,16 @@ class TestWriteNodeCertificatesPem extends Specification {
 
   sequential // because files, etc
 
+  // the content of the file is just each certificate concatenated together
+  val expectedFileContent = NodeConfigData.ROOT_CERT + "\n" + cert1 + "\n" + cert2 + "\n"
+
   "When nodes have certificates, they" should {
-    "certificate are writen to file only for nodes with certificate" in {
+    "certificate are written to file only for nodes with certificate" in {
       val writer = new WriteNodeCertificatesPemImpl(Some(s"/usr/bin/touch ${dest.pathAsString}"))
       val res    = ZioRuntime.runNow(writer.writeCertificates(dest, nodes).either)
 
       (res must beRight) and
-      (dest.contentAsString(StandardCharsets.UTF_8) must beEqualTo(cert1 + "\n" + cert2 + "\n"))
+      (dest.contentAsString(StandardCharsets.UTF_8) must beEqualTo(expectedFileContent))
     }
   }
 
@@ -186,6 +189,6 @@ class TestWriteNodeCertificatesPem extends Specification {
       """(?s).*Unexpected: Error when executing reload command.*code: -2147483648.*""".r
     )
       .eventually(10, 100.millis.asScala)) and
-    (dest.contentAsString(StandardCharsets.UTF_8) must beEqualTo(cert1 + "\n" + cert2 + "\n").eventually(10, 100.millis.asScala))
+    (dest.contentAsString(StandardCharsets.UTF_8) must beEqualTo(expectedFileContent).eventually(10, 100.millis.asScala))
   }
 }
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PathComputerTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PathComputerTest.scala
index c0dd3b80caf..0de751bd5f5 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PathComputerTest.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/PathComputerTest.scala
@@ -57,8 +57,7 @@ class PathComputerTest extends Specification {
     Constants.NODE_PROMISES_PARENT_DIR_BASE,
     Constants.NODE_PROMISES_PARENT_DIR,
     Some("/var/rudder/backup/"),
-    Constants.CFENGINE_COMMUNITY_PROMISES_PATH,
-    Constants.CFENGINE_NOVA_PROMISES_PATH
+    Constants.CFENGINE_COMMUNITY_PROMISES_PATH
   )
 
   ////////////////////////// test //////////////////////////
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/WriteTechniquesTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/WriteTechniquesTest.scala
index c15c7e98f10..8f105592f68 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/WriteTechniquesTest.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/policies/write/WriteTechniquesTest.scala
@@ -138,9 +138,7 @@ class TestSystemData {
       SHARE.getParent + "/",
       SHARE.getName,
       Some(abstractRoot.getAbsolutePath + "/backup"),
-      rootGeneratedPromisesDir.getAbsolutePath, // community will go under our share
-
-      "/" // we don't want to use entreprise agent root path
+      rootGeneratedPromisesDir.getAbsolutePath
     )
 
     val promiseWriter = new PolicyWriterServiceImpl(
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestJsonQueryLexing.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestJsonQueryLexing.scala
index 016188af9fd..3d8668f6d19 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestJsonQueryLexing.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestJsonQueryLexing.scala
@@ -37,7 +37,7 @@
 
 package com.normation.rudder.services.queries
 
-import com.normation.rudder.domain.queries.NodeReturnType
+import com.normation.rudder.domain.queries.QueryReturnType.NodeReturnType
 import net.liftweb.common.*
 import org.junit.*
 import org.junit.Assert.*
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestNodeFactQueryProcessor.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestNodeFactQueryProcessor.scala
index 52a0169f786..9af966e2de7 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestNodeFactQueryProcessor.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestNodeFactQueryProcessor.scala
@@ -31,7 +31,7 @@
  * You should have received a copy of the GNU General Public License
  * along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
 
- *
+ *import com.normation.rudder.domain.queries.
  *************************************************************************************
  */
 
@@ -45,6 +45,7 @@ import com.normation.rudder.domain.RudderDit
 import com.normation.rudder.domain.nodes.NodeGroupId
 import com.normation.rudder.domain.nodes.NodeGroupUid
 import com.normation.rudder.domain.queries.*
+import com.normation.rudder.domain.queries.CriterionComposition.*
 import com.normation.rudder.facts.nodes.*
 import com.normation.rudder.tenants.DefaultTenantService
 import com.normation.zio.*
@@ -1086,17 +1087,7 @@ class TestNodeFactQueryProcessor {
         { "objectType":"node"   , "attribute":"agentName"  , "comparator":"eq", "value":"community" }
       ] }
       """).openOrThrowException("For tests"),
-      root :: sr(2) :: sr(4) :: sr(5) :: sr(7) :: sr(8) :: Nil
-    )
-
-    val nova = TestQuery(
-      "nova",
-      parser("""
-      {  "select":"nodeAndPolicyServer", "composition":"or", "where":[
-        { "objectType":"node" , "attribute":"agentName"  , "comparator":"eq", "value":"nova" }
-      ] }
-      """).openOrThrowException("For tests"),
-      sr(1) :: sr(3) :: Nil
+      root :: sr(1) :: sr(2) :: sr(3) :: sr(4) :: sr(5) :: sr(7) :: sr(8) :: Nil
     )
 
     val dsc = TestQuery(
@@ -1119,7 +1110,7 @@ class TestNodeFactQueryProcessor {
       sr(6) :: Nil
     )
 
-    testQueries(allCfengine :: community :: nova :: dsc :: notCfengine :: Nil, doInternalQueryTest = true)
+    testQueries(allCfengine :: community :: dsc :: notCfengine :: Nil, doInternalQueryTest = true)
   }
 
   /**
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestPendingNodePolicies.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestPendingNodePolicies.scala
index 30c56788a46..02c45af8b0a 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestPendingNodePolicies.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestPendingNodePolicies.scala
@@ -46,14 +46,14 @@ import com.normation.rudder.domain.RudderLDAPConstants.A_NODE_GROUP_UUID
 import com.normation.rudder.domain.nodes.NodeGroup
 import com.normation.rudder.domain.nodes.NodeGroupId
 import com.normation.rudder.domain.nodes.NodeGroupUid
-import com.normation.rudder.domain.queries.And
 import com.normation.rudder.domain.queries.Criterion
+import com.normation.rudder.domain.queries.CriterionComposition.And
+import com.normation.rudder.domain.queries.CriterionComposition.Or
 import com.normation.rudder.domain.queries.CriterionLine
 import com.normation.rudder.domain.queries.Equals
 import com.normation.rudder.domain.queries.ExactStringComparator
 import com.normation.rudder.domain.queries.NodeCriterionMatcherString
 import com.normation.rudder.domain.queries.ObjectCriterion
-import com.normation.rudder.domain.queries.Or
 import com.normation.rudder.domain.queries.Query
 import com.normation.rudder.domain.queries.ResultTransformation.*
 import com.normation.rudder.domain.queries.StringComparator
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestStringQueryParser.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestStringQueryParser.scala
index d62836eb077..34a815d369c 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestStringQueryParser.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/queries/TestStringQueryParser.scala
@@ -38,6 +38,8 @@
 package com.normation.rudder.services.queries
 
 import com.normation.rudder.domain.queries.*
+import com.normation.rudder.domain.queries.CriterionComposition.*
+import com.normation.rudder.domain.queries.QueryReturnType.*
 import com.normation.rudder.domain.queries.ResultTransformation.*
 import net.liftweb.common.*
 import org.junit.*
diff --git a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/CachedFindRuleNodeStatusReportsTest.scala b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/CachedFindRuleNodeStatusReportsTest.scala
index 4431fb14011..b4e5ba94152 100644
--- a/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/CachedFindRuleNodeStatusReportsTest.scala
+++ b/webapp/sources/rudder/rudder-core/src/test/scala/com/normation/rudder/services/reports/CachedFindRuleNodeStatusReportsTest.scala
@@ -49,14 +49,11 @@ import com.normation.rudder.domain.reports.RunComplianceInfo
 import com.normation.rudder.facts.nodes.CoreNodeFact
 import com.normation.rudder.facts.nodes.CoreNodeFactRepository
 import com.normation.rudder.facts.nodes.NodeFact
-import com.normation.rudder.facts.nodes.NoopFactStorage
-import com.normation.rudder.facts.nodes.NoopGetNodesBySoftwareName
 import com.normation.rudder.facts.nodes.QueryContext
 import com.normation.rudder.reports.ComplianceModeName
 import com.normation.rudder.reports.GlobalComplianceMode
 import com.normation.rudder.services.policies.NodeConfigData
 import com.normation.rudder.services.reports.CacheComplianceQueueAction.ExpiredCompliance
-import com.normation.rudder.tenants.DefaultTenantService
 import com.normation.zio.*
 import com.softwaremill.quicklens.*
 import org.joda.time.DateTime
@@ -144,9 +141,8 @@ class CachedFindRuleNodeStatusReportsTest extends Specification {
     val testSavePrechecks = Chunk.empty[NodeFact => IOResult[Unit]]
 
     (for {
-      t <- DefaultTenantService.make(Nil)
       r <- CoreNodeFactRepository
-             .make(NoopFactStorage, NoopGetNodesBySoftwareName, t, Map(), accepted, Chunk.empty, testSavePrechecks)
+             .makeNoop(accepted, savePreChecks = testSavePrechecks)
       x <- Ref.make(Map[NodeId, NodeStatusReport]())
       s  = new InMemoryNodeStatusReportStorage(x)
     } yield (r, new NodeStatusReportRepositoryImpl(s, x))).runNow
diff --git a/webapp/sources/rudder/rudder-rest/pom.xml b/webapp/sources/rudder/rudder-rest/pom.xml
index 1a387acbdfd..f876ff22ab1 100644
--- a/webapp/sources/rudder/rudder-rest/pom.xml
+++ b/webapp/sources/rudder/rudder-rest/pom.xml
@@ -37,7 +37,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation.rudder</groupId>
     <artifactId>rudder-parent</artifactId>
-    <version>8.2.4-SNAPSHOT</version>
+    <version>8.3.0~alpha1-SNAPSHOT</version>
   </parent>
 
   <description>
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiAuthorization.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiAuthorization.scala
index 26d5bec8a2c..260424d6af7 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiAuthorization.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/ApiAuthorization.scala
@@ -295,10 +295,7 @@ object OldInternalApiAuthz {
     }
   }
 
-  def withReadAdmin(resp: => LiftResponse)(implicit action: String, prettify: Boolean): LiftResponse = {
-    withPerm(CurrentUser.checkRights(Administration.Read), resp)
-  }
-
+  // Still used in RestApiAccounts
   def withWriteAdmin(resp: => LiftResponse)(implicit action: String, prettify: Boolean): LiftResponse = {
     withPerm(CurrentUser.checkRights(Administration.Write) || CurrentUser.checkRights(Administration.Edit), resp)
   }
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/EndpointsDefinition.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/EndpointsDefinition.scala
index bbfa846c2a9..95695c0723f 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/EndpointsDefinition.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/EndpointsDefinition.scala
@@ -212,8 +212,36 @@ object ComplianceApi       extends Enum[ComplianceApi] with ApiModuleProvider[Co
   def values = findValues
 }
 
+sealed trait EventLogApi extends EnumEntry with EndpointSchema with SortIndex {
+  override def dataContainer: Option[String] = None
+}
+
+object EventLogApi extends Enum[EventLogApi] with ApiModuleProvider[EventLogApi] {
+  case object GetEventLogs extends EventLogApi with InternalApi with ZeroParam with StartsAtVersion2 with SortIndex {
+    val z: Int = implicitly[Line].value
+    val description    = "Get event logs based on filters"
+    val (action, path) = POST / "eventlog"
+  }
+
+  case object GetEventLogDetails extends EventLogApi with InternalApi with OneParam with StartsAtVersion2 with SortIndex {
+    val z: Int = implicitly[Line].value
+    val description    = "Get details of a specific event log"
+    val (action, path) = GET / "eventlog" / "{id}" / "details"
+  }
+
+  case object RollbackEventLog extends EventLogApi with InternalApi with OneParam with StartsAtVersion2 with SortIndex {
+    val z: Int = implicitly[Line].value
+    val description    = "Rollback a specific event log"
+    val (action, path) = GET / "eventlog" / "{id}" / "details" / "rollback"
+  }
+
+  def endpoints: List[EventLogApi] = values.toList.sortBy(_.z)
+
+  def values = findValues
+}
+
 sealed trait GroupApi extends EnumEntry with EndpointSchema with SortIndex    {
-  override def dataContainer: Some[String] = Some("groups")
+  override def dataContainer: Option[String] = Some("groups")
 }
 object GroupApi       extends Enum[GroupApi] with ApiModuleProvider[GroupApi] {
   // API v2
@@ -231,6 +259,7 @@ object GroupApi       extends Enum[GroupApi] with ApiModuleProvider[GroupApi] {
     val z: Int = implicitly[Line].value
     val description    = "List all group categories and group in a tree format"
     val (action, path) = GET / "groups" / "tree"
+    override def dataContainer: None.type = None
   }
   case object GroupDetails             extends GroupApi with GeneralApi with OneParam with StartsAtVersion2 with SortIndex  {
     val z: Int = implicitly[Line].value
@@ -271,25 +300,25 @@ object GroupApi       extends Enum[GroupApi] with ApiModuleProvider[GroupApi] {
     val z: Int = implicitly[Line].value
     val description    = "Get information about the given group category"
     val (action, path) = GET / "groups" / "categories" / "{id}"
-    override def dataContainer: Some[String] = Some("groupCategories")
+    override def dataContainer: None.type = None
   }
   case object DeleteGroupCategory extends GroupApi with GeneralApi with OneParam with StartsAtVersion6 with SortIndex {
     val z: Int = implicitly[Line].value
     val description    = "Delete given group category"
     val (action, path) = DELETE / "groups" / "categories" / "{id}"
-    override def dataContainer: Some[String] = Some("groupCategories")
+    override def dataContainer: None.type = None
   }
   case object UpdateGroupCategory extends GroupApi with GeneralApi with OneParam with StartsAtVersion6 with SortIndex {
     val z: Int = implicitly[Line].value
     val description    = "Update information for given group category"
     val (action, path) = POST / "groups" / "categories" / "{id}"
-    override def dataContainer: Some[String] = Some("groupCategories")
+    override def dataContainer: None.type = None
   }
   case object CreateGroupCategory extends GroupApi with GeneralApi with ZeroParam with StartsAtVersion6 with SortIndex {
     val z: Int = implicitly[Line].value
     val description    = "Create a new group category"
     val (action, path) = PUT / "groups" / "categories"
-    override def dataContainer: Some[String] = Some("groupCategories")
+    override def dataContainer: None.type = None
   }
 
   def endpoints: List[GroupApi] = values.toList.sortBy(_.z)
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala
index 30af741ee64..50926aa9187 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestExtractorService.scala
@@ -37,19 +37,8 @@
 
 package com.normation.rudder.rest
 
-import com.normation.GitVersion
 import com.normation.box.*
-import com.normation.cfclerk.domain.Technique
-import com.normation.cfclerk.domain.TechniqueId
-import com.normation.cfclerk.domain.TechniqueName
-import com.normation.cfclerk.domain.TechniqueVersion
 import com.normation.cfclerk.services.TechniqueRepository
-import com.normation.errors.*
-import com.normation.inventory.domain.Certificate
-import com.normation.inventory.domain.InventoryError
-import com.normation.inventory.domain.NodeId
-import com.normation.inventory.domain.PublicKey
-import com.normation.inventory.domain.SecurityToken
 import com.normation.rudder.api.AclPath
 import com.normation.rudder.api.ApiAccountId
 import com.normation.rudder.api.ApiAccountName
@@ -57,50 +46,21 @@ import com.normation.rudder.api.ApiAclElement
 import com.normation.rudder.api.ApiAuthorization as ApiAuthz
 import com.normation.rudder.api.ApiAuthorizationKind
 import com.normation.rudder.api.HttpAction
-import com.normation.rudder.domain.nodes.NodeGroupCategoryId
-import com.normation.rudder.domain.policies.*
-import com.normation.rudder.domain.policies.PolicyMode
-import com.normation.rudder.domain.properties.GenericProperty
-import com.normation.rudder.domain.properties.GroupProperty
-import com.normation.rudder.domain.properties.InheritMode
-import com.normation.rudder.domain.properties.NodeProperty
-import com.normation.rudder.domain.properties.PropertyProvider
-import com.normation.rudder.domain.queries.NodeReturnType
-import com.normation.rudder.domain.queries.Query
-import com.normation.rudder.domain.queries.QueryReturnType
+import com.normation.rudder.config.UserPropertyService
 import com.normation.rudder.domain.reports.CompliancePrecision
-import com.normation.rudder.domain.workflows.*
 import com.normation.rudder.facts.nodes.NodeSecurityContext
 import com.normation.rudder.ncf.ParameterType.ParameterTypeService
 import com.normation.rudder.repository.*
 import com.normation.rudder.repository.json.DataExtractor.CompleteJson
 import com.normation.rudder.rest.data.*
-import com.normation.rudder.rule.category.RuleCategoryId
-import com.normation.rudder.services.policies.PropertyParser
 import com.normation.rudder.services.queries.CmdbQueryParser
-import com.normation.rudder.services.queries.CmdbQueryParser.*
 import com.normation.rudder.services.queries.JsonQueryLexer
-import com.normation.rudder.services.queries.StringCriterionLine
-import com.normation.rudder.services.queries.StringQuery
 import com.normation.rudder.services.workflows.WorkflowLevelService
-import com.normation.rudder.web.services.ReasonBehavior
-import com.normation.rudder.web.services.UserPropertyService
-import com.normation.utils.Control
-import com.normation.utils.Control.*
 import com.normation.utils.DateFormaterService
 import com.normation.utils.StringUuidGenerator
-import java.io.StringReader
 import net.liftweb.common.*
-import net.liftweb.common.Box.option2Box
 import net.liftweb.http.Req
 import net.liftweb.json.*
-import net.liftweb.json.JObject
-import net.liftweb.json.JsonDSL.*
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo
-import org.bouncycastle.cert.X509CertificateHolder
-import org.bouncycastle.openssl.PEMParser
-import zio.{Tag as _, *}
-import zio.syntax.*
 
 final case class RestExtractorService(
     readRule:             RoRuleRepository,
@@ -115,115 +75,6 @@ final case class RestExtractorService(
 ) extends Loggable {
 
   import com.normation.rudder.repository.json.DataExtractor.OptionnalJson.*
-  /*
-   * Params Extractors
-   */
-
-  private def extractOneValue[T](params: Map[String, List[String]], key: String)(
-      to: (String) => Box[T] = ((value: String) => Full(value))
-  ) = {
-    params.get(key) match {
-      case None               => Full(None)
-      case Some(value :: Nil) => to(value).map(Some(_))
-      case _                  => Failure(s"updateRule should contain only one value for $key")
-    }
-  }
-
-  private def extractList[T](params: Map[String, List[String]], key: String)(
-      to: (List[String]) => Box[T]
-  ): Box[Option[T]] = {
-    params.get(key) match {
-      case None       => Full(None)
-      case Some(list) => to(list).map(Some(_))
-    }
-  }
-
-  /*
-   * Convert value functions
-   */
-  private def toBoolean(value: String): Box[Boolean] = {
-    value match {
-      case "true"  => Full(true)
-      case "false" => Full(false)
-      case _       => Failure(s"value for boolean should be true or false instead of ${value}")
-    }
-  }
-
-  private[this] def toInt(value: String): Box[Int] = {
-    try {
-      Full(value.toInt)
-    } catch {
-      case _: java.lang.NumberFormatException => Failure(s"value for integer should be an integer instead of ${value}")
-    }
-  }
-
-  private def toQuery(value: String): Box[Query] = {
-    queryParser(value)
-  }
-
-  private def toQueryCriterion(value: String): Box[List[StringCriterionLine]] = {
-    JsonParser.parseOpt(value) match {
-      case None        => Failure("Could not parse 'select' cause in api query ")
-      case Some(value) =>
-        // Need to encapsulate this in a json Object, so it parse correctly
-        val json = (CRITERIA -> value)
-        queryParser.parseCriterionLine(json)
-    }
-  }
-
-  private def toQueryReturnType(value: String): Box[QueryReturnType] = {
-    QueryReturnType(value).toBox
-  }
-
-  private def toQueryComposition(value: String): Box[Option[String]] = {
-    Full(Some(value))
-  }
-
-  private def toQueryTransform(value: String): Box[Option[String]] = {
-    Full(if (value.isEmpty) None else Some(value))
-  }
-
-  private def toMinimalSizeString(minimalSize: Int)(value: String): Box[String] = {
-    if (value.size >= minimalSize) {
-      Full(value)
-    } else {
-      Failure(s"$value must be at least have a ${minimalSize} character size")
-    }
-  }
-
-  private def toParameterName(value: String): Box[String] = {
-    toMinimalSizeString(1)(value) match {
-      case Full(value) =>
-        if (GenericProperty.patternName.matcher(value).matches)
-          Full(value)
-        else Failure(s"Parameter Name should be respect the following regex : ${GenericProperty.patternName.pattern()}")
-
-      case eb: EmptyBox => eb ?~! "Parameter Name should not be empty"
-    }
-  }
-
-  private def toDirectiveParam(value: String): Box[Map[String, Seq[String]]] = {
-    parseSectionVal(parse(value)).map(SectionVal.toMapVariables(_))
-  }
-
-  private def extractJsonDirectiveParam(json: JValue): Box[Option[Map[String, Seq[String]]]] = {
-    json \ "parameters" match {
-      case JObject(Nil) | JNothing => Full(None)
-      case x @ JObject(_)          => parseSectionVal(x).map(x => Some(SectionVal.toMapVariables(x)))
-      case _                       => Failure(s"The value for parameter 'parameters' is malformed.")
-    }
-  }
-
-  private def toNodeGroupCategoryId(value: String): Box[NodeGroupCategoryId] = {
-    Full(NodeGroupCategoryId(value))
-  }
-  private def toRuleCategoryId(value: String):      Box[RuleCategoryId]      = {
-    Full(RuleCategoryId(value))
-  }
-
-  private def toGroupCategoryId(value: String): Box[NodeGroupCategoryId] = {
-    Full(NodeGroupCategoryId(value))
-  }
 
   private def toApiAccountId(value: String): Box[ApiAccountId] = {
     Full(ApiAccountId(value))
@@ -233,479 +84,9 @@ final case class RestExtractorService(
     Full(ApiAccountName(value))
   }
 
-  private def toWorkflowStatus(value: String): Box[Seq[WorkflowNodeId]] = {
-    val possiblestates = workflowLevelService.getWorkflowService().stepsValue
-    value.toLowerCase match {
-      case "open"   => Full(workflowLevelService.getWorkflowService().openSteps)
-      case "closed" => Full(workflowLevelService.getWorkflowService().closedSteps)
-      case "all"    => Full(possiblestates)
-      case value    =>
-        possiblestates.find(_.value.equalsIgnoreCase(value)) match {
-          case Some(state) => Full(Seq(state))
-          case None        => Failure(s"'${value}' is not a possible state for change requests")
-        }
-    }
-  }
-
-  private def toWorkflowTargetStatus(value: String): Box[WorkflowNodeId] = {
-    val possiblestates = workflowLevelService.getWorkflowService().stepsValue
-    possiblestates.find(_.value.equalsIgnoreCase(value)) match {
-      case Some(state) => Full(state)
-      case None        =>
-        Failure(
-          s"'${value}' is not a possible state for change requests, availabled values are: ${possiblestates.mkString("[ ", ", ", " ]")}"
-        )
-    }
-  }
-
-  /*
-   * Converting ruletarget.
-   *
-   * We support two use cases, in both json and parameters mode:
-   * - simple rule target name (list of string) =>
-   *   converted into a list of included target
-   * - full-fledge include/exclude
-   *   converted into one composite target.
-   *
-   * For now, it is an error to give several include/exclude,
-   * as of Rudder 3.0, the UI does not know how to handle it.
-   *
-   * So in all case, the result is exactly ONE target.
-   */
-  private def toRuleTarget(parameters: Map[String, List[String]], key: String): Box[Option[RuleTarget]] = {
-    parameters.get(key) match {
-      case Some(values) =>
-        traverse(values)(value => RuleTarget.unser(value)).flatMap(mergeTarget)
-      case None         => Full(None)
-    }
-  }
-
-  def toRuleTarget(json: JValue, key: String): Box[Option[RuleTarget]] = {
-    for {
-      targets <- traverse((json \\ key).children) { child =>
-                   child match {
-                     case JArray(values) =>
-                       traverse(values.children)(value => RuleTarget.unserJson(value)).flatMap(mergeTarget)
-                     case x              => RuleTarget.unserJson(x).map(Some(_))
-                   }
-                 }
-      merged  <- mergeTarget(targets.flatten)
-    } yield {
-      merged
-    }
-  }
-
-  private def mergeTarget(seq: Seq[RuleTarget]): Box[Option[RuleTarget]] = {
-    seq match {
-      case Seq()         => Full(None)
-      case head +: Seq() => Full(Some(head))
-      case several       =>
-        // if we have only simple target, build a composite including
-        if (several.exists(x => x.isInstanceOf[CompositeRuleTarget])) {
-          Failure(
-            "Composing several composite target with include/exclude is not supported now, please only one composite target."
-          )
-        } else {
-          Full(Some(RuleTarget.merge(several.toSet)))
-        }
-    }
-  }
-
-  /*
-   * Convert List Functions
-   */
-  private def convertListToDirectiveId(values: Seq[String]): Box[Set[DirectiveId]] = {
-    def toDirectiveId(value: String): Box[DirectiveId] = {
-      // TODO: parse value correctly
-      readDirective.getDirective(DirectiveUid(value)).notOptional(s"Directive '$value' not found").map(_.id).toBox
-    }
-    traverse(values)(toDirectiveId).map(_.toSet)
-  }
-
-  private def convertListToNodeId(values: List[String]): Box[List[NodeId]] = {
-    Full(values.map(NodeId(_)))
-  }
-
-  def parseSectionVal(root: JValue): Box[SectionVal] = {
-
-    def parseSectionName(section: JValue): Box[String] = {
-      section \ "name" match {
-        case JString(sectionName) => Full(sectionName)
-        case a                    =>
-          Failure(s"A section should be an object with a 'name' element, you got: ${net.liftweb.json.compactRender(section)}")
-      }
-    }
-
-    def parseSection(section: JValue): Box[(String, SectionVal)] = {
-      section \ "section" match {
-        case values: JObject => recValParseSection(values)
-        case _ =>
-          Failure(
-            s"A 'section' section should be an object containing a 'section' element (ie: { 'section' : ... }), you got: ${net.liftweb.json
-                .compactRender(section)}"
-          )
-      }
-
-    }
-
-    def parseSections(section: JValue): Box[Map[String, Seq[SectionVal]]] = {
-      section \ "sections" match {
-        case JNothing         => Full(Map())
-        case JArray(sections) => (traverse(sections.toSeq)(parseSection)).map(_.groupMap(_._1)(_._2))
-        case a                =>
-          Failure(
-            s"A 'sections' element in a section should either be empty (no child section), or an array of section element, you got: ${net.liftweb.json
-                .compactRender(a)}"
-          )
-      }
-    }
-
-    def parseVar(varSection: JValue):      Box[(String, String)]    = {
-      varSection \ "var" match {
-        case varObject: JObject =>
-          (varObject \ "name", varObject \ "value") match {
-            case (JString(varName), JString(varValue)) => Full((varName, varValue))
-            case _                                     =>
-              Failure(
-                s"A var object should be an object containing a 'name' and a 'value' element (ie: { 'name' : ..., 'value' : ... }), you got: ${net.liftweb.json
-                    .compactRender(varObject)}"
-              )
-          }
-        case _ =>
-          Failure(
-            s"A 'var' section should be an object containing a 'var' element, containing an object with a 'name' and 'value' element (ie: { 'var' : { 'name' : ..., 'value' : ... } }, you got: ${net.liftweb.json
-                .compactRender(varSection)}"
-          )
-      }
-    }
-    def parseSectionVars(section: JValue): Box[Map[String, String]] = {
-      section \ "vars" match {
-        case JNothing     => Full(Map())
-        case JArray(vars) => (traverse(vars)(parseVar)).map(_.toMap)
-        case a            =>
-          Failure(
-            s"A 'vars' element in a section should either be empty (no variable), or an array of var sections, you got: ${net.liftweb.json
-                .compactRender(a)}"
-          )
-      }
-    }
-
-    def recValParseSection(section: JValue): Box[(String, SectionVal)] = {
-      for {
-        sectionName <- parseSectionName(section)
-        vars        <- parseSectionVars(section)
-        sections    <- parseSections(section)
-      } yield {
-        (sectionName, SectionVal(sections, vars))
-      }
-    }
-
-    for {
-      (_, sectionVal) <- parseSection(root)
-    } yield {
-      sectionVal
-    }
-  }
-
-  /*
-   * Data extraction functions
-   */
-  def extractPrettify(params: Map[String, List[String]]): Boolean = {
-    extractOneValue(params, "prettify")(toBoolean).map(_.getOrElse(false)).getOrElse(false)
-  }
-
-  def extractReason(req: Req): Box[Option[String]] = {
-    import ReasonBehavior.*
-    userPropertyService.reasonsFieldBehavior match {
-      case Disabled => Full(None)
-      case mode     =>
-        val reason = extractString("reason")(req)(Full(_))
-        (mode: @unchecked) match {
-          case Mandatory =>
-            reason match {
-              case Full(None)                  => Failure("Reason field is mandatory and should be at least 5 characters long")
-              case Full(Some(v)) if v.size < 5 => Failure("Reason field should be at least 5 characters long")
-              case _                           => reason
-            }
-          case Optionnal => reason
-        }
-    }
-  }
-
-  def extractChangeRequestName(req: Req): Box[Option[String]] = {
-    extractString("changeRequestName")(req)(Full(_))
-  }
-
-  def extractChangeRequestDescription(req: Req): String = {
-    extractString("changeRequestDescription")(req)(Full(_)).getOrElse(None).getOrElse("")
-  }
-
-  def extractParameterName(params: Map[String, List[String]]): Box[String] = {
-    extractOneValue(params, "id")(toParameterName) match {
-      case Full(None)        => Failure("Parameter id should not be empty")
-      case Full(Some(value)) => Full(value)
-      case eb: EmptyBox => eb ?~ "Error while fetch parameter Name"
-    }
-  }
-
-  def extractWorkflowStatus(params: Map[String, List[String]]): Box[Seq[WorkflowNodeId]] = {
-    extractOneValue(params, "status")(toWorkflowStatus) match {
-      case Full(None)        => Full(workflowLevelService.getWorkflowService().openSteps)
-      case Full(Some(value)) => Full(value)
-      case eb: EmptyBox => eb ?~ "Error while fetching workflow status"
-    }
-  }
-
-  def extractWorkflowTargetStatus(params: Map[String, List[String]]): Box[WorkflowNodeId] = {
-    extractOneValue(params, "status")(toWorkflowTargetStatus) match {
-      case Full(Some(value)) => Full(value)
-      case Full(None)        => Failure("workflow status should not be empty")
-      case eb: EmptyBox => eb ?~ "Error while fetching workflow status"
-    }
-  }
-
-  def extractChangeRequestInfo(params: Map[String, List[String]]): Box[APIChangeRequestInfo] = {
-    def ident = (value: String) => Full(value)
-    for {
-      name        <- extractOneValue(params, "name")(ident)
-      description <- extractOneValue(params, "description")(ident)
-    } yield {
-      APIChangeRequestInfo(name, description)
-    }
-  }
-
-  def extractTechnique(optTechniqueName: Option[TechniqueName], opTechniqueVersion: Option[TechniqueVersion]): Box[Technique] = {
-    optTechniqueName match {
-      case Some(techniqueName) =>
-        opTechniqueVersion match {
-          case Some(version) =>
-            techniqueRepository.getTechniqueVersions(techniqueName).find(_ == version) match {
-              case Some(version) =>
-                techniqueRepository.get(TechniqueId(techniqueName, version)) match {
-                  case Some(technique) => Full(technique)
-                  case None            =>
-                    Failure(s" Technique '${techniqueName.value}' version '${version.serialize}' is not a valid Technique")
-                }
-              case None          => Failure(s" version '${version.serialize}' of Technique '${techniqueName.value}'  is not valid")
-            }
-          case None          =>
-            techniqueRepository.getLastTechniqueByName(techniqueName) match {
-              case Some(technique) => Full(technique)
-              case None            => Failure(s"Error while fetching last version of technique '${techniqueName.value}''")
-            }
-        }
-      case None                => Failure("techniqueName should not be empty")
-    }
-  }
-
-  def checkTechniqueVersion(
-      techniqueName:    TechniqueName,
-      techniqueVersion: Option[TechniqueVersion]
-  ): Box[Option[TechniqueVersion]] = {
-    techniqueVersion match {
-      case Some(version) =>
-        techniqueRepository.getTechniqueVersions(techniqueName).find(_ == version) match {
-          case Some(version) => Full(Some(version))
-          case None          => Failure(s" version '${version.serialize}' of technique '${techniqueName.value}' is not valid")
-        }
-      case None          => Full(None)
-    }
-  }
-
-  def extractNodeGroupCategoryId(params: Map[String, List[String]]): Box[NodeGroupCategoryId] = {
-    extractOneValue(params, "nodeGroupCategory")(toNodeGroupCategoryId) match {
-      case Full(Some(category)) => Full(category)
-      case Full(None)           => Failure("nodeGroupCategory cannot be empty")
-      case eb: EmptyBox => eb ?~ "error when deserializing node group category"
-    }
-  }
-
-  def toTag(s: String):                               Box[Tag]      = {
-    import Tag.*
-    val list  = s.split(":")
-    val name  = list.headOption.getOrElse(s)
-    val value = list.tail.headOption.getOrElse("")
-    Full(Tag(name, value))
-  }
-  def extractRule(params: Map[String, List[String]]): Box[RestRule] = {
-
-    for {
-      name             <- extractOneValue(params, "displayName")(toMinimalSizeString(3))
-      category         <- extractOneValue(params, "category")(toRuleCategoryId)
-      shortDescription <- extractOneValue(params, "shortDescription")()
-      longDescription  <- extractOneValue(params, "longDescription")()
-      enabled          <- extractOneValue(params, "enabled")(toBoolean)
-      directives       <- extractList(params, "directives")(convertListToDirectiveId)
-      target           <- toRuleTarget(params, "targets")
-      tagsList         <- extractList(params, "tags")(traverse(_)(toTag))
-      tags              = tagsList.map(t => Tags(t.toSet))
-    } yield {
-      RestRule(name, category, shortDescription, longDescription, directives, target.map(Set(_)), enabled, tags)
-    }
-  }
-
-  def extractRuleCategory(params: Map[String, List[String]]): Box[RestRuleCategory] = {
-
-    for {
-      name        <- extractOneValue(params, "name")(toMinimalSizeString(3))
-      description <- extractOneValue(params, "description")()
-      parent      <- extractOneValue(params, "parent")(toRuleCategoryId)
-      id          <- extractOneValue(params, "id")(toRuleCategoryId)
-    } yield {
-      RestRuleCategory(name, description, parent, id)
-    }
-  }
-
-  def extractGroup(params: Map[String, List[String]]): Box[RestGroup] = {
-    for {
-      id          <- extractOneValue(params, "id")()
-      name        <- extractOneValue(params, "displayName")(toMinimalSizeString(3))
-      description <- extractOneValue(params, "description")()
-      enabled     <- extractOneValue(params, "enabled")(toBoolean)
-      dynamic     <- extractOneValue(params, "dynamic")(toBoolean)
-      query       <- extractOneValue(params, "query")(toQuery)
-      _           <- if (query.map(_.criteria.size > 0).getOrElse(true)) Full("Query has at least one criteria")
-                     else Failure("Query should containt at least one criteria")
-      category    <- extractOneValue(params, "category")(toGroupCategoryId)
-      properties  <- extractGroupProperties(params)
-    } yield {
-      RestGroup(id, name, description, properties, query, dynamic, enabled, category)
-    }
-  }
-
-  def extractGroupCategory(params: Map[String, List[String]]): Box[RestGroupCategory] = {
-
-    for {
-      id          <- extractOneValue(params, "id")(toNodeGroupCategoryId)
-      name        <- extractOneValue(params, "name")(toMinimalSizeString(3))
-      description <- extractOneValue(params, "description")()
-      parent      <- extractOneValue(params, "parent")(toNodeGroupCategoryId)
-    } yield {
-      RestGroupCategory(id, name, description, parent)
-    }
-  }
-
-  def extractParameter(params: Map[String, List[String]]): Box[RestParameter] = {
-    for {
-      description <- extractOneValue(params, "description")()
-      value       <- extractOneValue(params, "value")(s => GenericProperty.parseValue(s).toBox)
-    } yield {
-      RestParameter(value, description)
-    }
-  }
-
-  /*
-   * Looking for parameter: "properties=foo=bar"
-   * ==> set foo to bar; delete baz, set plop to plop.
-   * With that syntaxe, you can't choose override mode
-   */
-  def extractNodeProperties(params: Map[String, List[String]]):  Box[Option[List[NodeProperty]]]  = {
-    // properties coming from the API are always provider=rudder / mode=read-write
-    extractProperties(params, (k, v) => NodeProperty.parse(k, v, None, None))
-  }
-  def extractGroupProperties(params: Map[String, List[String]]): Box[Option[List[GroupProperty]]] = {
-    // properties coming from the API are always provider=rudder / mode=read-write
-    // TODO: parse revision correctly
-    extractProperties(params, (k, v) => GroupProperty.parse(k, GitVersion.DEFAULT_REV, v, None, None))
-  }
-
-  def extractProperties[A](params: Map[String, List[String]], make: (String, String) => PureResult[A]): Box[Option[List[A]]] = {
-    import cats.implicits.*
-    import com.normation.box.*
-
-    extractList(params, "properties") { props =>
-      (props.traverse { prop =>
-        val parts = prop.split('=')
-
-        for {
-          name <- PropertyParser.validPropertyName(parts(0))
-          prop <- if (parts.size == 1) make(name, "")
-                  else make(name, parts(1))
-        } yield {
-          prop
-        }
-      }).toBox
-    }
-  }
-
-  // for the key, we don't have type / agent here. We are just looking if the string is a valid PEM
-  // and choose between certificate / public key
-  def parseAgentKey(key: String): Box[SecurityToken] = {
-    ZIO.attempt {
-      (new PEMParser(new StringReader(key))).readObject()
-    }.mapError(ex => InventoryError.CryptoEx(s"Key '${key}' cannot be parsed as a public key", ex))
-      .flatMap { obj =>
-        obj match {
-          case _: SubjectPublicKeyInfo  => PublicKey(key).succeed
-          case _: X509CertificateHolder => Certificate(key).succeed
-          case _ =>
-            InventoryError
-              .Crypto(s"Provided agent key is in an unknown format. Please use a certificate or public key in PEM format")
-              .fail
-        }
-      }
-      .toBox
-  }
-
-  /*
-   * expecting json:
-   * { "properties": [
-   *    {"name":"foo" , "value":"bar"  }
-   * ,  {"name":"baz" , "value": ""    }
-   * ,  {"name":"plop", "value":"plop" }
-   * ] }
-   */
-
-  def extractNodeProperty(json: JValue): Box[NodeProperty] = {
-    ((json \ "name"), (json \ "value")) match {
-      case (JString(nameValue), value) =>
-        val provider    = (json \ "provider") match {
-          case JString(string) => Some(PropertyProvider(string))
-          // if not defined of not a string, use default
-          case _               => None
-        }
-        val inheritMode = (json \ "inheritMode") match {
-          case JString(string) => InheritMode.parseString(string).toOption
-          // if not defined of not a string, use default
-          case _               => None
-        }
-        (for {
-          _ <- PropertyParser.validPropertyName(nameValue)
-        } yield {
-          NodeProperty(nameValue, GenericProperty.fromJsonValue(value), inheritMode, provider)
-        }).toBox
-
-      case (a, b) =>
-        Failure(s"""Error when trying to parse new property: '${compactRender(
-            json
-          )}'. The awaited format is: {"name": string, "value": json}""")
-    }
-  }
-
-  def extractNodePropertiesrFromJSON(json: JValue): Box[RestNodeProperties] = {
-    import com.normation.utils.Control.traverse
-    for {
-      props <- json \ "properties" match {
-                 case JArray(props) => Full(props)
-                 case x             => Failure(s"""Error: the given parameter is not a JSON object with a 'properties' key""")
-               }
-      seq   <- traverse(props)(extractNodeProperty)
-    } yield {
-      RestNodeProperties(Some(seq))
-    }
-  }
-
-  def extractNodePropertiesFromJSON(json: JValue): Box[Option[List[NodeProperty]]] = {
-    import com.normation.utils.Control.traverse
-    json \ "properties" match {
-      case JArray(props) => traverse(props)(extractNodeProperty).map(x => Some(x.toList))
-      case JNothing      => Full(None)
-      case x             => Failure(s"""Error: the given parameter is not a JSON object with a 'properties' key""")
-    }
-  }
-
   /*
    * Looking for parameter: "level=2"
+   * Still used in compliance APIs
    */
   def extractComplianceLevel(params: Map[String, List[String]]):  Box[Option[Int]]                 = {
     params.get("level") match {
@@ -735,227 +116,6 @@ final case class RestExtractorService(
     }
   }
 
-  def extractRule(req: Req): Box[RestRule] = {
-    req.json match {
-      case Full(json) => extractRuleFromJSON(json)
-      case _          => extractRule(req.params)
-    }
-  }
-
-  def extractDirective(req: Req): Box[RestDirective] = {
-    req.json match {
-      case Full(json) => extractDirectiveFromJSON(json)
-      case _          => extractDirective(req.params)
-    }
-  }
-
-  def extractDirective(params: Map[String, List[String]]): Box[RestDirective] = {
-    for {
-      name             <- (
-                            extractOneValue(params, "name")(toMinimalSizeString(3)),
-                            extractOneValue(params, "displayName")(toMinimalSizeString(3))
-                          ) match {
-                            case (res @ Full(Some(name)), _) => res
-                            case (_, res @ Full(Some(name))) => res
-                            case (Full(None), Full(None))    => Full(None)
-                            case (eb: EmptyBox, _)           => eb
-                            case (_, eb: EmptyBox)           => eb
-                          }
-      shortDescription <- extractOneValue(params, "shortDescription")()
-      longDescription  <- extractOneValue(params, "longDescription")()
-      enabled          <- extractOneValue(params, "enabled")(toBoolean)
-      priority         <- extractOneValue(params, "priority")(toInt)
-      parameters       <- extractOneValue(params, "parameters")(toDirectiveParam)
-      techniqueName    <- extractOneValue(params, "techniqueName")(x => Full(TechniqueName(x)))
-      techniqueVersion <- extractOneValue(params, "techniqueVersion")(x => TechniqueVersion.parse(x).toBox)
-      policyMode       <- extractOneValue(params, "policyMode")(PolicyMode.parseDefault(_).toBox)
-      tagsList         <- extractList(params, "tags")(traverse(_)(toTag))
-      tags              = tagsList.map(t => Tags(t.toSet))
-    } yield {
-      RestDirective(
-        name,
-        shortDescription,
-        longDescription,
-        enabled,
-        parameters,
-        priority,
-        techniqueName,
-        techniqueVersion,
-        policyMode,
-        tags
-      )
-    }
-  }
-
-  def toTagJson(json: JValue): Box[Tag] = {
-    import Tag.*
-    json match {
-      case JObject(JField(name, JString(value)) :: Nil) => Full(Tag(name, value))
-      case _                                            => Failure("Not valid format for tags")
-    }
-  }
-
-  def extractRuleFromJSON(json: JValue): Box[RestRule] = {
-    for {
-      name             <- extractJsonString(json, "displayName", toMinimalSizeString(3))
-      category         <- extractJsonString(json, "category", toRuleCategoryId)
-      shortDescription <- extractJsonString(json, "shortDescription")
-      longDescription  <- extractJsonString(json, "longDescription")
-      directives       <- extractJsonListString(json, "directives", convertListToDirectiveId)
-      target           <- toRuleTarget(json, "targets")
-      enabled          <- extractJsonBoolean(json, "enabled")
-      tags             <- extractTagsFromJson(json \ "tags") ?~! "Error when extracting Rule tags"
-    } yield {
-      RestRule(name, category, shortDescription, longDescription, directives, target.map(Set(_)), enabled, tags)
-    }
-  }
-
-  def extractRuleCategory(json: JValue): Box[RestRuleCategory] = {
-    for {
-      name        <- extractJsonString(json, "name", toMinimalSizeString(3))
-      description <- extractJsonString(json, "description")
-      parent      <- extractJsonString(json, "parent", toRuleCategoryId)
-      id          <- extractJsonString(json, "id", toRuleCategoryId)
-    } yield {
-      RestRuleCategory(name, description, parent, id)
-    }
-  }
-
-  // this extractTagsFromJson is exclusively used when updating TAG in the POST API request. We want to extract tags as a List
-  // of {key1,value1 ... keyN,valueN}
-
-  private def extractTagsFromJson(value: JValue): Box[Option[Tags]] = {
-    implicit val formats = DefaultFormats
-    if (value == JNothing) Full(None) // missing tag in json means user doesn't want to update them
-    else {
-      for {
-        jobjects <- Box(value.extractOpt[List[JObject]]) ?~! s"Invalid JSON serialization for Tags ${value}"
-        // be careful, we need to use JObject.obj to get the list even if there is duplicated keys,
-        // which would be removed with JObject.values
-        pairs    <- Control.traverse(jobjects) { o =>
-                      Control.traverse(o.obj) {
-                        case JField(key, v) =>
-                          v match {
-                            case JString(s) if (s.nonEmpty) => Full((key, s))
-                            case _                          => Failure(s"Cannot parse value '${v}' as a valid tag value for tag with name '${key}'")
-
-                          }
-                      }
-                    }
-      } yield {
-        val tags = pairs.flatten
-        Some(Tags(tags.map { case (k, v) => Tag(TagName(k), TagValue(v)) }.toSet))
-      }
-    }
-  }
-
-  def extractDirectiveFromJSON(json: JValue): Box[RestDirective] = {
-    for {
-      name             <- (
-                            extractJsonString(json, "name", toMinimalSizeString(3)),
-                            extractJsonString(json, "displayName", toMinimalSizeString(3))
-                          ) match {
-                            case (res @ Full(Some(name)), _) => res
-                            case (_, res @ Full(Some(name))) => res
-                            case (Full(None), Full(None))    => Full(None)
-                            case (eb: EmptyBox, _)           => eb
-                            case (_, eb: EmptyBox)           => eb
-                          }
-      shortDescription <- extractJsonString(json, "shortDescription")
-      longDescription  <- extractJsonString(json, "longDescription")
-      enabled          <- extractJsonBoolean(json, "enabled")
-      priority         <- extractJsonInt(json, "priority")
-      parameters       <- extractJsonDirectiveParam(json)
-      techniqueName    <- extractJsonString(json, "techniqueName", x => Full(TechniqueName(x)))
-      techniqueVersion <- extractJsonString(json, "techniqueVersion", x => TechniqueVersion.parse(x).toBox)
-      policyMode       <- extractJsonString(json, "policyMode", PolicyMode.parseDefault(_).toBox)
-      tags             <- extractTagsFromJson(json \ "tags") ?~! "Error when extracting Directive tags"
-    } yield {
-      RestDirective(
-        name,
-        shortDescription,
-        longDescription,
-        enabled,
-        parameters,
-        priority,
-        techniqueName,
-        techniqueVersion,
-        policyMode,
-        tags
-      )
-    }
-  }
-
-  def extractGroupPropertiesFromJSON(json: JValue): Box[Option[Seq[GroupProperty]]] = {
-    import com.normation.utils.Control.traverse
-    json \ "properties" match {
-      case JArray(props) =>
-        traverse(props)(p => GroupProperty.unserializeLdapGroupProperty(GenericProperty.serializeJson(p)).toBox).map(Some(_))
-      case JNothing      => Full(None)
-      case x             => Failure(s"""Error: the given parameter is not a JSON object with a 'properties' key""")
-    }
-  }
-
-  def extractGroupFromJSON(json: JValue): Box[RestGroup] = {
-    for {
-      id          <- extractJsonString(json, "id")
-      name        <- extractJsonString(json, "displayName", toMinimalSizeString(3))
-      description <- extractJsonString(json, "description")
-      properties  <- extractGroupPropertiesFromJSON(json)
-      enabled     <- extractJsonBoolean(json, "enabled")
-      dynamic     <- extractJsonBoolean(json, "dynamic")
-      query       <- json \ "query" match {
-                       case JNothing    => Full(None)
-                       case stringQuery =>
-                         for {
-                           st <- queryParser.jsonParse(stringQuery)
-                           q  <- queryParser.parse(st)
-                           _  <- if (q.criteria.size > 0) Full("Query has at least one criteria")
-                                 else Failure("Query should containt at least one criteria")
-                         } yield Some(q)
-                     }
-      category    <- extractJsonString(json, "category", toGroupCategoryId)
-    } yield {
-      RestGroup(id, name, description, properties.map(_.toList), query, dynamic, enabled, category)
-    }
-  }
-
-  def extractGroupCategory(json: JValue): Box[RestGroupCategory] = {
-    for {
-      id          <- extractJsonString(json, "id", toNodeGroupCategoryId)
-      name        <- extractJsonString(json, "name", toMinimalSizeString(3))
-      description <- extractJsonString(json, "description")
-      parent      <- extractJsonString(json, "parent", toNodeGroupCategoryId)
-    } yield {
-      RestGroupCategory(id, name, description, parent)
-    }
-  }
-
-  def extractParameterNameFromJSON(json: JValue): Box[String] = {
-    extractJsonString(json, "id", toParameterName) match {
-      case Full(None)        => Failure("Parameter id should not be empty")
-      case Full(Some(value)) => Full(value)
-      case eb: EmptyBox => eb ?~ "Error while fetch parameter Name"
-    }
-  }
-
-  def extractParameterFromJSON(json: JValue): Box[RestParameter] = {
-    for {
-      description <- extractJsonString(json, "description")
-      value       <- (json \ "value") match {
-                       case JNothing => Full(None)
-                       case x        => Full(Some(GenericProperty.fromJsonValue(x)))
-                     }
-      inheritMode <- (json \ "inheritMode") match {
-                       case JString(s) => InheritMode.parseString(s).map(x => Some(x)).toBox
-                       case JNothing   => Full(None)
-                       case x          => Failure("Can not parse inherit mode: " + x)
-                     }
-    } yield {
-      RestParameter(value, description, inheritMode)
-    }
-  }
-
   /*
    * The ACL list which is exchange between
    */
@@ -1010,41 +170,9 @@ final case class RestExtractorService(
     }
   }
 
-  def extractNodeIdsFromJson(json: JValue): Box[Option[List[NodeId]]] = {
-    extractJsonListString(json, "nodeId", convertListToNodeId)
-  }
-
-  def extractQuery(params: Map[String, List[String]]): Box[Option[Query]] = {
-    extractOneValue(params, "query")(toQuery) match {
-      case Full(None)  =>
-        extractOneValue(params, CRITERIA)(toQueryCriterion) match {
-          case Full(None)            => Full(None)
-          case Full(Some(Nil))       => Failure("Query should at least contain one criteria")
-          case Full(Some(criterion)) =>
-            for {
-              // Target defaults to NodeReturnType
-              optType   <- extractOneValue(params, TARGET)(toQueryReturnType)
-              returnType = optType.getOrElse(NodeReturnType)
-
-              // Composition defaults to None/And
-              optComposition <- extractOneValue(params, COMPOSITION)(toQueryComposition)
-              composition     = optComposition.getOrElse(None)
-              transform      <- extractOneValue(params, TRANSFORM)(toQueryTransform)
-
-              // Query may fail when parsing
-              stringQuery = StringQuery(returnType, composition, transform.flatten, criterion.toList)
-              query      <- queryParser.parse(stringQuery)
-            } yield {
-              Some(query)
-            }
-          case eb: EmptyBox => eb ?~! "error with query"
-        }
-      case Full(query) =>
-        Full(query)
-      case eb: EmptyBox => eb ?~! "error with query"
-    }
-  }
-
+  /*
+   * Still used in technique API
+   */
   def extractString[T](key: String)(req: Req)(fun: String => Box[T]): Box[Option[T]] = {
     req.json match {
       case Full(json) =>
@@ -1062,31 +190,9 @@ final case class RestExtractorService(
     }
   }
 
-  def extractInt[T](key: String)(req: Req)(fun: BigInt => Box[T]): Box[Option[T]] = {
-    req.json match {
-      case Full(json) =>
-        json \ key match {
-          case JInt(value) => fun(value).map(Some(_))
-          case JNothing    => Full(None)
-          case x           => Failure(s"Not a valid value for '${key}' parameter, current value is : ${x}")
-        }
-      case _          =>
-        req.params.get(key) match {
-          case None              => Full(None)
-          case Some(head :: Nil) =>
-            try {
-              fun(head.toLong).map(Some(_))
-            } catch {
-              case e: Throwable =>
-                Failure(
-                  s"Parsing request parameter '${key}' as an integer failed, current value is '${head}'. Error message is: '${e.getMessage}'."
-                )
-            }
-          case Some(list)        => Failure(s"${list.size} values defined for 'id' parameter, only one needs to be defined")
-        }
-    }
-  }
-
+  /*
+   * Still used in technique/apiaccounts API
+   */
   def extractBoolean[T](key: String)(req: Req)(fun: Boolean => T): Box[Option[T]] = {
     req.json match {
       case Full(json) =>
@@ -1112,82 +218,6 @@ final case class RestExtractorService(
     }
   }
 
-  def extractMap[T, U](key: String)(req: Req)(
-      keyFun:           String => T,
-      jsonValueFun:     JValue => U,
-      paramValueFun:    String => U,
-      paramMapSepartor: String
-  ): Box[Option[Map[T, U]]] = {
-    req.json match {
-      case Full(json) =>
-        json \ key match {
-          case JObject(fields) =>
-            val map: Map[T, U] = fields.map { case JField(fieldName, value) => (keyFun(fieldName), jsonValueFun(value)) }.toMap
-            Full(Some(map))
-          case JNothing        => Full(None)
-          case x               => Failure(s"Not a valid value for '${key}' parameter, current value is : ${x}")
-        }
-      case _          =>
-        req.params.get(key) match {
-          case None            => Full(None)
-          case Some(keyValues) =>
-            (bestEffort(keyValues) {
-              case keyValue =>
-                val splitted = keyValue.split(paramMapSepartor, 1).toList
-                splitted match {
-                  case key :: value :: Nil => Full((keyFun(key), paramValueFun(value)))
-                  case _                   => Failure("Could not split value")
-                }
-            }).map(values => Some(values.toMap))
-        }
-    }
-  }
-
-  def extractObj[T](key: String)(req: Req)(jsonValueFun: JObject => Box[T]): Box[Option[T]] = {
-    req.json match {
-      case Full(json) => extractJsonObj(json, key, jsonValueFun)
-      case _          =>
-        req.params.get(key) match {
-          case None               => Full(None)
-          case Some(value :: Nil) =>
-            parseOpt(value) match {
-              case Some(obj: JObject) => jsonValueFun(obj).map(Some(_))
-              case _                  => Failure(s"Not a valid value for '${key}' parameter, current value is : ${value}")
-            }
-          case Some(list)         => Failure(s"${list.size} values defined for '${key}' parameter, only one needs to be defined")
-        }
-    }
-  }
-
-  def extractList[T](key: String)(req: Req)(fun: String => Box[T]): Box[List[T]] = {
-    req.json match {
-      case Full(json) =>
-        json \ key match {
-          case JString(value) => fun(value).map(_ :: Nil)
-          case JArray(values) =>
-            com.normation.utils.Control
-              .bestEffort(values) { value =>
-                value match {
-                  case JString(value) => fun(value)
-                  case x              =>
-                    Failure(s"Not a valid value for '${key}' parameter, current value is : ${x}")
-                }
-
-              }
-              .map(_.toList)
-          case JNothing       => Full(Nil)
-          case x              => Failure(s"Not a valid value for '${key}' parameter, current value is : ${x}")
-        }
-      case _          =>
-        req.params.get(key) match {
-          case None       => Full(Nil)
-          case Some(list) => bestEffort(list)(fun(_)).map(_.toList)
-        }
-    }
-  }
-
-  def extractId[T](req: Req)(fun: String => Box[T]): Box[Option[T]] = extractString("id")(req)(fun)
-
   def extractComplianceFormat(params: Map[String, List[String]]): Box[ComplianceFormat] = {
     params.get("format") match {
       case None | Some(Nil) | Some("" :: Nil) =>
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestUtils.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestUtils.scala
index 6f7c55126d1..a374ae11963 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestUtils.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RestUtils.scala
@@ -38,11 +38,9 @@
 package com.normation.rudder.rest
 
 import com.normation.eventlog.EventActor
-import com.normation.eventlog.ModificationId
 import com.normation.rudder.api.ApiVersion
 import com.normation.rudder.domain.logger.ApiLogger
 import com.normation.rudder.users.UserService
-import com.normation.utils.StringUuidGenerator
 import net.liftweb.common.Box
 import net.liftweb.common.EmptyBox
 import net.liftweb.common.Failure
@@ -197,30 +195,11 @@ object RestUtils {
     effectiveResponse(id, message, InternalError, action, prettify)
   }
 
-  def notValidVersionResponse(action: String)(implicit availableVersions: List[ApiVersion]): LiftResponse = {
-    val versions = "latest" :: availableVersions.map(_.value.toString)
-    toJsonError(
-      None,
-      JString(s"Version used does not exist, please use one of the following: ${versions.mkString("[ ", ", ", " ]")} ")
-    )(action, prettify = false)
-  }
-
-  def missingResponse(version: Int, action: String): LiftResponse = {
-    toJsonError(None, JString(s"Version ${version} exists for this API function, but it's implementation is missing"))(
-      action,
-      prettify = false
-    )
-  }
-
-  def unauthorized: LiftResponse =
-    effectiveResponse(None, JString("You are not authorized to access that API"), ForbiddenError, "", prettify = false)
-
   def response(
       restExtractor: RestExtractorService,
       dataName:      String,
       id:            Option[String]
-  )(function: Box[JValue], req: Req, errorMessage: String)(implicit action: String): LiftResponse = {
-    implicit val prettify = restExtractor.extractPrettify(req.params)
+  )(function: Box[JValue], req: Req, errorMessage: String)(implicit action: String, prettify: Boolean): LiftResponse = {
     function match {
       case Full(category: JValue) =>
         toJsonResponse(id, (dataName -> category))
@@ -232,76 +211,6 @@ object RestUtils {
     }
   }
 
-  type ActionType = (EventActor, ModificationId, Option[String]) => Box[JValue]
-  def actionResponse(restExtractor: RestExtractorService, dataName: String, uuidGen: StringUuidGenerator, id: Option[String])(
-      function:     Box[ActionType],
-      req:          Req,
-      errorMessage: String
-  )(implicit action: String, userService: UserService): LiftResponse = {
-    actionResponse2(restExtractor, dataName, uuidGen, id)(function, req, errorMessage)(action, RestUtils.getActor(req))
-  }
-  def actionResponse2(restExtractor: RestExtractorService, dataName: String, uuidGen: StringUuidGenerator, id: Option[String])(
-      function:     Box[ActionType],
-      req:          Req,
-      errorMessage: String
-  )(implicit action: String, actor: EventActor): LiftResponse = {
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-
-    (for {
-      reason <- restExtractor.extractReason(req)
-      modId   = ModificationId(uuidGen.newUuid)
-      result <- function.flatMap(_(actor, modId, reason))
-    } yield {
-      result
-    }) match {
-      case Full(result: JValue) =>
-        toJsonResponse(id, (dataName -> result))
-      case eb: EmptyBox =>
-        val message = (eb ?~! errorMessage).messageChain
-        toJsonError(id, message)
-    }
-  }
-
-  type WorkflowType = (EventActor, Option[String], String, String) => Box[JValue]
-  def workflowResponse(restExtractor: RestExtractorService, dataName: String, uuidGen: StringUuidGenerator, id: Option[String])(
-      function:     Box[WorkflowType],
-      req:          Req,
-      errorMessage: String,
-      defaultName:  String
-  )(implicit action: String, userService: UserService): LiftResponse = {
-    workflowResponse2(restExtractor, dataName, uuidGen, id)(function, req, errorMessage, defaultName)(
-      action,
-      RestUtils.getActor(req)
-    )
-  }
-  def workflowResponse2(restExtractor: RestExtractorService, dataName: String, uuidGen: StringUuidGenerator, id: Option[String])(
-      function:     Box[WorkflowType],
-      req:          Req,
-      errorMessage: String,
-      defaultName:  String
-  )(implicit action: String, actor: EventActor): LiftResponse = {
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-
-    (for {
-      reason <- restExtractor.extractReason(req)
-      crName <- restExtractor.extractChangeRequestName(req).map(_.getOrElse(defaultName))
-      crDesc  = restExtractor.extractChangeRequestDescription(req)
-      result <- function.flatMap(_(actor, reason, crName, crDesc))
-    } yield {
-      result
-    }) match {
-      case Full(result: JValue) =>
-        toJsonResponse(id, (dataName -> result))
-      case eb: EmptyBox =>
-        val message = (eb ?~! errorMessage).messageChain
-        toJsonError(id, message)
-    }
-  }
-
-  def notFoundResponse(id: Option[String], message: JValue)(implicit action: String, prettify: Boolean): LiftResponse = {
-    effectiveResponse(id, message, NotFoundError, action, prettify)
-  }
-
 }
 
 trait HttpStatus {
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RoleApiMapping.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RoleApiMapping.scala
index 8d39ebe279d..05427e3b4b2 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RoleApiMapping.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RoleApiMapping.scala
@@ -111,7 +111,7 @@ object AuthorizationApiMapping {
         // Administration is Rudder setting
 
         case Administration.Read  =>
-          SettingsApi.GetAllSettings.x :: SettingsApi.GetSetting.x :: SystemApi.ArchivesDirectivesList.x ::
+          EventLogApi.GetEventLogs.x :: EventLogApi.GetEventLogDetails.x :: SettingsApi.GetAllSettings.x :: SettingsApi.GetSetting.x :: SystemApi.ArchivesDirectivesList.x ::
           SystemApi.ArchivesFullList.x :: SystemApi.ArchivesGroupsList.x :: SystemApi.ArchivesRulesList.x ::
           SystemApi.GetAllZipArchive.x :: SystemApi.GetDirectivesZipArchive.x :: SystemApi.GetGroupsZipArchive.x ::
           SystemApi.GetRulesZipArchive.x :: SystemApi.Info.x :: SystemApi.Status.x :: SystemApi.ArchivesParametersList.x ::
@@ -120,7 +120,7 @@ object AuthorizationApiMapping {
             _.x
           )
         case Administration.Write =>
-          PluginApi.UpdatePluginsSettings.x :: SettingsApi.ModifySettings.x :: SettingsApi.ModifySetting.x ::
+          EventLogApi.RollbackEventLog.x :: PluginApi.UpdatePluginsSettings.x :: SettingsApi.ModifySettings.x :: SettingsApi.ModifySetting.x ::
           InventoryApi.FileWatcherRestart.x :: InventoryApi.FileWatcherStart.x :: InventoryApi.FileWatcherStop.x ::
           NodeApi.CreateNodes.x :: SystemApi.endpoints.map(_.x)
         case Administration.Edit  =>
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonRequest.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonRequest.scala
index c1c22f442cd..4c2443de70a 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonRequest.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/RudderJsonRequest.scala
@@ -37,8 +37,14 @@
 
 package com.normation.rudder.rest
 
+import cats.syntax.either.*
+import cats.syntax.monadError.*
+import com.normation.errors.Chained
+import com.normation.errors.Inconsistency
 import com.normation.errors.PureResult
 import com.normation.rudder.apidata.ZioJsonExtractor
+import com.normation.rudder.config.ReasonBehavior
+import com.normation.rudder.config.ReasonBehavior.*
 import net.liftweb.http.Req
 import zio.json.*
 
@@ -56,4 +62,19 @@ object RudderJsonRequest {
     }
 
   }
+
+  def extractReason(req: Req)(implicit reasonBehavior: ReasonBehavior): PureResult[Option[String]] = {
+    def reason = req.params.get("reason").flatMap(_.headOption)
+    (reasonBehavior match {
+      case Disabled  => Right(None)
+      case Mandatory =>
+        reason
+          .toRight[String]("Reason field is mandatory and should be at least 5 characters long")
+          .reject {
+            case s if s.lengthIs < 5 => "Reason field should be at least 5 characters long"
+          }
+          .map(Some(_))
+      case Optional  => Right(reason)
+    }).leftMap(err => Chained("There was an error while extracting reason message", Inconsistency(err)))
+  }
 }
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala
index cc5d9ec3dd9..e62b0cc508f 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/CreateNodeData.scala
@@ -264,7 +264,7 @@ object Validation {
 
     val checkedAgent: Validation[AgentInfo] = nodeDetails.agentKey match {
       case Some(a) => checkAgent(os.os, a)
-      case None    => AgentInfo(AgentType.CfeCommunity, None, PublicKey("placeholder-value - not a real key"), Set.empty).validNel
+      case None    => AgentInfo(AgentType.CfeCommunity, None, Certificate("placeholder-value - not a real key"), Set.empty).validNel
     }
 
     (checkId(nodeDetails.id.toLowerCase), checkStatus(nodeDetails.status)).mapN(Tuple2(_, _)) andThen {
@@ -418,9 +418,8 @@ object Validation {
 
   def checkAgent(osType: OsType, agent: AgentKey): Validation[AgentInfo] = {
     def checkSecurityToken(agent: AgentType, token: String): Validation[SecurityToken] = {
-      import net.liftweb.json.JsonDSL.*
-      val tpe = if (token.contains("BEGIN CERTIFICATE")) Certificate.kind else PublicKey.kind
-      AgentInfoSerialisation.parseSecurityToken(agent, ("type" -> tpe) ~ ("value" -> token), None) match {
+      // in 8.0, everything is certificate whatever the agent
+      SecurityToken.parseValidate(token) match {
         case Left(err) => NodeValidationError.SecurityVal(err.fullMsg).invalidNel
         case Right(x)  => x.validNel
       }
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/EventLog.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/EventLog.scala
new file mode 100644
index 00000000000..258ed8f75bf
--- /dev/null
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/EventLog.scala
@@ -0,0 +1,229 @@
+/*
+ *************************************************************************************
+ * Copyright 2019 Normation SAS
+ *************************************************************************************
+ *
+ * This file is part of Rudder.
+ *
+ * Rudder is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In accordance with the terms of section 7 (7. Additional Terms.) of
+ * the GNU General Public License version 3, the copyright holders add
+ * the following Additional permissions:
+ * Notwithstanding to the terms of section 5 (5. Conveying Modified Source
+ * Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
+ * Public License version 3, when you create a Related Module, this
+ * Related Module is not considered as a part of the work and may be
+ * distributed under the license agreement of your choice.
+ * A "Related Module" means a set of sources files including their
+ * documentation that, without modification of the Source Code, enables
+ * supplementary functions or services in addition to those offered by
+ * the Software.
+ *
+ * Rudder is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
+
+ *
+ *************************************************************************************
+ */
+package com.normation.rudder.rest.data
+
+import com.normation.eventlog.EventActor
+import com.normation.eventlog.EventLog
+import com.normation.eventlog.EventLogType
+import com.normation.rudder.web.services.EventLogDetailsGenerator
+import com.normation.utils.DateFormaterService
+import doobie.util.Write
+import enumeratum.Enum
+import enumeratum.EnumEntry.Lowercase
+import enumeratum.EnumEntry.Uppercase
+import io.scalaland.chimney.Transformer
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+import org.joda.time.DateTime
+import scala.xml.NodeSeq
+import zio.Chunk
+import zio.json.*
+
+/**
+  * Representation of an event log in the Rest API.
+  * This is data in the table of event logs
+  */
+final case class RestEventLog(
+    id:                              Option[Int],
+    @jsonField("date") creationDate: DateTime,
+    actor:                           EventActor,
+    @jsonField("type") eventType:    String,
+    description:                     NodeSeq,
+    hasDetails:                      Boolean
+)
+
+object RestEventLog {
+
+  // We still have Joda DateTime because we map an event log field using chimney
+  implicit val datetimeEncoder:    JsonEncoder[DateTime]     = JsonEncoder[String].contramap(DateFormaterService.getDisplayDate)
+  implicit val eventActorEncoder:  JsonEncoder[EventActor]   = JsonEncoder[String].contramap(_.name)
+  implicit val descriptionEncoder: JsonEncoder[NodeSeq]      = JsonEncoder[String].contramap(_.toString())
+  implicit val encoder:            JsonEncoder[RestEventLog] = DeriveJsonEncoder.gen[RestEventLog]
+
+  // For localization we need to transform eventType using translation, passing liftweb.S is not so elegant
+  // so we need a conversion (poke at Scala 3's Conversion)
+  implicit def transformer(implicit
+      translateEventType: EventLogType => String,
+      eventLogDetail:     EventLogDetailsGenerator
+  ): Transformer[EventLog, RestEventLog] = {
+    Transformer
+      .define[EventLog, RestEventLog]
+      .enableMethodAccessors // because source is a trait
+      .withFieldComputed(
+        _.actor,
+        _.principal
+      )
+      .withFieldComputed(
+        _.eventType,
+        e => translateEventType(e.eventType)
+      )
+      .withFieldComputed(
+        _.description,
+        eventLogDetail.displayDescription(_)
+      )
+      .withFieldComputed(
+        _.hasDetails,
+        _.details != <entry></entry>
+      )
+      .buildTransformer
+  }
+}
+
+/**
+  * Response data from the event log API : 
+  * - success has non-empty "data"
+  * - error has "error" message
+  */
+sealed trait RestEventLogResponse {
+  def draw:            Int
+  def recordsTotal:    Long
+  def recordsFiltered: Long
+}
+final case class RestEventLogSuccess(
+    draw:            Int,
+    recordsTotal:    Long,
+    recordsFiltered: Long,
+    data:            Seq[RestEventLog]
+) extends RestEventLogResponse
+object RestEventLogSuccess        {
+  implicit val encoder: JsonEncoder[RestEventLogSuccess] = DeriveJsonEncoder.gen[RestEventLogSuccess]
+}
+
+final case class RestEventLogError private[data] (
+    draw:            Int = 0,
+    recordsTotal:    Long = 0,
+    recordsFiltered: Long = 0,
+    data:            String = "",
+    error:           String
+) extends RestEventLogResponse
+
+object RestEventLogError {
+  implicit val encoder: JsonEncoder[RestEventLogError] = DeriveJsonEncoder.gen[RestEventLogError]
+
+  def apply(errorMessage: String): RestEventLogError = RestEventLogError(error = errorMessage)
+}
+
+final case class RestEventLogFilter(
+    draw:      Int,
+    start:     Int,
+    length:    Int,
+    search:    Option[RestEventLogFilter.Search],
+    startDate: Option[LocalDateTime],
+    endDate:   Option[LocalDateTime],
+    order:     Chunk[RestEventLogFilter.Order]
+)
+
+object RestEventLogFilter {
+
+  final case class Search(value: String)
+  object Search {
+    implicit val decoder: JsonDecoder[Search] = DeriveJsonDecoder.gen[Search]
+  }
+
+  // columns and direction are directly used for database query
+  // the case does not really matter for the parsing and serialization, we use the old one
+
+  sealed abstract class Column(val id: Int) extends Lowercase
+  object Column                             extends Enum[Column]    {
+    case object ID           extends Column(0)
+    case object CreationDate extends Column(1)
+    case object Principal    extends Column(2)
+    case object EventType    extends Column(3)
+
+    override def values: IndexedSeq[Column] = findValues
+
+    def fromId(id: Int): Either[String, Column] = {
+      values
+        .find(_.id == id)
+        .toRight(s"Not a valid column id : ${id}, columns are ${values.map(c => s"${c.id}=${c.entryName}").mkString(",")}")
+    }
+
+    implicit val decoder: JsonDecoder[Column] = JsonDecoder[Int].mapOrFail(fromId)
+    implicit val write:   Write[Column]       = Write[String].contramap(_.entryName)
+  }
+  sealed trait Direction                    extends Uppercase
+  object Direction                          extends Enum[Direction] {
+    case object Desc extends Direction
+    case object Asc  extends Direction
+
+    override def values: IndexedSeq[Direction] = findValues
+
+    def parse(s: String): Either[String, Direction] =
+      withNameInsensitiveEither(s).left.map(e => s"not a valid sorting order: ${e.notFoundName}")
+    implicit val decoder: JsonDecoder[Direction]    = JsonDecoder[String].mapOrFail(parse(_))
+  }
+  final case class Order(column: Column, dir: Direction)
+  object Order {
+    implicit val decoder: JsonDecoder[Order] = DeriveJsonDecoder.gen[Order]
+  }
+
+  implicit val localDateTimeDecoder: JsonDecoder[LocalDateTime] = {
+    val format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+    JsonDecoder[String].map(LocalDateTime.parse(_, format))
+  }
+
+  implicit val decoder: JsonDecoder[RestEventLogFilter] = DeriveJsonDecoder.gen[RestEventLogFilter]
+}
+
+final case class RestEventLogDetails(
+    id:          String,
+    content:     NodeSeq,
+    canRollback: Boolean
+)
+object RestEventLogDetails {
+  implicit val contentEncoder: JsonEncoder[NodeSeq]             = JsonEncoder[String].contramap(_.toString())
+  implicit val encoder:        JsonEncoder[RestEventLogDetails] = DeriveJsonEncoder.gen[RestEventLogDetails]
+}
+
+final case class RestEventLogRollback(
+    action: RestEventLogRollback.Action,
+    id:     String
+)
+
+object RestEventLogRollback {
+  sealed trait Action extends Lowercase
+  object Action       extends Enum[Action] {
+    case object After  extends Action
+    case object Before extends Action
+
+    override def values: IndexedSeq[Action] = findValues
+
+    implicit val encoder: JsonEncoder[Action] = JsonEncoder[String].contramap(_.entryName)
+  }
+
+  implicit val encoder: JsonEncoder[RestEventLogRollback] = DeriveJsonEncoder.gen[RestEventLogRollback]
+}
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/RestData.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/RestData.scala
index acb599b463e..4b79e17554e 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/RestData.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/data/RestData.scala
@@ -59,11 +59,9 @@ import com.normation.rudder.domain.properties.NodeProperty
 import com.normation.rudder.domain.properties.PropertyProvider
 import com.normation.rudder.domain.queries.Query
 import com.normation.rudder.domain.workflows.ChangeRequestInfo
-import com.normation.rudder.repository.FullNodeGroupCategory
 import com.normation.rudder.rule.category.*
 import com.typesafe.config.ConfigValue
 import io.scalaland.chimney.Transformer
-import net.liftweb.common.*
 
 final case class APIChangeRequestInfo(
     name:        Option[String],
@@ -94,42 +92,6 @@ final case class RestRuleCategory(
   }
 }
 
-final case class RestGroupCategory(
-    id:          Option[NodeGroupCategoryId] = None,
-    name:        Option[String] = None,
-    description: Option[String] = None,
-    parent:      Option[NodeGroupCategoryId] = None
-) {
-
-  def update(category: FullNodeGroupCategory): FullNodeGroupCategory = {
-    val updateId          = id.getOrElse(category.id)
-    val updateName        = name.getOrElse(category.name)
-    val updateDescription = description.getOrElse(category.description)
-    category.copy(
-      id = updateId,
-      name = updateName,
-      description = updateDescription
-    )
-  }
-
-  def create(defaultId: () => NodeGroupCategoryId): Box[FullNodeGroupCategory] = {
-    name match {
-      case Some(name) =>
-        Full(
-          FullNodeGroupCategory(
-            id.getOrElse(defaultId()),
-            name,
-            description.getOrElse(""),
-            Nil,
-            Nil
-          )
-        )
-      case None       =>
-        Failure("Could not create group Category, cause: name is not defined")
-    }
-  }
-}
-
 final case class RestDirective(
     name:             Option[String],
     shortDescription: Option[String],
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/EventLogAPI.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/EventLogAPI.scala
index 1fbddaf5e84..ed2879d7a1a 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/EventLogAPI.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/internal/EventLogAPI.scala
@@ -36,255 +36,298 @@
  */
 
 package com.normation.rudder.rest.internal
-import cats.syntax.all.*
-import com.normation.box.*
+
+import cats.data.NonEmptyList
+import com.normation.errors.*
 import com.normation.eventlog.*
+import com.normation.rudder.api.ApiVersion
+import com.normation.rudder.domain.logger.EventLogsLoggerPure
+import com.normation.rudder.facts.nodes.QueryContext
 import com.normation.rudder.repository.EventLogRepository
-import com.normation.rudder.repository.json.DataExtractor.CompleteJson
-import com.normation.rudder.rest.OldInternalApiAuthz
-import com.normation.rudder.rest.RestExtractorService
-import com.normation.rudder.rest.RestUtils.*
+import com.normation.rudder.rest.ApiModuleProvider
+import com.normation.rudder.rest.ApiPath
+import com.normation.rudder.rest.AuthzToken
+import com.normation.rudder.rest.EventLogApi
+import com.normation.rudder.rest.RudderJsonRequest.*
+import com.normation.rudder.rest.RudderJsonResponse
+import com.normation.rudder.rest.data.RestEventLog
+import com.normation.rudder.rest.data.RestEventLogDetails
+import com.normation.rudder.rest.data.RestEventLogError
+import com.normation.rudder.rest.data.RestEventLogFilter
+import com.normation.rudder.rest.data.RestEventLogFilter.Direction.Asc
+import com.normation.rudder.rest.data.RestEventLogFilter.Direction.Desc
+import com.normation.rudder.rest.data.RestEventLogRollback
+import com.normation.rudder.rest.data.RestEventLogRollback.Action.After
+import com.normation.rudder.rest.data.RestEventLogRollback.Action.Before
+import com.normation.rudder.rest.data.RestEventLogSuccess
+import com.normation.rudder.rest.implicits.*
+import com.normation.rudder.rest.lift.DefaultParams
+import com.normation.rudder.rest.lift.LiftApiModule
+import com.normation.rudder.rest.lift.LiftApiModule0
+import com.normation.rudder.rest.lift.LiftApiModuleProvider
+import com.normation.rudder.rest.lift.LiftApiModuleString
 import com.normation.rudder.services.user.PersonIdentService
-import com.normation.rudder.users.CurrentUser
 import com.normation.rudder.web.services.*
-import com.normation.utils.DateFormaterService
+import com.normation.zio.UnsafeRun
 import doobie.*
 import doobie.implicits.*
-import doobie.implicits.javasql.*
-import net.liftweb.common.*
-import net.liftweb.http.JsonResponse
+import doobie.postgres.implicits.*
+import doobie.util.fragments
+import io.scalaland.chimney.syntax.*
 import net.liftweb.http.LiftResponse
 import net.liftweb.http.Req
-import net.liftweb.http.S
-import net.liftweb.http.rest.RestHelper
-import net.liftweb.json.JsonAST
-import net.liftweb.json.JsonDSL.*
-import net.liftweb.json.JValue
-import net.liftweb.util.Helpers.tryo
-import org.joda.time.DateTime
-import org.joda.time.format.DateTimeFormat
+import zio.ZIO
+import zio.syntax.*
 
 class EventLogAPI(
-    repos:              EventLogRepository,
-    restExtractor:      RestExtractorService,
+    service:            EventLogService,
     eventLogDetail:     EventLogDetailsGenerator,
-    personIdentService: PersonIdentService
-) extends RestHelper with Loggable {
-  implicit class ToSqlTimestamp(d: DateTime) {
-    def toSql = new java.sql.Timestamp(d.getMillis)
-  }
+    translateEventType: EventLogType => String
+) extends LiftApiModuleProvider[EventLogApi] {
+  import EventLogService.*
 
-  def serialize(event: EventLog): JValue = {
-    import net.liftweb.json.JsonDSL.*
+  implicit val translateEventLogType: EventLogType => String   = translateEventType
+  implicit val eventLogDetailsGen:    EventLogDetailsGenerator = eventLogDetail
 
-    (("id"           -> event.id)
-    ~ ("date"        -> DateFormaterService.getDisplayDate(event.creationDate))
-    ~ ("actor"       -> event.principal.name)
-    ~ ("type"        -> S.?("rudder.log.eventType.names." + event.eventType.serialize))
-    ~ ("description" -> eventLogDetail.displayDescription(event).toString)
-    ~ ("hasDetails"  -> (if (event.details != <entry></entry>) true else false)))
-  }
+  override def schemas: ApiModuleProvider[EventLogApi] = EventLogApi
 
-  def errorFormatter(errorMessage: String):                                                     JsonAST.JObject = {
-    (("draw"             -> 0)
-    ~ ("recordsTotal"    -> 0)
-    ~ ("recordsFiltered" -> 0)
-    ~ ("data"            -> "")
-    ~ ("error"           -> errorMessage))
-  }
-  def responseFormater(draw: Int, totalRecord: Long, totalFiltered: Long, logs: Seq[EventLog]): JValue          = {
-    (("draw"             -> draw)
-    ~ ("recordsTotal"    -> totalRecord)
-    ~ ("recordsFiltered" -> totalFiltered)
-    ~ ("data"            -> logs.map(serialize)))
+  override def getLiftEndpoints(): List[LiftApiModule] = {
+    EventLogApi.endpoints.map {
+      case EventLogApi.GetEventLogs       => GetEventLogs
+      case EventLogApi.GetEventLogDetails => GetEventLogDetails
+      case EventLogApi.RollbackEventLog   => RollbackEventLog
+    }
   }
 
-  def getEventLogBySlice(
-      start:    Int,
-      criteria: Option[Fragment],
-      optLimit: Option[Int],
-      orderBy:  List[Fragment],
-      filter:   Option[Fragment]
-  ): Box[Seq[EventLog]] = {
-    val c = criteria.getOrElse(Fragment.const(" 1 = 1 ")) ++ fr" order by ${orderBy.intercalate(fr",")} offset ${start}"
-    repos
-      .getEventLogByCriteria(Some(c), optLimit, Nil, filter)
-      .toBox match {
-      case Full(events) => Full(events)
-      case eb: EmptyBox =>
-        eb ?~! s"Error when trying fetch eventlogs from database for page ${(start / optLimit.getOrElse(1)) + 1}"
+  object GetEventLogs extends LiftApiModule0 {
+    val schema: EventLogApi.GetEventLogs.type = EventLogApi.GetEventLogs
+
+    def process0(
+        version:    ApiVersion,
+        path:       ApiPath,
+        req:        Req,
+        params:     DefaultParams,
+        authzToken: AuthzToken
+    ): LiftResponse = {
+      implicit val prettify: Boolean = params.prettify
+
+      (for {
+        restFilter <- req.fromJson[RestEventLogFilter].toIO
+        res        <- service.getEventLogSlice(restFilter)
+      } yield {
+        (restFilter.draw, res)
+      }).chainError("Error when fetching event logs")
+        .either
+        .runNow
+        .fold(
+          err => RudderJsonResponse.generic.internalError(RestEventLogError(err.fullMsg)),
+          {
+            case (draw, EventLogSlice(events, totalRecord, totalFilter)) =>
+              RudderJsonResponse.LiftJsonResponse(
+                RestEventLogSuccess(draw, totalRecord, totalFilter, events.map(_.transformInto[RestEventLog])),
+                params.prettify,
+                200
+              )
+          }
+        )
     }
   }
 
-  def requestDispatch: PartialFunction[Req, () => Box[LiftResponse]] = {
-    case Post(Nil, req) =>
-      def extractFilterOpt(json: JValue) = {
+  object GetEventLogDetails extends LiftApiModuleString {
+    val schema: EventLogApi.GetEventLogDetails.type = EventLogApi.GetEventLogDetails
+
+    def process(
+        version:    ApiVersion,
+        path:       ApiPath,
+        id:         String,
+        req:        Req,
+        params:     DefaultParams,
+        authzToken: AuthzToken
+    ): LiftResponse = {
+      implicit val qc: QueryContext = authzToken.qc
+      (
         for {
-          value <- CompleteJson.extractJsonString(json, "value")
+          evId    <- id.toLongOption.notOptional("event log ID is not a long integer : " + id)
+          details <- service.getEventLogDetails(evId)
         } yield {
-          if (value == "") {
-            None
-          } else {
-            val v = "%" + value + "%"
-            Some(fr"(temp1.filter ilike ${v} OR temp1.eventtype ilike ${v})")
-          }
+          details
         }
-      }
+      ).chainError(s"Error when getting event log with id '${id}' details")
+        .toLiftResponseOne(
+          params,
+          schema,
+          None
+        )
+    }
+  }
+  object RollbackEventLog   extends LiftApiModuleString {
+    val schema: EventLogApi.RollbackEventLog.type = EventLogApi.RollbackEventLog
 
-      def extractDateTimeOpt(i: String) = {
-        val format = DateTimeFormat.forPattern("YYYY-MM-dd HH:mm:ss")
+    def process(
+        version:    ApiVersion,
+        path:       ApiPath,
+        id:         String,
+        req:        Req,
+        params:     DefaultParams,
+        authzToken: AuthzToken
+    ): LiftResponse = {
+      implicit val qc: QueryContext = authzToken.qc
+      (for {
+        evId    <- id.toLongOption.notOptional("event log ID is not a long integer : " + id)
+        action  <- req.params.get("action") match {
+                     case Some(action :: Nil) =>
+                       RestEventLogRollback.Action
+                         .withNameInsensitiveOption(action)
+                         .notOptional(s"Unknown rollback's action : ${action}")
+                     case Some(actions)       =>
+                       Inconsistency(
+                         s"Only one action is excepted, ${actions.size} found in request : ${actions.mkString(",")}"
+                       ).fail
+                     case None                => Inconsistency("Empty action").fail
+                   }
+        details <- service.rollback(evId, action)
+      } yield {
+        RestEventLogRollback(action, id)
+      }).chainError(s"Error when performing eventlog's rollback with id '${id}'")
+        .toLiftResponseOne(
+          params,
+          schema,
+          None
+        )
+    }
+  }
 
-        if (i == "") {
-          Full(None)
-        } else {
-          tryo(Some(DateTime.parse(i, format)))
-        }
-      }
+}
+
+class EventLogService(
+    repo:                    EventLogRepository,
+    eventLogDetailGenerator: EventLogDetailsGenerator,
+    personIdentService:      PersonIdentService
+) {
+  import EventLogService.*
+
+  def getEventLogSlice(
+      restFilter: RestEventLogFilter
+  ): IOResult[EventLogSlice] = {
+    import restFilter.*
 
-      implicit val prettify: Boolean = restExtractor
-        .extractBoolean("prettify")(req)(identity)
-        .getOrElse(Some(false))
-        .getOrElse(
-          false
+    val dateCriteria =
+      fragments.andOpt(startDate.map(start => fr"creationDate >= ${start}"), endDate.map(end => fr"creationDate <= ${end}"))
+
+    val (criteria, from) = (search.flatMap(_.toFragment), dateCriteria) match {
+      case (None, res)              => (res, None)
+      case (Some(value), None)      =>
+        (
+          Some(value),
+          Some(
+            fr"from ( select eventtype, id, modificationid, principal, creationdate, causeid, severity, reason, data, UNNEST(xpath('string(//entry)',data))::text as filter from eventlog) as temp1"
+          )
+        )
+      case (Some(value), Some(res)) =>
+        (
+          Some(fragments.and(value, res)),
+          Some(
+            fr"from ( select eventtype, id, modificationid, principal, creationdate, causeid, severity, reason, data, UNNEST(xpath('string(//entry)',data))::text as filter from eventlog) as temp1"
+          )
         )
-      implicit val action:   String  = "eventFilterDetails"
-      OldInternalApiAuthz.withWriteAdmin((for {
-        json   <- req.json
-        draw   <- CompleteJson.extractJsonInt(json, "draw")
-        start  <- CompleteJson.extractJsonInt(json, "start")
-        length <- CompleteJson.extractJsonInt(json, "length")
+    }
+    val orderBy          = NonEmptyList
+      .fromList(order.map(_.toFragment).toList)
+      .map(fragments.comma(_))
+      .map(fr"order by" ++ _)
+      .getOrElse(Fragment.empty)
+    val offset           = fr"offset ${start}"
+    val queryCriteria    = Some(
+      // as full criteria the "where" needs a condition
+      // we also need the orderBy here because it should come before the offset
+      criteria.getOrElse(fr"1=1") ++ orderBy ++ offset
+    )
 
-        filter       <- CompleteJson.extractJsonObj(json, "search", extractFilterOpt)
-        optStartDate <- CompleteJson.extractJsonString(json, "startDate", extractDateTimeOpt)
-        optEndDate   <- CompleteJson.extractJsonString(json, "endDate", extractDateTimeOpt)
+    (for {
+      events      <-
+        repo
+          .getEventLogByCriteria(queryCriteria, Some(length), Nil, from)
+          .chainError(s"Error when trying fetch eventlogs from database for page ${(start / length) + 1}")
+      totalRecord <- repo.getEventLogCount(None)
+      totalFilter <- repo.getEventLogCount(criteria, from)
+    } yield {
+      EventLogSlice(events, totalRecord, totalFilter)
+    }).catchSystemErrors
+  }
 
-        order <- CompleteJson.extractJsonArray(json, "order") { json =>
-                   for {
-                     colId <- CompleteJson.extractJsonInt(json, "column")
-                     col   <- colId match {
+  def getEventLogDetails(id: Long)(implicit qc: QueryContext): IOResult[RestEventLogDetails] = {
 
-                                case 0 => Full("id")
-                                case 1 => Full("creationdate")
-                                case 2 => Full("principal")
-                                case 3 => Full("eventtype")
-                                case _ => Failure("not a valid column")
+    (for {
+      event      <- repo.getEventLogById(id)
+      crId       <- ZIO.foreach(event.id)(repo.getEventLogWithChangeRequest(_).notOptional("").map(_._2).catchAll(_ => None.succeed))
+      htmlDetails = eventLogDetailGenerator.displayDetails(event, crId.flatten)
+    } yield {
+      RestEventLogDetails(
+        id.toString,
+        htmlDetails,
+        event.canRollBack
+      )
+    }).catchSystemErrors
+  }
 
-                              }
-                     dir   <- CompleteJson.extractJsonString(json, "dir")
-                     order <- dir.toLowerCase match {
-                                case "desc" => Full("DESC")
-                                case "asc"  => Full("ASC")
-                                case x      => Failure(s"not a valid sorting order: ${x}")
-                              }
-                   } yield {
-                     Fragment.const(s"${col} ${order}")
-                   }
-                 }
+  def rollback(id: Long, action: RestEventLogRollback.Action)(implicit qc: QueryContext): IOResult[Unit] = {
+    (for {
+      event      <- repo.getEventLogById(id).catchSystemErrors
+      rollbackReq = action match {
+                      case After  => eventLogDetailGenerator.RollbackTo
+                      case Before => eventLogDetailGenerator.RollbackBefore
+                    }
+      committer  <- personIdentService.getPersonIdentOrDefault(qc.actor.name)
+      _          <- rollbackReq.action(event, committer, Seq(event), event).toIO
+    } yield ())
+  }
 
-        dateCriteria = (optStartDate, optEndDate) match {
-                         case (None, None)                                        => None
-                         case (Some(start_), None)                                => Some(fr" creationDate >= ${start_.toSql}")
-                         case (None, Some(end_))                                  => Some(fr" creationDate <= ${end_.toSql}")
-                         case (Some(start_), Some(end_)) if end_.isBefore(start_) =>
-                           Some(
-                             fr" creationDate >= ${end_.toSql} and creationDate <= ${start_.toSql}"
-                           )
-                         case (Some(start_), Some(end_))                          =>
-                           Some(
-                             fr" creationDate >= ${start_.toSql} and creationDate <= ${end_.toSql}"
-                           )
-                       }
+}
 
-        (criteria, from) = (filter, dateCriteria) match {
-                             case (None, res)              => (res, None)
-                             case (Some(value), None)      =>
-                               (
-                                 Some(value),
-                                 Some(
-                                   fr" from ( select eventtype, id, modificationid, principal, creationdate, causeid, severity, reason, data, UNNEST(xpath('string(//entry)',data))::text as filter from eventlog) as temp1 "
-                                 )
-                               )
-                             case (Some(value), Some(res)) =>
-                               (
-                                 Some(fr"${value} and ${res}"),
-                                 Some(
-                                   fr" from ( select eventtype, id, modificationid, principal, creationdate, causeid, severity, reason, data, UNNEST(xpath('string(//entry)',data))::text as filter from eventlog) as temp1 "
-                                 )
-                               )
-                           }
+object EventLogService {
+  final case class EventLogSlice(events: Seq[EventLog], totalRecord: Long, totalFilter: Long)
 
-        events      <- getEventLogBySlice(start, criteria, Some(length), order, from)
-        totalRecord <- repos.getEventLogCount(None).toBox
-        totalFilter <- repos.getEventLogCount(criteria, from).toBox
-      } yield {
-        responseFormater(draw, totalRecord, totalFilter, events)
-      }) match {
-        case Full(resp) =>
-          JsonResponse(resp)
-        case eb: EmptyBox =>
-          val fail = eb ?~! "Error when fetching event logs"
-          logger.error(fail.messageChain)
-          JsonResponse(errorFormatter(fail.msg), 500) // we don't want to let the user know about SQL error
-      })
+  /**
+   * Syntax to avoid exposing database query errors in the API response,
+   * since we don't want to let the user know about SQL error.
+   * 
+   * There is no strong guarantee that this catches all system errors, 
+   * especially since errors can be chained !
+   */
+  implicit private class IOResultSystemError[A](io: IOResult[A]) {
+    def catchSystemErrors: IOResult[A] = io.catchSome {
+      case err: SystemError =>
+        EventLogsLoggerPure.error(err.fullMsg) *>
+        Inconsistency("A database error occured").fail
 
-    case Get(id :: "details" :: Nil, req) =>
-      implicit val prettify: Boolean =
-        restExtractor.extractBoolean("prettify")(req)(identity).getOrElse(Some(false)).getOrElse(false)
-      implicit val action:   String  = "eventDetails"
-      OldInternalApiAuthz.withReadAdmin((for {
-        realId     <- Box.tryo(id.toLong)
-        event      <- repos.getEventLogById(realId).toBox
-        crId        = event.id.flatMap(repos.getEventLogWithChangeRequest(_).toBox match {
-                        case Full(Some((_, crId))) => crId
-                        case _                     => None
-                      })
-        htmlDetails = eventLogDetail.displayDetails(event, crId)(CurrentUser.queryContext)
-      } yield {
-        val response = {
-          (("id"           -> id)
-          ~ ("content"     -> htmlDetails.toString())
-          ~ ("canRollback" -> event.canRollBack))
-        }
-        toJsonResponse(None, response)
-      }) match {
-        case Full(resp) => resp
-        case eb: EmptyBox =>
-          val fail = eb ?~! s"Error when getting event log with id '${id}' details"
-          logger.error(fail.messageChain)
-          toJsonError(None, fail.msg) // we don't want to let the user know about SQL error
-      })
+      // in case user had called chainError once on a database call
+      case Chained(msg, err: SystemError) =>
+        EventLogsLoggerPure.error(err.fullMsg) *>
+        Inconsistency(msg).fail
+    }
+  }
 
-    case Get(id :: "details" :: "rollback" :: Nil, req) =>
-      implicit val prettify: Boolean =
-        restExtractor.extractBoolean("prettify")(req)(identity).getOrElse(Some(false)).getOrElse(false)
-      implicit val action:   String  = "eventRollback"
+  /**
+   * Syntax for converting rest filters objects to fragment, as only the service knows about the table and column names.
+   * Some day we would have a repo that expose queries and test the resulting query with type-checking
+   */
+  implicit class SearchOps(search: RestEventLogFilter.Search) {
+    def toFragment: Option[Fragment] = {
+      if (search.value.isEmpty) {
+        None
+      } else {
+        val v = "%" + search.value + "%"
+        Some(fr"(temp1.filter ilike ${v} OR temp1.eventtype ilike ${v})")
+      }
+    }
+  }
 
-      OldInternalApiAuthz.withReadAdmin((for {
-        reqParam     <- req.params.get("action") match {
-                          case Some(actions) if (actions.size == 1) => Full(actions.head)
-                          case Some(actions)                        =>
-                            Failure(s"Only one action is excepted, ${actions.size} found in request : ${actions.mkString(",")}")
-                          case None                                 => Failure("Empty action")
-                        }
-        rollbackReq  <- if (reqParam == "after") Full(eventLogDetail.RollbackTo)
-                        else if (reqParam == "before") Full(eventLogDetail.RollbackBefore)
-                        else Failure(s"Unknown rollback's action : ${reqParam}")
-        idLong       <- Box.tryo(id.toLong)
-        event        <- repos.getEventLogById(idLong).toBox
-        committer    <- personIdentService.getPersonIdentOrDefault(CurrentUser.actor.name).toBox
-        rollbackExec <- rollbackReq.action(event, committer, Seq(event), event)
-      } yield {
-        val r = {
-          (("action" -> reqParam)
-          ~ ("id"    -> id))
-        }
-        toJsonResponse(None, r)
-      }) match {
-        case Full(resp) => resp
-        case eb: EmptyBox =>
-          val fail = eb ?~! s"Error when performing eventlog's rollback with id '${id}'"
-          toJsonError(None, fail.messageChain)
-      })
+  implicit class OrderOps(order: RestEventLogFilter.Order) {
+    // fragment needs to be with constant known column names
+    def toFragment: Fragment = Fragment.const(order.column.entryName) ++ directionFragment
+    private def directionFragment = order.dir match {
+      case Desc => fr"DESC"
+      case Asc  => fr"ASC"
+    }
   }
-  serve("secure" / "api" / "eventlog" prefix requestDispatch)
 }
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ArchiveApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ArchiveApi.scala
index c967b8fa335..edba094b1f2 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ArchiveApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ArchiveApi.scala
@@ -61,8 +61,6 @@ import com.normation.rudder.apidata.implicits.*
 import com.normation.rudder.batch.AsyncDeploymentActor
 import com.normation.rudder.batch.AutomaticStartDeployment
 import com.normation.rudder.configuration.ConfigurationRepository
-import com.normation.rudder.domain.appconfig.FeatureSwitch
-import com.normation.rudder.domain.logger.ApplicationLogger
 import com.normation.rudder.domain.logger.ApplicationLoggerPure
 import com.normation.rudder.domain.nodes.NodeGroup
 import com.normation.rudder.domain.nodes.NodeGroupCategory
@@ -98,9 +96,6 @@ import com.normation.rudder.rest.ApiModuleProvider
 import com.normation.rudder.rest.ApiPath
 import com.normation.rudder.rest.ArchiveApi as API
 import com.normation.rudder.rest.AuthzToken
-import com.normation.rudder.rest.EndpointSchema0
-import com.normation.rudder.rest.RudderJsonResponse
-import com.normation.rudder.rest.RudderJsonResponse.ResponseSchema
 import com.normation.rudder.rest.implicits.*
 import com.normation.rudder.rest.lift.ImportAnswer.*
 import com.normation.rudder.rule.category.RuleCategoryId
@@ -127,32 +122,6 @@ import zio.*
 import zio.json.*
 import zio.syntax.*
 
-/*
- * Machinery to enable/disable the API given the value of the feature switch in config service.
- * If disabled, always return an error with the info about how to enable it.
- */
-final case class FeatureSwitch0[A <: LiftApiModule0](enable: A, disable: A)(featureSwitchState: IOResult[FeatureSwitch])
-    extends LiftApiModule0 {
-  override val schema: EndpointSchema0 = enable.schema
-  override def process0(
-      version:    ApiVersion,
-      path:       ApiPath,
-      req:        Req,
-      params:     DefaultParams,
-      authzToken: AuthzToken
-  ): LiftResponse = {
-    featureSwitchState.either.runNow match {
-      case Left(err)                     =>
-        ApplicationLogger.error(err.fullMsg)
-        RudderJsonResponse.internalError(None, ResponseSchema.fromSchema(schema), err.fullMsg)(params.prettify).toResponse
-      case Right(FeatureSwitch.Disabled) =>
-        disable.process0(version, path, req, params, authzToken)
-      case Right(FeatureSwitch.Enabled)  =>
-        enable.process0(version, path, req, params, authzToken)
-    }
-  }
-}
-
 sealed trait ArchiveScope extends EnumEntry          { def value: String }
 object ArchiveScope       extends Enum[ArchiveScope] {
 
@@ -206,12 +175,10 @@ class ArchiveApi(
   def schemas: ApiModuleProvider[API] = API
 
   def getLiftEndpoints(): List[LiftApiModule] = {
-    API.endpoints.map(e => {
-      e match {
-        case API.Import       => Import
-        case API.ExportSimple => ExportSimple
-      }
-    })
+    API.endpoints.map {
+      case API.Import       => Import
+      case API.ExportSimple => ExportSimple
+    }
   }
 
   /*
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/CampaignApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/CampaignApi.scala
index f9e0ce98757..c1cad0858c8 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/CampaignApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/CampaignApi.scala
@@ -19,7 +19,6 @@ import com.normation.rudder.rest.ApiPath
 import com.normation.rudder.rest.AuthzToken
 import com.normation.rudder.rest.CampaignApi as API
 import com.normation.rudder.rest.OneParam
-import com.normation.rudder.rest.RestExtractorService
 import com.normation.rudder.rest.implicits.*
 import com.normation.utils.DateFormaterService
 import com.normation.utils.StringUuidGenerator
@@ -36,28 +35,26 @@ class CampaignApi(
     campaignSerializer:      CampaignSerializer,
     campaignEventRepository: CampaignEventRepository,
     mainCampaignService:     MainCampaignService,
-    restExtractorService:    RestExtractorService,
     stringUuidGenerator:     StringUuidGenerator
 ) extends LiftApiModuleProvider[API] {
 
   def schemas: ApiModuleProvider[API] = API
 
   def getLiftEndpoints(): List[LiftApiModule] = {
-    API.endpoints.map(e => {
-      e match {
-        case API.SaveCampaign              => SaveCampaign
-        case API.ScheduleCampaign          => ScheduleCampaign
-        case API.SaveCampaignEvent         => SaveCampaignEvent
-        case API.GetCampaignEventDetails   => GetCampaignEventDetails
-        case API.GetCampaignEvents         => GetCampaignEvents
-        case API.GetCampaignDetails        => GetCampaignDetails
-        case API.GetCampaignEventsForModel => GetAllEventsForCampaign
-        case API.GetCampaigns              => GetCampaigns
-        case API.DeleteCampaign            => DeleteCampaign
-        case API.DeleteCampaignEvent       => DeleteCampaignEvent
-      }
-    })
+    API.endpoints.map {
+      case API.SaveCampaign              => SaveCampaign
+      case API.ScheduleCampaign          => ScheduleCampaign
+      case API.SaveCampaignEvent         => SaveCampaignEvent
+      case API.GetCampaignEventDetails   => GetCampaignEventDetails
+      case API.GetCampaignEvents         => GetCampaignEvents
+      case API.GetCampaignDetails        => GetCampaignDetails
+      case API.GetCampaignEventsForModel => GetAllEventsForCampaign
+      case API.GetCampaigns              => GetCampaigns
+      case API.DeleteCampaign            => DeleteCampaign
+      case API.DeleteCampaignEvent       => DeleteCampaignEvent
+    }
   }
+
   object GetCampaigns extends LiftApiModule0 {
     val schema: API.GetCampaigns.type = API.GetCampaigns
 
@@ -79,6 +76,7 @@ class CampaignApi(
 
     }
   }
+
   object GetCampaignDetails extends LiftApiModule {
     val schema: OneParam = API.GetCampaignDetails
 
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala
index 2eafb7df233..1d867c14d3d 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ComplianceApi.scala
@@ -110,30 +110,26 @@ class ComplianceApi(
 
   /*
    * The actual builder for the compliance API.
-   * Depends of authz method and supported version.
+   * Depends on authz method and supported version.
    *
    * It's quite verbose, but it's the only way I found to
    * get the exhaustivity check and be sure that ALL
    * endpoints are processed.
    */
   def getLiftEndpoints(): List[LiftApiModule] = {
-    API.endpoints
-      .map(e => {
-        e match {
-          case API.GetRulesCompliance             => GetRules
-          case API.GetRulesComplianceId           => GetRuleId
-          case API.GetNodesCompliance             => GetNodes
-          case API.GetNodeSystemCompliance        => GetNodeSystemCompliance
-          case API.GetNodeComplianceId            => GetNodeId
-          case API.GetGlobalCompliance            => GetGlobal
-          case API.GetDirectiveComplianceId       => GetDirectiveId
-          case API.GetDirectivesCompliance        => GetDirectives
-          case API.GetNodeGroupComplianceSummary  => GetNodeGroupSummary
-          case API.GetNodeGroupComplianceId       => GetNodeGroupId
-          case API.GetNodeGroupComplianceTargetId => GetNodeGroupTargetId
-        }
-      })
-      .toList
+    API.endpoints.map {
+      case API.GetRulesCompliance             => GetRules
+      case API.GetRulesComplianceId           => GetRuleId
+      case API.GetNodesCompliance             => GetNodes
+      case API.GetNodeSystemCompliance        => GetNodeSystemCompliance
+      case API.GetNodeComplianceId            => GetNodeId
+      case API.GetGlobalCompliance            => GetGlobal
+      case API.GetDirectiveComplianceId       => GetDirectiveId
+      case API.GetDirectivesCompliance        => GetDirectives
+      case API.GetNodeGroupComplianceSummary  => GetNodeGroupSummary
+      case API.GetNodeGroupComplianceId       => GetNodeGroupId
+      case API.GetNodeGroupComplianceTargetId => GetNodeGroupTargetId
+    }
   }
 
   object GetRules extends LiftApiModule0 {
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala
index 931f9f5555f..702614b9c97 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/DirectiveApi.scala
@@ -38,7 +38,6 @@
 package com.normation.rudder.rest.lift
 
 import com.normation.GitVersion
-import com.normation.box.*
 import com.normation.cfclerk.domain.Technique
 import com.normation.cfclerk.domain.TechniqueId
 import com.normation.cfclerk.domain.TechniqueName
@@ -65,7 +64,6 @@ import com.normation.rudder.domain.policies.Directive
 import com.normation.rudder.domain.policies.DirectiveId
 import com.normation.rudder.domain.policies.DirectiveUid
 import com.normation.rudder.domain.policies.ModifyToDirectiveDiff
-import com.normation.rudder.domain.workflows.ChangeRequestId
 import com.normation.rudder.facts.nodes.ChangeContext
 import com.normation.rudder.facts.nodes.QueryContext
 import com.normation.rudder.repository.FullActiveTechniqueCategory
@@ -75,8 +73,6 @@ import com.normation.rudder.rest.*
 import com.normation.rudder.rest.ApiPath
 import com.normation.rudder.rest.AuthzToken
 import com.normation.rudder.rest.DirectiveApi as API
-import com.normation.rudder.rest.RestExtractorService
-import com.normation.rudder.rest.RestUtils
 import com.normation.rudder.rest.data.*
 import com.normation.rudder.rest.implicits.*
 import com.normation.rudder.services.workflows.ChangeRequestService
@@ -91,218 +87,50 @@ import com.softwaremill.quicklens.*
 import net.liftweb.common.*
 import net.liftweb.http.LiftResponse
 import net.liftweb.http.Req
-import net.liftweb.json.JArray
-import net.liftweb.json.JsonAST.JValue
 import org.joda.time.DateTime
 import zio.*
 import zio.syntax.*
 
 class DirectiveApi(
-    readDirective:        RoDirectiveRepository,
-    restExtractorService: RestExtractorService,
-    zioJsonExtractor:     ZioJsonExtractor,
-    uuidGen:              StringUuidGenerator,
-    serviceV2:            DirectiveApiService2,
-    serviceV14:           DirectiveApiService14
+    zioJsonExtractor: ZioJsonExtractor,
+    uuidGen:          StringUuidGenerator,
+    service:          DirectiveApiService14
 ) extends LiftApiModuleProvider[API] {
 
-  private val dataName = "directives"
-
   def schemas: ApiModuleProvider[API] = API
 
-  def response(function: Box[JValue], req: Req, errorMessage: String, id: Option[String])(implicit
-      action: String
-  ): LiftResponse = {
-    RestUtils.response(restExtractorService, dataName, id)(function, req, errorMessage)
-  }
-
-  type ActionType = RestUtils.ActionType
-  def actionResponse(function: Box[ActionType], req: Req, errorMessage: String, id: Option[String], actor: EventActor)(implicit
-      action: String
-  ): LiftResponse = {
-    RestUtils.actionResponse2(restExtractorService, dataName, uuidGen, id)(function, req, errorMessage)(action, actor)
-  }
-
-  type WorkflowType = RestUtils.WorkflowType
-  def workflowResponse(
-      function:     Box[WorkflowType],
-      req:          Req,
-      errorMessage: String,
-      id:           Option[String],
-      defaultName:  String,
-      actor:        EventActor
-  )(implicit action: String): LiftResponse = {
-    RestUtils.workflowResponse2(restExtractorService, dataName, uuidGen, id)(function, req, errorMessage, defaultName)(
-      action,
-      actor
-    )
-  }
-
   def getLiftEndpoints(): List[LiftApiModule] = {
-    API.endpoints
-      .map(e => {
-        e match {
-          case API.DirectiveTree      => DirectiveTree
-          case API.ListDirectives     => ChooseApi0(ListDirective, ListDirectiveV14)
-          case API.DirectiveDetails   => ChooseApiN(DirectiveDetails, DirectiveDetailsV14)
-          case API.DirectiveRevisions => DirectiveRevisionsV14
-          case API.CreateDirective    => ChooseApi0(CreateDirective, CreateDirectiveV14)
-          case API.UpdateDirective    => ChooseApiN(UpdateDirective, UpdateDirectiveV14)
-          case API.DeleteDirective    => ChooseApiN(DeleteDirective, DeleteDirectiveV14)
-          case API.CheckDirective     => ChooseApiN(CheckDirective, CheckDirectiveV14)
-        }
-      })
-      .toList
-  }
-
-  object ListDirective extends LiftApiModule0 {
-    val schema: API.ListDirectives.type = API.ListDirectives
-    val restExtractor = restExtractorService
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      implicit val action = "listDirectives"
-      response(serviceV2.listDirectives(), req, "Could not fetch list of Directives", None)
+    API.endpoints.map {
+      case API.DirectiveTree      => DirectiveTree
+      case API.ListDirectives     => ListDirective
+      case API.DirectiveDetails   => DirectiveDetails
+      case API.DirectiveRevisions => DirectiveRevisions
+      case API.CreateDirective    => CreateDirective
+      case API.UpdateDirective    => UpdateDirective
+      case API.DeleteDirective    => DeleteDirective
+      case API.CheckDirective     => CheckDirective
     }
   }
 
-  object DirectiveDetails extends LiftApiModuleString {
-    val schema: API.DirectiveDetails.type = API.DirectiveDetails
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      implicit val action = "directiveDetails"
-      response(serviceV2.directiveDetails(DirectiveUid(id)), req, s"Could not find Directive '$id' details", Some(id))
-    }
-  }
-
-  object CreateDirective extends LiftApiModule0 {
-    val schema: API.CreateDirective.type = API.CreateDirective
-    val restExtractor = restExtractorService
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      var action   = "createDirective"
-      val id       = restExtractor.extractId(req)(x => Full(DirectiveUid(x))).map(_.getOrElse(DirectiveUid(uuidGen.newUuid)))
-      val response = for {
-        restDirective <- restExtractor.extractDirective(req) ?~! s"Could not extract values from request"
-        directiveId   <- id
-        optCloneId    <- restExtractor.extractString("source")(req)(x => Full(DirectiveUid(x)))
-        result        <- optCloneId match {
-                           case None          =>
-                             serviceV2.createDirective(directiveId, restDirective)
-                           case Some(cloneId) =>
-                             action = "cloneDirective"
-                             serviceV2.cloneDirective(directiveId, restDirective, cloneId)
-                         }
-      } yield {
-        result
-      }
-
-      actionResponse(response, req, "Could not create Directive", id.map(_.value), authzToken.qc.actor)(action)
-    }
-  }
-
-  object DeleteDirective extends LiftApiModuleString {
-    val schema: API.DeleteDirective.type = API.DeleteDirective
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      implicit val qc: QueryContext = authzToken.qc
-      implicit val action = "deleteDirective"
-      workflowResponse(
-        serviceV2.deleteDirective(DirectiveUid(id)),
-        req,
-        s"Could not delete Directive '$id'",
-        Some(id),
-        s"Delete Directive '${id}' from API",
-        authzToken.qc.actor
-      )
-    }
-  }
-
-  object CheckDirective extends LiftApiModuleString {
-    val schema: API.CheckDirective.type = API.CheckDirective
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      val directiveId     = DirectiveUid(id)
-      implicit val action = "checkDirective"
-      val result          = for {
-        restDirective <- restExtractor.extractDirective(req) ?~! s"Could not extract values from request."
-        result        <- serviceV2.checkDirective(directiveId, restDirective)
-      } yield {
-        result
-      }
-      response(result, req, s"Could not check Directive '${id}' update", Some(id))
-    }
-  }
-
-  object UpdateDirective extends LiftApiModuleString {
-    val schema: API.UpdateDirective.type = API.UpdateDirective
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      val directiveId = DirectiveUid(id)
-      implicit val qc: QueryContext = authzToken.qc
-      implicit val action = "updateDirective"
-      val response        = for {
-        restDirective <- restExtractor.extractDirective(req) ?~! s"Could not extract values from request."
-        result        <- serviceV2.updateDirective(directiveId, restDirective)
-      } yield {
-        result
-      }
-
-      workflowResponse(
-        response,
-        req,
-        s"Could not update Directive '${id}'",
-        Some(id),
-        s"Update Directive '${id}' from API",
-        authzToken.qc.actor
-      )
-    }
-  }
-
-  object ListDirectiveV14 extends LiftApiModule0 {
+  object ListDirective extends LiftApiModule0 {
     val schema:                                                                                                API.ListDirectives.type = API.ListDirectives
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse            = {
-      serviceV14.listDirectives().toLiftResponseList(params, schema)
+      service.listDirectives().toLiftResponseList(params, schema)
     }
   }
-  object DirectiveTree    extends LiftApiModule0 {
+  object DirectiveTree extends LiftApiModule0 {
     val schema:                                                                                                API.DirectiveTree.type = API.DirectiveTree
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse           = {
       (for {
-        includeSystem <- restExtractorService.extractBoolean("includeSystem")(req)(identity).toIO
-        res           <- serviceV14.directiveTree(includeSystem.getOrElse(false))
+        includeSystem <- zioJsonExtractor.extractIncludeSystem(req).toIO
+        res           <- service.directiveTree(includeSystem.getOrElse(false))
       } yield {
         res
       }).toLiftResponseOne(params, schema, _ => None)
     }
   }
 
-  object DirectiveDetailsV14 extends LiftApiModuleString {
+  object DirectiveDetails extends LiftApiModuleString {
     val schema: API.DirectiveDetails.type = API.DirectiveDetails
     def process(
         version:    ApiVersion,
@@ -314,12 +142,12 @@ class DirectiveApi(
     ): LiftResponse = {
       (for {
         did <- DirectiveId.parse(id).toIO
-        res <- serviceV14.directiveDetails(did)
+        res <- service.directiveDetails(did)
       } yield res).toLiftResponseOne(params, schema, d => Some(d.id))
     }
   }
 
-  object DirectiveRevisionsV14 extends LiftApiModuleString {
+  object DirectiveRevisions extends LiftApiModuleString {
     val schema: API.DirectiveRevisions.type = API.DirectiveRevisions
     def process(
         version:    ApiVersion,
@@ -329,18 +157,18 @@ class DirectiveApi(
         params:     DefaultParams,
         authzToken: AuthzToken
     ): LiftResponse = {
-      serviceV14.directiveRevisions(DirectiveUid(id)).toLiftResponseList(params, schema)
+      service.directiveRevisions(DirectiveUid(id)).toLiftResponseList(params, schema)
     }
   }
 
-  object CreateDirectiveV14 extends LiftApiModule0 {
+  object CreateDirective extends LiftApiModule0 {
     val schema:                                                                                                API.CreateDirective.type = API.CreateDirective
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse             = {
 
       (for {
         restDirective <-
           zioJsonExtractor.extractDirective(req).chainError(s"Could not extract directive parameters from request").toIO
-        result        <- serviceV14.createOrCloneDirective(
+        result        <- service.createOrCloneDirective(
                            restDirective,
                            restDirective.id.map(_.uid).getOrElse(DirectiveUid(uuidGen.newUuid)),
                            restDirective.source,
@@ -355,7 +183,7 @@ class DirectiveApi(
     }
   }
 
-  object UpdateDirectiveV14 extends LiftApiModuleString {
+  object UpdateDirective extends LiftApiModuleString {
     val schema: API.UpdateDirective.type = API.UpdateDirective
     def process(
         version:    ApiVersion,
@@ -369,14 +197,14 @@ class DirectiveApi(
       (for {
         id            <- DirectiveId.parse(sid).toIO
         restDirective <- zioJsonExtractor.extractDirective(req).chainError(s"Could not extract a directive from request.").toIO
-        result        <- serviceV14.updateDirective(restDirective.copy(id = Some(id)), params, authzToken.qc.actor)
+        result        <- service.updateDirective(restDirective.copy(id = Some(id)), params, authzToken.qc.actor)
       } yield {
         result
       }).toLiftResponseOne(params, schema, s => Some(s.id))
     }
   }
 
-  object DeleteDirectiveV14 extends LiftApiModuleString {
+  object DeleteDirective extends LiftApiModuleString {
     val schema: API.DeleteDirective.type = API.DeleteDirective
     def process(
         version:    ApiVersion,
@@ -387,11 +215,11 @@ class DirectiveApi(
         authzToken: AuthzToken
     ): LiftResponse = {
       implicit val qc: QueryContext = authzToken.qc
-      serviceV14.deleteDirective(DirectiveUid(id), params, authzToken.qc.actor).toLiftResponseOne(params, schema, s => Some(s.id))
+      service.deleteDirective(DirectiveUid(id), params, authzToken.qc.actor).toLiftResponseOne(params, schema, s => Some(s.id))
     }
   }
 
-  object CheckDirectiveV14 extends LiftApiModuleString {
+  object CheckDirective extends LiftApiModuleString {
     val schema: API.CheckDirective.type = API.CheckDirective
     def process(
         version:    ApiVersion,
@@ -404,7 +232,7 @@ class DirectiveApi(
       val directiveId = DirectiveUid(id)
       (for {
         restDirective <- zioJsonExtractor.extractDirective(req).chainError(s"Could not extract values from request.").toIO
-        result        <- serviceV14.checkDirective(directiveId, restDirective)
+        result        <- service.checkDirective(directiveId, restDirective)
       } yield {
         result
       }).toLiftResponseOne(params, schema, s => Some(s.id))
@@ -436,301 +264,6 @@ object DirectiveApiService {
 
 }
 
-class DirectiveApiService2(
-    readDirective:        RoDirectiveRepository,
-    writeDirective:       WoDirectiveRepository,
-    uuidGen:              StringUuidGenerator,
-    asyncDeploymentAgent: AsyncDeploymentActor,
-    workflowLevelService: WorkflowLevelService,
-    restExtractor:        RestExtractorService,
-    editorService:        DirectiveEditorService,
-    restDataSerializer:   RestDataSerializer,
-    techniqueRepository:  TechniqueRepository
-) extends Loggable {
-
-  def serialize: (Technique, Directive, Option[ChangeRequestId]) => JValue = restDataSerializer.serializeDirective _
-
-  private def createChangeRequestAndAnswer(
-      diff:            ChangeRequestDirectiveDiff,
-      technique:       Technique,
-      activeTechnique: ActiveTechnique,
-      directive:       Directive,
-      initialState:    Option[Directive],
-      action:          DGModAction
-  )(actor: EventActor, reason: Option[String], crName: String, crDescription: String)(implicit qc: QueryContext): Box[JValue] = {
-    val change = DirectiveChangeRequest(
-      action,
-      technique.id.name,
-      activeTechnique.id,
-      technique.rootSection,
-      directive,
-      initialState,
-      Nil,
-      Nil
-    )
-    implicit val cc: ChangeContext = ChangeContext(
-      ModificationId(uuidGen.newUuid),
-      actor,
-      new DateTime(),
-      reason,
-      None,
-      qc.nodePerms
-    )
-
-    for {
-      workflow     <- workflowLevelService.getForDirective(actor, change)
-      cr            = ChangeRequestService.createChangeRequestFromDirective(
-                        crName,
-                        crDescription,
-                        technique.id.name,
-                        Some(technique.rootSection),
-                        directive.id,
-                        initialState,
-                        diff,
-                        actor,
-                        reason
-                      )
-      id           <- workflow.startWorkflow(
-                        cr
-                      ) ?~! s"Could not start workflow for change request creation on Directive '${directive.name}'"
-      optCrId       = if (workflow.needExternalValidation()) Some(id) else None
-      jsonDirective = JArray(List(serialize(technique, directive, optCrId)))
-    } yield {
-      jsonDirective
-    }
-  }
-
-  def listDirectives(): Box[JValue] = {
-    for {
-      fullLibrary         <- readDirective.getFullDirectiveLibrary().toBox ?~! "Could not fetch Directives"
-      atDirectives         = fullLibrary.allDirectives.values.filter(!_._2.isSystem)
-      serializedDirectives = (for {
-                               (activeTechnique, directive) <- atDirectives
-                               activeTechniqueId             = TechniqueId(activeTechnique.techniqueName, directive.techniqueVersion)
-                               technique                    <- Box(
-                                                                 techniqueRepository.get(activeTechniqueId)
-                                                               ) ?~! "No Technique with ID=%s found in reference library.".format(activeTechniqueId)
-                             } yield {
-                               serialize(technique, directive, None)
-                             })
-    } yield {
-      JArray(serializedDirectives.toList)
-    }
-  }
-
-  private def actualDirectiveCreation(
-      restDirective:   RestDirective,
-      baseDirective:   Directive,
-      activeTechnique: ActiveTechnique,
-      technique:       Technique
-  )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = {
-    val newDirective = restDirective.updateDirective(baseDirective)
-    val modId        = ModificationId(uuidGen.newUuid)
-    for {
-      // Check if a directive exists with the current id
-      _ <- readDirective.getDirective(newDirective.id.uid).toBox match {
-             case Full(None)    =>
-               Full("ok")
-             case Full(Some(_)) =>
-               Failure(s"Cannot create a new Directive with id '${newDirective.id.uid.value}' already exists")
-             case eb: EmptyBox =>
-               val fail =
-                 eb ?~! s"Error when checking existence of directive with id ${newDirective.id.uid.value}, before trying to create it"
-               fail
-           }
-
-      // Check parameters of the new Directive
-      _ <- (for {
-             // Two step process, could be simplified
-             paramEditor       <- editorService.get(technique.id, newDirective.id.uid, newDirective.parameters)
-             checkedParameters <- traverse(paramEditor.mapValueSeq.toSeq)(checkParameters(paramEditor))
-           } yield { checkedParameters.toMap }) ?~ (s"Error with directive Parameters")
-
-      saveDiff <- writeDirective
-                    .saveDirective(activeTechnique.id, newDirective, modId, actor, reason)
-                    .toBox ?~! (s"Could not save Directive ${newDirective.id.uid.value}")
-    } yield {
-      // We need to deploy only if there is a saveDiff, that says that a deployment is needed
-      if (saveDiff.map(_.needDeployment).getOrElse(false)) {
-        asyncDeploymentAgent ! AutomaticStartDeployment(modId, actor)
-      }
-      val jsonDirective = List(serialize(technique, newDirective, None))
-      JArray(jsonDirective)
-    }
-  }
-
-  def cloneDirective(
-      directiveId:   DirectiveUid,
-      restDirective: RestDirective,
-      source:        DirectiveUid
-  ): Box[(EventActor, ModificationId, Option[String]) => Box[JValue]] = {
-    def checkTechniqueVersion(
-        techniqueRepository: TechniqueRepository,
-        techniqueName:       TechniqueName,
-        techniqueVersion:    Option[TechniqueVersion]
-    ): PureResult[Option[TechniqueVersion]] = {
-      techniqueVersion match {
-        case Some(version) =>
-          techniqueRepository.getTechniqueVersions(techniqueName).find(_ == version) match {
-            case Some(version) => Right(Some(version))
-            case None          => Left(Inconsistency(s" version ${version} of Technique ${techniqueName}  is not valid"))
-          }
-        case None          => Right(None)
-      }
-    }
-    for {
-      name                                          <- Box(restDirective.name) ?~! s"Directive name is not defined in request data."
-      (technique, activeTechnique, sourceDirective) <-
-        readDirective
-          .getDirectiveWithContext(source)
-          .notOptional(s"Cannot find Directive ${source.value} to use as clone base.")
-          .toBox
-      version                                       <- checkTechniqueVersion(techniqueRepository, technique.id.name, restDirective.techniqueVersion)
-                                                         .chainError(s"Cannot find a valid technique version")
-                                                         .toBox
-      newDirective                                   = restDirective.copy(enabled = Some(false), techniqueVersion = version)
-      baseDirective                                  = sourceDirective.modify(_.id.uid).setTo(directiveId)
-    } yield {
-      actualDirectiveCreation(newDirective, baseDirective, activeTechnique, technique) _
-    }
-  }
-
-  def createDirective(
-      directiveId:   DirectiveUid,
-      restDirective: RestDirective
-  ): Box[(EventActor, ModificationId, Option[String]) => Box[JValue]] = {
-    for {
-      name            <- Box(restDirective.name) ?~! s"Directive name is not defined in request data."
-      technique       <- DirectiveApiService
-                           .extractTechnique(techniqueRepository, restDirective.techniqueName, restDirective.techniqueVersion)
-                           .chainError(s"Technique is not correctly defined in request data.")
-                           .toBox
-      activeTechnique <- readDirective
-                           .getActiveTechnique(technique.id.name)
-                           .notOptional(s"Technique ${technique.id.serialize} cannot be found.")
-                           .toBox
-      baseDirective    = Directive(
-                           DirectiveId(directiveId, GitVersion.DEFAULT_REV),
-                           technique.id.version,
-                           Map(),
-                           name,
-                           "",
-                           None,
-                           _isEnabled = true
-                         )
-      result           = actualDirectiveCreation(restDirective, baseDirective, activeTechnique, technique) _
-    } yield {
-      result
-    }
-  }
-
-  def directiveDetails(id: DirectiveUid): Box[JValue] = {
-    for {
-      (technique, activeTechnique, directive) <-
-        readDirective.getDirectiveWithContext(id).notOptional(s"Could not find Directive ${id.value}").toBox
-    } yield {
-      JArray(List(serialize(technique, directive, None)))
-    }
-  }
-
-  def deleteDirective(
-      id: DirectiveUid
-  )(implicit qc: QueryContext): Box[(EventActor, Option[String], String, String) => Box[JValue]] = {
-    for {
-      (technique, activeTechnique, directive) <-
-        readDirective.getDirectiveWithContext(id).notOptional(s"Could not find Directive ${id.value}").toBox
-      deleteDirectiveDiff                      = DeleteDirectiveDiff(technique.id.name, directive)
-      result                                   = createChangeRequestAndAnswer(
-                                                   deleteDirectiveDiff,
-                                                   technique,
-                                                   activeTechnique,
-                                                   directive,
-                                                   Some(directive),
-                                                   DGModAction.Delete
-                                                 ) _
-    } yield {
-      result
-    }
-  }
-
-  // A function to check if Variables passed as parameter are correct
-  private def checkParameters(paramEditor: DirectiveEditor)(parameterValues: (String, Seq[String])) = {
-    try {
-      val s = Seq((paramEditor.variableSpecs(parameterValues._1).toVariable(parameterValues._2)))
-      RudderLDAPConstants.variableToSeq(s)
-      Full(parameterValues)
-    } catch {
-      case e: Exception =>
-        Failure(s"Parameter '${parameterValues._1}' value is not valid, values are: ${parameterValues._2
-            .mkString("[ ", ", ", " ]")} : ${e.getMessage()}")
-    }
-  }
-
-  private def updateDirectiveModel(directiveId: DirectiveUid, restDirective: RestDirective) = {
-    for {
-      (oldTechnique, activeTechnique, oldDirective) <-
-        readDirective.getDirectiveWithContext(directiveId).notOptional(s"Could not find Directive ${directiveId.value}").toBox
-
-      // Check if Technique version is changed (migration)
-      updatedTechniqueId                             = TechniqueId(oldTechnique.id.name, restDirective.techniqueVersion.getOrElse(oldTechnique.id.version))
-      updatedTechnique                              <- (
-                                                         if (updatedTechniqueId.version == oldTechnique.id.version) {
-                                                           Full(oldTechnique)
-                                                         } else {
-                                                           Box(techniqueRepository.get(updatedTechniqueId))
-                                                         }
-                                                       ) ?~ s"Could not find technique ${updatedTechniqueId.name.value} with version ${updatedTechniqueId.version.serialize}."
-
-      updatedDirective = restDirective.updateDirective(oldDirective)
-      // Check parameters of the new Directive with the current technique version, It will check that parameters are ok with the new technique
-      newParameters   <- (for {
-                           // Two step process, could be simplified
-                           paramEditor       <- editorService.get(updatedTechniqueId, directiveId, updatedDirective.parameters)
-                           checkedParameters <- traverse(paramEditor.mapValueSeq.toSeq)(checkParameters(paramEditor))
-                         } yield { checkedParameters.toMap }) ?~ (s"Error with directive Parameters")
-    } yield {
-      val beforeState = DirectiveState(oldTechnique, oldDirective)
-      val afterState  = DirectiveState(updatedTechnique, updatedDirective.copy(parameters = newParameters))
-      DirectiveUpdate(activeTechnique, beforeState, afterState)
-    }
-  }
-
-  def checkDirective(directiveId: DirectiveUid, restDirective: RestDirective): Box[JValue] = {
-    for {
-      directiveUpdate <- updateDirectiveModel(directiveId, restDirective)
-    } yield {
-      val updatedTechnique = directiveUpdate.after.technique
-      val updatedDirective = directiveUpdate.after.directive
-      val jsonDirective    = List(serialize(updatedTechnique, updatedDirective, None))
-      JArray(jsonDirective)
-    }
-  }
-
-  def updateDirective(
-      directiveId:   DirectiveUid,
-      restDirective: RestDirective
-  )(implicit qc: QueryContext): Box[(EventActor, Option[String], String, String) => Box[JValue]] = {
-    for {
-      directiveUpdate <- updateDirectiveModel(directiveId, restDirective)
-
-      updatedTechnique = directiveUpdate.after.technique
-      updatedDirective = directiveUpdate.after.directive
-      oldTechnique     = directiveUpdate.before.technique
-      oldDirective     = directiveUpdate.before.directive
-      diff             = ModifyToDirectiveDiff(updatedTechnique.id.name, updatedDirective, Some(oldTechnique.rootSection))
-    } yield {
-      createChangeRequestAndAnswer(
-        diff,
-        updatedTechnique,
-        directiveUpdate.activeTechnique,
-        updatedDirective,
-        Some(oldDirective),
-        DGModAction.Update
-      ) _
-    }
-  }
-}
-
 class DirectiveApiService14(
     readDirective:        RoDirectiveRepository,
     configRepository:     ConfigurationRepository,
@@ -743,8 +276,6 @@ class DirectiveApiService14(
     techniqueRepository:  TechniqueRepository
 ) {
 
-  def serialize: (Technique, Directive, Option[ChangeRequestId]) => JValue = restDataSerializer.serializeDirective _
-
   def directiveTree(includeSystem: Boolean): IOResult[JRDirectiveTreeCategory] = {
     def filterSystem(cat: FullActiveTechniqueCategory): FullActiveTechniqueCategory = {
       cat.copy(
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala
index c18da8d5ced..f612783704f 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/GroupsApi.scala
@@ -37,21 +37,20 @@
 
 package com.normation.rudder.rest.lift
 
-import com.normation.box.*
 import com.normation.errors.*
 import com.normation.eventlog.EventActor
 import com.normation.eventlog.ModificationId
 import com.normation.rudder.api.ApiVersion
-import com.normation.rudder.apidata.FullDetails
 import com.normation.rudder.apidata.JsonQueryObjects.*
 import com.normation.rudder.apidata.JsonResponseObjects.*
-import com.normation.rudder.apidata.MinimalDetails
 import com.normation.rudder.apidata.RenderInheritedProperties
 import com.normation.rudder.apidata.RestDataSerializer
 import com.normation.rudder.apidata.ZioJsonExtractor
 import com.normation.rudder.apidata.implicits.*
 import com.normation.rudder.batch.AsyncDeploymentActor
 import com.normation.rudder.batch.AutomaticStartDeployment
+import com.normation.rudder.config.ReasonBehavior
+import com.normation.rudder.config.UserPropertyService
 import com.normation.rudder.domain.nodes.*
 import com.normation.rudder.domain.properties.FailedNodePropertyHierarchy
 import com.normation.rudder.domain.properties.SuccessNodePropertyHierarchy
@@ -66,38 +65,29 @@ import com.normation.rudder.repository.RoNodeGroupRepository
 import com.normation.rudder.repository.WoNodeGroupRepository
 import com.normation.rudder.rest.*
 import com.normation.rudder.rest.GroupApi as API
-import com.normation.rudder.rest.RestExtractorService
-import com.normation.rudder.rest.RestUtils.*
-import com.normation.rudder.rest.data.*
+import com.normation.rudder.rest.RudderJsonRequest.*
 import com.normation.rudder.rest.implicits.*
 import com.normation.rudder.services.queries.CmdbQueryParser
 import com.normation.rudder.services.queries.QueryProcessor
 import com.normation.rudder.services.workflows.*
-import com.normation.rudder.users.UserService
 import com.normation.utils.StringUuidGenerator
-import com.normation.zio.*
-import net.liftweb.common.*
 import net.liftweb.http.LiftResponse
 import net.liftweb.http.Req
-import net.liftweb.json.*
-import net.liftweb.json.JsonDSL.*
 import org.joda.time.DateTime
 import zio.Chunk
 import zio.ZIO
 import zio.syntax.*
 
 class GroupsApi(
-    readGroup:            RoNodeGroupRepository,
-    propertiesService:    NodePropertiesService,
-    restExtractorService: RestExtractorService,
-    zioJsonExtractor:     ZioJsonExtractor,
-    uuidGen:              StringUuidGenerator,
-    serviceV2:            GroupApiService2,
-    serviceV6:            GroupApiService6,
-    serviceV14:           GroupApiService14,
-    inheritedProperties:  GroupApiInheritedProperties
+    propertiesService:   NodePropertiesService,
+    zioJsonExtractor:    ZioJsonExtractor,
+    uuidGen:             StringUuidGenerator,
+    userPropertyService: UserPropertyService,
+    service:             GroupApiService14
 ) extends LiftApiModuleProvider[API] {
 
+  implicit def reasonBehavior: ReasonBehavior = userPropertyService.reasonsFieldBehavior
+
   def schemas: ApiModuleProvider[API] = API
 
   /*
@@ -105,330 +95,38 @@ class GroupsApi(
    * Depends of authz method and supported version.
    */
   def getLiftEndpoints(): List[LiftApiModule] = {
-    API.endpoints
-      .map(e => {
-        e match {
-          case API.ListGroups                      => ChooseApi0(List, ListV14)
-          case API.GetGroupTree                    => ChooseApi0(GetTree, GetTreeV14)
-          case API.GroupDetails                    => ChooseApiN(Get, GetV14)
-          case API.GroupInheritedProperties        => ChooseApiN(GroupInheritedProperties, GroupInheritedPropertiesV14)
-          case API.GroupDisplayInheritedProperties =>
-            ChooseApiN(GroupDisplayInheritedProperties, GroupDisplayInheritedPropertiesV14)
-          case API.DeleteGroup                     => ChooseApiN(Delete, DeleteV14)
-          case API.CreateGroup                     => ChooseApi0(Create, CreateV14)
-          case API.UpdateGroup                     => ChooseApiN(Update, UpdateV14)
-          case API.DeleteGroupCategory             => ChooseApiN(DeleteCategory, DeleteCategoryV14)
-          case API.CreateGroupCategory             => ChooseApi0(CreateCategory, CreateCategoryV14)
-          case API.GetGroupCategoryDetails         => ChooseApiN(GetCategory, GetCategoryV14)
-          case API.UpdateGroupCategory             => ChooseApiN(UpdateCategory, UpdateCategoryV14)
-          case API.ReloadGroup                     => ChooseApiN(Reload, ReloadV14)
-        }
-      })
-      .toList
-  }
-
-  object List extends LiftApiModule0      {
-    val schema:                                                                                                API.ListGroups.type = API.ListGroups
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse        = {
-      implicit val qc: QueryContext = authzToken.qc
-      serviceV14.listGroups().toLiftResponseList(params, schema)
-    }
-  }
-  object Get  extends LiftApiModuleString {
-    val schema: API.GroupDetails.type = API.GroupDetails
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        sid:        String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      implicit val qc: QueryContext = authzToken.qc
-      (for {
-        id  <- NodeGroupId.parse(sid).toIO
-        res <- serviceV14.groupDetails(id)
-      } yield res).toLiftResponseOne(params, schema, s => Some(s.id))
-    }
-  }
-
-  object GroupInheritedProperties extends LiftApiModuleString {
-    val schema: API.GroupInheritedProperties.type = API.GroupInheritedProperties
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      inheritedProperties
-        .getNodePropertiesTree(NodeGroupId(NodeGroupUid(id)), RenderInheritedProperties.JSON)
-        .either
-        .runNow match {
-        case Right(value) =>
-          toJsonResponse(None, value)("groupInheritedProperties", restExtractor.extractPrettify(req.params))
-        case Left(err)    =>
-          toJsonError(None, err.fullMsg)("groupInheritedProperties", restExtractor.extractPrettify(req.params))
-      }
-    }
-  }
-
-  object GroupDisplayInheritedProperties extends LiftApiModuleString {
-    val schema: API.GroupDisplayInheritedProperties.type = API.GroupDisplayInheritedProperties
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      inheritedProperties
-        .getNodePropertiesTree(NodeGroupId(NodeGroupUid(id)), RenderInheritedProperties.HTML)
-        .either
-        .runNow match {
-        case Right(value) =>
-          toJsonResponse(None, value)("groupInheritedProperties", restExtractor.extractPrettify(req.params))
-        case Left(err)    =>
-          toJsonError(None, err.fullMsg)("groupInheritedProperties", restExtractor.extractPrettify(req.params))
-      }
-    }
-  }
-
-  object Delete extends LiftApiModuleString {
-    val schema: API.DeleteGroup.type = API.DeleteGroup
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      implicit val qc: QueryContext = authzToken.qc
-      serviceV2.deleteGroup(id, req, version)
-    }
-  }
-
-  object Create extends LiftApiModule0      {
-    val schema: API.CreateGroup.type = API.CreateGroup
-    val restExtractor = restExtractorService
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      implicit val qc: QueryContext = authzToken.qc
-      if (req.json_?) {
-        req.json match {
-          case Full(arg) =>
-            val restGroup = restExtractor.extractGroupFromJSON(arg)
-            serviceV2.createGroup(restGroup, req, version)
-          case eb: EmptyBox =>
-            toJsonError(None, "No Json data sent")("createGroup", restExtractor.extractPrettify(req.params))
-        }
-      } else {
-        val restGroup = restExtractor.extractGroup(req.params)
-        serviceV2.createGroup(restGroup, req, version)
-      }
-    }
-  }
-  object Update extends LiftApiModuleString {
-    val schema: API.UpdateGroup.type = API.UpdateGroup
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      implicit val qc: QueryContext = authzToken.qc
-      if (req.json_?) {
-        req.json match {
-          case Full(arg) =>
-            val restGroup = restExtractor.extractGroupFromJSON(arg)
-            serviceV2.updateGroup(id, req, restGroup, version)
-          case eb: EmptyBox =>
-            toJsonError(None, "No Json data sent")("updateGroup", restExtractor.extractPrettify(req.params))
-        }
-      } else {
-        val restGroup = restExtractor.extractGroup(req.params)
-        serviceV2.updateGroup(id, req, restGroup, version)
-      }
-    }
-  }
-  object Reload extends LiftApiModuleString {
-    val schema: API.ReloadGroup.type = API.ReloadGroup
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      implicit val qc: QueryContext = authzToken.qc
-      serviceV2.reloadGroup(id, req, version)
+    API.endpoints.map {
+      case API.ListGroups                      => List
+      case API.GetGroupTree                    => GetTree
+      case API.GroupDetails                    => Get
+      case API.GroupInheritedProperties        => GroupInheritedProperties
+      case API.GroupDisplayInheritedProperties => GroupDisplayInheritedProperties
+      case API.DeleteGroup                     => Delete
+      case API.CreateGroup                     => Create
+      case API.UpdateGroup                     => Update
+      case API.DeleteGroupCategory             => DeleteCategory
+      case API.CreateGroupCategory             => CreateCategory
+      case API.GetGroupCategoryDetails         => GetCategory
+      case API.UpdateGroupCategory             => UpdateCategory
+      case API.ReloadGroup                     => Reload
     }
   }
 
-  import RestUtils.*
-  import net.liftweb.json.*
-
-  def response(function: Box[JValue], req: Req, errorMessage: String, id: Option[String])(implicit
-      action: String
-  ): LiftResponse = {
-    RestUtils.response(restExtractorService, "groupCategories", id)(function, req, errorMessage)
-  }
-
-  def actionResponse(function: Box[ActionType], req: Req, errorMessage: String, id: Option[String], actor: EventActor)(implicit
-      action: String
-  ): LiftResponse = {
-    RestUtils.actionResponse2(restExtractorService, "groupCategories", uuidGen, id)(function, req, errorMessage)(action, actor)
-  }
-
   // group categories
-  object GetTree        extends LiftApiModule0      {
-    val schema: API.GetGroupTree.type = API.GetGroupTree
-    val restExtractor = restExtractorService
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      implicit val action = schema.name
-      response(
-        serviceV6.getCategoryTree(version),
-        req,
-        s"Could not fetch Group tree",
-        None
-      )
-    }
-  }
-  object GetCategory    extends LiftApiModuleString {
-    val schema: API.GetGroupCategoryDetails.type = API.GetGroupCategoryDetails
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      implicit val action = schema.name
-      response(
-        serviceV6.getCategoryDetails(NodeGroupCategoryId(id), version),
-        req,
-        s"Could not fetch Group category '${id}' details",
-        Some(id)
-      )
-    }
-  }
-  object DeleteCategory extends LiftApiModuleString {
-    val schema: API.DeleteGroupCategory.type = API.DeleteGroupCategory
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      implicit val action = schema.name
-      actionResponse(
-        Full(serviceV6.deleteCategory(NodeGroupCategoryId(id), version)),
-        req,
-        s"Could not delete Group category '${id}'",
-        Some(id),
-        authzToken.qc.actor
-      )
-    }
-  }
-  object UpdateCategory extends LiftApiModuleString {
-    val schema: API.UpdateGroupCategory.type = API.UpdateGroupCategory
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      implicit val action = schema.name
-      val x               = for {
-        restCategory <- {
-          if (req.json_?) {
-            for {
-              json <- req.json ?~! "No JSON data sent"
-              cat  <- restExtractor.extractGroupCategory(json)
-            } yield {
-              cat
-            }
-          } else {
-            restExtractor.extractGroupCategory(req.params)
-          }
-        }
-      } yield {
-        serviceV6.updateCategory(NodeGroupCategoryId(id), restCategory, version) _
-      }
-      actionResponse(
-        x,
-        req,
-        s"Could not update Group category '${id}'",
-        Some(id),
-        authzToken.qc.actor
-      )
-    }
-  }
-  object CreateCategory extends LiftApiModule0      {
-    val schema: API.CreateGroupCategory.type = API.CreateGroupCategory
-    val restExtractor = restExtractorService
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      implicit val action = schema.name
-      val id              = () => NodeGroupCategoryId(uuidGen.newUuid)
-      val x               = for {
-        restCategory <- {
-          if (req.json_?) {
-            for {
-              json <- req.json ?~! "No JSON data sent"
-              cat  <- restExtractor.extractGroupCategory(json)
-            } yield {
-              cat
-            }
-          } else {
-            restExtractor.extractGroupCategory(req.params)
-          }
-        }
-      } yield {
-        serviceV6.createCategory(id, restCategory, version) _
-      }
-      actionResponse(
-        x,
-        req,
-        s"Could not create group category",
-        None,
-        authzToken.qc.actor
-      )
-    }
-  }
-
   //
   //
-  //  V14 API
+  //   API
   //
   //
 
-  object ListV14 extends LiftApiModule0      {
-    val schema: API.ListGroups.type = API.ListGroups
-    val restExtractor = restExtractorService
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
+  object List extends LiftApiModule0      {
+    val schema:                                                                                                API.ListGroups.type = API.ListGroups
+    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse        = {
       implicit val qc: QueryContext = authzToken.qc
-      serviceV14.listGroups().toLiftResponseList(params, schema)
+      service.listGroups().toLiftResponseList(params, schema)
     }
   }
-  object GetV14  extends LiftApiModuleString {
+  object Get  extends LiftApiModuleString {
     val schema: API.GroupDetails.type = API.GroupDetails
     def process(
         version:    ApiVersion,
@@ -439,11 +137,11 @@ class GroupsApi(
         authzToken: AuthzToken
     ): LiftResponse = {
       implicit val qc: QueryContext = authzToken.qc
-      NodeGroupId.parse(sid).toIO.flatMap(id => serviceV14.groupDetails(id)).toLiftResponseOne(params, schema, s => Some(s.id))
+      NodeGroupId.parse(sid).toIO.flatMap(id => service.groupDetails(id)).toLiftResponseOne(params, schema, s => Some(s.id))
     }
   }
 
-  object GroupInheritedPropertiesV14 extends LiftApiModuleString {
+  object GroupInheritedProperties extends LiftApiModuleString {
     val schema: API.GroupInheritedProperties.type = API.GroupInheritedProperties
     def process(
         version:    ApiVersion,
@@ -457,12 +155,12 @@ class GroupsApi(
       NodeGroupId
         .parse(sid)
         .toIO
-        .flatMap(id => serviceV14.getNodePropertiesTree(id, RenderInheritedProperties.JSON))
+        .flatMap(id => service.getNodePropertiesTree(id, RenderInheritedProperties.JSON))
         .toLiftResponseOne(params, schema, s => Some(s.groupId))
     }
   }
 
-  object GroupDisplayInheritedPropertiesV14 extends LiftApiModuleString {
+  object GroupDisplayInheritedProperties extends LiftApiModuleString {
     val schema: API.GroupDisplayInheritedProperties.type = API.GroupDisplayInheritedProperties
     def process(
         version:    ApiVersion,
@@ -476,12 +174,12 @@ class GroupsApi(
       NodeGroupId
         .parse(sid)
         .toIO
-        .flatMap(id => serviceV14.getNodePropertiesTree(id, RenderInheritedProperties.HTML))
+        .flatMap(id => service.getNodePropertiesTree(id, RenderInheritedProperties.HTML))
         .toLiftResponseOne(params, schema, s => Some(s.groupId))
     }
   }
 
-  object DeleteV14 extends LiftApiModuleString {
+  object Delete extends LiftApiModuleString {
     val schema: API.DeleteGroup.type = API.DeleteGroup
     def process(
         version:    ApiVersion,
@@ -495,18 +193,18 @@ class GroupsApi(
       NodeGroupId
         .parse(sid)
         .toIO
-        .flatMap(id => serviceV14.deleteGroup(id, params, authzToken.qc.actor))
+        .flatMap(id => service.deleteGroup(id, params, authzToken.qc.actor))
         .toLiftResponseOne(params, schema, s => Some(s.id))
     }
   }
 
-  object CreateV14 extends LiftApiModule0 {
+  object Create extends LiftApiModule0 {
     val schema:                                                                                                API.CreateGroup.type = API.CreateGroup
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse         = {
       implicit val qc: QueryContext = authzToken.qc
       (for {
         restGroup <- zioJsonExtractor.extractGroup(req).chainError(s"Could not extract group parameters from request").toIO
-        result    <- serviceV14.createGroup(
+        result    <- service.createGroup(
                        restGroup,
                        restGroup.id.getOrElse(NodeGroupId(NodeGroupUid(uuidGen.newUuid))),
                        restGroup.source,
@@ -520,7 +218,7 @@ class GroupsApi(
     }
   }
 
-  object UpdateV14 extends LiftApiModuleString {
+  object Update extends LiftApiModuleString {
     val schema: API.UpdateGroup.type = API.UpdateGroup
     def process(
         version:    ApiVersion,
@@ -534,7 +232,7 @@ class GroupsApi(
       (for {
         restGroup <- zioJsonExtractor.extractGroup(req).chainError(s"Could not extract a group from request.").toIO
         id        <- NodeGroupId.parse(sid).toIO
-        res       <- serviceV14.updateGroup(restGroup.copy(id = Some(id)), params, authzToken.qc.actor)
+        res       <- service.updateGroup(restGroup.copy(id = Some(id)), params, authzToken.qc.actor)
         // await all properties update to guarantee that properties are resolved after group modification
         _         <- propertiesService.updateAll()
       } yield {
@@ -543,9 +241,8 @@ class GroupsApi(
     }
   }
 
-  object ReloadV14 extends LiftApiModuleString {
+  object Reload extends LiftApiModuleString {
     val schema: API.ReloadGroup.type = API.ReloadGroup
-    val restExtractor = restExtractorService
     def process(
         version:    ApiVersion,
         path:       ApiPath,
@@ -555,27 +252,27 @@ class GroupsApi(
         authzToken: AuthzToken
     ): LiftResponse = {
       implicit val qc: QueryContext = authzToken.qc
-      serviceV14.reloadGroup(id, params, authzToken.qc.actor).toLiftResponseOne(params, schema, s => Some(s.id))
+      service.reloadGroup(id, params, authzToken.qc.actor).toLiftResponseOne(params, schema, s => Some(s.id))
     }
   }
 
   // group categories
-  object GetTreeV14        extends LiftApiModule0      {
-    val schema: API.GetGroupTree.type = API.GetGroupTree
-    val restExtractor = restExtractorService
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      implicit val action = schema.name
-      response(
-        serviceV14.getCategoryTree(version),
-        req,
-        s"Could not fetch Group tree",
-        None
-      )
+  object GetTree        extends LiftApiModule0      {
+    val schema:                                                                                                API.GetGroupTree.type = API.GetGroupTree
+    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse          = {
+      service
+        .getCategoryTree(version)
+        .map(JRGroupCategoriesFull(_))
+        .chainError("Could not fetch Group tree")
+        .toLiftResponseOne(
+          params,
+          schema,
+          _ => None
+        )
     }
   }
-  object GetCategoryV14    extends LiftApiModuleString {
+  object GetCategory    extends LiftApiModuleString {
     val schema: API.GetGroupCategoryDetails.type = API.GetGroupCategoryDetails
-    val restExtractor = restExtractorService
     def process(
         version:    ApiVersion,
         path:       ApiPath,
@@ -584,18 +281,19 @@ class GroupsApi(
         params:     DefaultParams,
         authzToken: AuthzToken
     ): LiftResponse = {
-      implicit val action = schema.name
-      response(
-        serviceV14.getCategoryDetails(NodeGroupCategoryId(id), version),
-        req,
-        s"Could not fetch Group category '${id}' details",
-        Some(id)
-      )
+      service
+        .getCategoryDetails(NodeGroupCategoryId(id))
+        .map(JRGroupCategoriesMinimal(_))
+        .chainError(s"Could not fetch Group category '${id}' details")
+        .toLiftResponseOne(
+          params,
+          schema,
+          _ => Some(id)
+        )
     }
   }
-  object DeleteCategoryV14 extends LiftApiModuleString {
+  object DeleteCategory extends LiftApiModuleString {
     val schema: API.DeleteGroupCategory.type = API.DeleteGroupCategory
-    val restExtractor = restExtractorService
     def process(
         version:    ApiVersion,
         path:       ApiPath,
@@ -604,19 +302,22 @@ class GroupsApi(
         params:     DefaultParams,
         authzToken: AuthzToken
     ): LiftResponse = {
-      implicit val action = schema.name
-      actionResponse(
-        Full(serviceV14.deleteCategory(NodeGroupCategoryId(id), version)),
-        req,
-        s"Could not delete Group category '${id}'",
-        Some(id),
-        authzToken.qc.actor
+      withChangeContext(req, authzToken) { implicit cc =>
+        service
+          .deleteCategory(NodeGroupCategoryId(id))
+          .map(JRGroupCategoriesMinimal(_))
+          .chainError(
+            s"Could not delete Group category '${id}'"
+          )
+      }.toLiftResponseOne(
+        params,
+        schema,
+        Some(id)
       )
     }
   }
-  object UpdateCategoryV14 extends LiftApiModuleString {
+  object UpdateCategory extends LiftApiModuleString {
     val schema: API.UpdateGroupCategory.type = API.UpdateGroupCategory
-    val restExtractor = restExtractorService
     def process(
         version:    ApiVersion,
         path:       ApiPath,
@@ -625,467 +326,58 @@ class GroupsApi(
         params:     DefaultParams,
         authzToken: AuthzToken
     ): LiftResponse = {
-      implicit val action = schema.name
-      val x               = for {
-        restCategory <- {
-          if (req.json_?) {
-            for {
-              json <- req.json ?~! "No JSON data sent"
-              cat  <- restExtractor.extractGroupCategory(json)
-            } yield {
-              cat
-            }
-          } else {
-            restExtractor.extractGroupCategory(req.params)
-          }
-        }
-      } yield {
-        serviceV14.updateCategory(NodeGroupCategoryId(id), restCategory, version) _
-      }
-      actionResponse(
-        x,
-        req,
-        s"Could not update Group category '${id}'",
-        Some(id),
-        authzToken.qc.actor
+      withChangeContext(req, authzToken)(implicit cc => {
+        (for {
+          groupCategory        <- zioJsonExtractor.extractGroupCategory(req).toIO
+          updatedGroupCategory <- service.updateCategory(NodeGroupCategoryId(id), groupCategory)
+        } yield {
+          JRGroupCategoriesMinimal(updatedGroupCategory)
+        }).chainError(
+          s"Could not update Group category '${id}'"
+        )
+      }).toLiftResponseOne(
+        params,
+        schema,
+        Some(id)
       )
     }
   }
-  object CreateCategoryV14 extends LiftApiModule0      {
-    val schema: API.CreateGroupCategory.type = API.CreateGroupCategory
-    val restExtractor = restExtractorService
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      implicit val action = schema.name
-      val id              = () => NodeGroupCategoryId(uuidGen.newUuid)
-      val x               = for {
-        restCategory <- {
-          if (req.json_?) {
-            for {
-              json <- req.json ?~! "No JSON data sent"
-              cat  <- restExtractor.extractGroupCategory(json)
-            } yield {
-              cat
-            }
-          } else {
-            restExtractor.extractGroupCategory(req.params)
-          }
-        }
-      } yield {
-        serviceV14.createCategory(id, restCategory, version) _
-      }
-      actionResponse(
-        x,
-        req,
-        s"Could not create group category",
-        None,
-        authzToken.qc.actor
+  object CreateCategory extends LiftApiModule0      {
+    val schema:                                                                                                API.CreateGroupCategory.type = API.CreateGroupCategory
+    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse                 = {
+      withChangeContext(req, authzToken)(implicit cc => {
+        (for {
+          groupCategory    <- zioJsonExtractor.extractGroupCategory(req).toIO
+          newGroupCategory <- service.createCategory(NodeGroupCategoryId(uuidGen.newUuid), groupCategory)
+        } yield {
+          JRGroupCategoriesMinimal(newGroupCategory)
+        }).chainError(
+          s"Could not create group category"
+        )
+      }).toLiftResponseOne(
+        params,
+        schema,
+        None
       )
     }
   }
-}
-
-class GroupApiInheritedProperties(
-    propRepo: PropertiesRepository
-) {
-
-  /*
-   * the returned format is a list of properties:
-   *
-   */
-  def getNodePropertiesTree(groupId: NodeGroupId, renderInHtml: RenderInheritedProperties): IOResult[JArray] = {
 
-    for {
-      properties <-
-        propRepo
-          .getGroupProps(groupId)
-          .notOptional(s"Group properties with ID '${groupId.serialize}' were not found")
-          .map(_.resolved)
-    } yield {
-      import com.normation.rudder.domain.properties.JsonPropertySerialisation.*
-      val rendered = renderInHtml match {
-        case RenderInheritedProperties.HTML => properties.toList.toApiJsonRenderParents
-        case RenderInheritedProperties.JSON => properties.toList.toApiJson
-      }
-      JArray(
-        (
-          ("groupId" -> groupId.serialize)
-          ~ ("properties" -> rendered)
-        ) :: Nil
+  // Extracts reason from the request and provide an (implicit ChangeContext)
+  private def withChangeContext[A](req: Req, authzToken: AuthzToken)(
+      block: ChangeContext => IOResult[A]
+  ): IOResult[A] = {
+    extractReason(req).toIO.flatMap(reason => {
+      val cc = ChangeContext(
+        ModificationId(uuidGen.newUuid),
+        authzToken.qc.actor,
+        new DateTime(),
+        reason,
+        None,
+        authzToken.qc.nodePerms
       )
-    }
-  }
-}
-
-class GroupApiService2(
-    readGroup:            RoNodeGroupRepository,
-    writeGroup:           WoNodeGroupRepository,
-    uuidGen:              StringUuidGenerator,
-    asyncDeploymentAgent: AsyncDeploymentActor,
-    workflowLevelService: WorkflowLevelService,
-    restExtractor:        RestExtractorService,
-    queryProcessor:       QueryProcessor,
-    restDataSerializer:   RestDataSerializer
-)(implicit userService: UserService)
-    extends Loggable {
-
-  import RestUtils.*
-  import restDataSerializer.*
-
-  private def createChangeRequestAndAnswer(
-      id:           String,
-      diff:         ChangeRequestNodeGroupDiff,
-      group:        NodeGroup,
-      initialState: Option[NodeGroup],
-      newCategory:  Option[NodeGroupCategoryId],
-      actor:        EventActor,
-      req:          Req,
-      act:          DGModAction,
-      apiVersion:   ApiVersion
-  )(implicit action: String, prettify: Boolean, cc: ChangeContext) = {
-    val change = NodeGroupChangeRequest(act, group, newCategory, initialState)
-
-    (for {
-      reason   <- restExtractor.extractReason(req)
-      crName   <- restExtractor.extractChangeRequestName(req).map(_.getOrElse(s"${act.name} group '${group.name}' from API"))
-      workflow <- workflowLevelService.getForNodeGroup(actor, change)
-      cr        = ChangeRequestService.createChangeRequestFromNodeGroup(
-                    crName,
-                    restExtractor.extractChangeRequestDescription(req),
-                    group,
-                    initialState,
-                    diff,
-                    actor,
-                    reason
-                  )
-      id       <- workflow.startWorkflow(cr)
-    } yield {
-      (id, workflow)
-    }) match {
-      case Full((crId, workflow)) =>
-        val optCrId   = if (workflow.needExternalValidation()) Some(crId) else None
-        val jsonGroup = List(serializeGroup(group, newCategory, optCrId))
-        toJsonResponse(Some(id), ("groups" -> JArray(jsonGroup)))
-
-      case eb: EmptyBox =>
-        val fail = eb ?~ (s"Could not save changes on Group ${id}")
-        val msg  = s"${act} failed, cause is: ${fail.messageChain}."
-        toJsonError(Some(id), msg)
-    }
-  }
-
-  def listGroups(req: Req, apiVersion: ApiVersion): LiftResponse = {
-    implicit val action   = "listGroups"
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-    readGroup.getAll().toBox match {
-      case Full(groups) =>
-        toJsonResponse(None, ("groups" -> JArray(groups.sortBy(_.id.serialize).map(g => serializeGroup(g, None, None)).toList)))
-      case eb: EmptyBox =>
-        val message = (eb ?~ ("Could not fetch Groups")).messageChain
-        toJsonError(None, message)
-    }
-  }
-
-  def createGroup(restGroup: Box[RestGroup], req: Req, apiVersion: ApiVersion)(implicit qc: QueryContext): LiftResponse = {
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-    val modId             = ModificationId(uuidGen.newUuid)
-    val actor             = RestUtils.getActor(req)
-    val groupIdBox        = restExtractor
-      .extractId(req)(x => Full(NodeGroupId(NodeGroupUid(x))))
-      .map(_.getOrElse(NodeGroupId(NodeGroupUid(uuidGen.newUuid))))
-
-    def actualGroupCreation(change: NodeGroupChangeRequest, groupId: NodeGroupId, isClone: Boolean) = {
-      (for {
-        reason   <- restExtractor.extractReason(req)
-        rootCat  <- readGroup.getRootCategoryPure().toBox
-        cat       = change.category.getOrElse(rootCat.id)
-        saveDiff <- writeGroup.create(change.newGroup, cat, modId, actor, reason).toBox
-      } yield {
-        (saveDiff, cat)
-      }) match {
-        case Full((x, cat)) =>
-          if (x.needDeployment) {
-            // Trigger a deployment only if it is needed
-            asyncDeploymentAgent ! AutomaticStartDeployment(modId, actor)
-          }
-          val jsonGroup       = List(serializeGroup(change.newGroup, Some(cat), None))
-          implicit val action = if (isClone) "cloneGroup" else "createGroup"
-
-          toJsonResponse(Some(groupId.serialize), ("groups" -> JArray(jsonGroup)))
-
-        case eb: EmptyBox =>
-          val fail    = eb ?~ (s"Could not save group '${groupId.serialize}''")
-          val message =
-            s"Could not create group '${change.newGroup.name}' (id:${groupId.serialize}), cause is: ${fail.messageChain}."
-          toJsonError(Some(groupId.serialize), message)
-      }
-    }
-
-    // decide if we should create a new group or clone an existing one
-    // Return the source group to use in each case.
-    def createOrClone(
-        actor:         EventActor,
-        restGroup:     RestGroup,
-        groupId:       NodeGroupId,
-        name:          String,
-        sourceIdParam: Option[NodeGroupId]
-    ): Box[NodeGroupChangeRequest] = {
-      sourceIdParam match {
-        case Some(sourceId) =>
-          // clone existing group
-          for {
-            (group, cat) <-
-              readGroup.getNodeGroup(sourceId).toBox ?~!
-              s"Could not create group '${name}' (id:${groupId.serialize}) by cloning group '${sourceId.serialize}')"
-            id            = NodeGroupId(NodeGroupUid(restGroup.id.getOrElse(uuidGen.newUuid)))
-            updated      <- restGroup.updateGroup(group).toBox
-          } yield {
-            // in that case, we take rest category and if empty, we default to cloned group category
-            val category = restGroup.category.orElse(Some(cat))
-            val withId   = updated.copy(id = id)
-            NodeGroupChangeRequest(DGModAction.CreateSolo, withId, category, Some(group))
-          }
-
-        case None =>
-          // If enable is missing in parameter consider it to true
-          val defaultEnabled = restGroup.enabled.getOrElse(true)
-          // create from scratch - base rule is the same with default values
-          val baseGroup      =
-            NodeGroup(groupId, name, "", Nil, None, isDynamic = true, serverList = Set(), _isEnabled = defaultEnabled)
-
-          // if only the name parameter is set, consider it to be enabled
-          // if not if workflow are enabled, consider it to be disabled
-          // if there is no workflow, use the value used as parameter (default to true)
-          // code extract :
-          /*
-           * if (restGroup.onlyName) true
-           * else if (workflowEnabled) false
-           * else defaultEnabled
-           */
-          for {
-            updated  <- restGroup.updateGroup(baseGroup).toBox
-            change    = NodeGroupChangeRequest(DGModAction.CreateSolo, updated, restGroup.category, Some(baseGroup))
-            workflow <-
-              workflowLevelService.getForNodeGroup(actor, change) ?~! "Could not find workflow status for that rule creation"
-          } yield {
-            // we don't actually start a workflow, we only disable the group if a workflow should be
-            // started. Update rule "enable" status accordingly.
-            val enableCheck = restGroup.onlyName || (!workflow.needExternalValidation() && defaultEnabled)
-            // Then enabled value in restRule will be used in the saved Rule
-            change.copy(newGroup = change.newGroup.copy(_isEnabled = enableCheck))
-          }
-
-        case _ =>
-          Failure(
-            s"Could not create group '${name}' (id:${groupId.serialize}) based on an already existing group, cause is: too many values for source parameter."
-          )
-      }
-    }
-
-    (for {
-      group   <- restGroup ?~! s"Could extract values from request"
-      name    <- Box(group.name) ?~! "Missing mandatory value for group name"
-      source  <- restExtractor.extractString("source")(req)(x => NodeGroupId.parse(x).toBox)
-      _       <- (group.query, source) match {
-                   case (None, None) => Failure("Cannot create a group with an empty query")
-                   case _            => Full(())
-                 }
-      groupId <- groupIdBox
-      change  <- createOrClone(actor, group, groupId, name, source)
-    } yield {
-      actualGroupCreation(change, groupId, source.isDefined)
-    }) match {
-      case Full(resp) =>
-        resp
-      case eb: EmptyBox =>
-        val fail = eb ?~ (s"Error when creating new group")
-        toJsonError(groupIdBox.toOption.map(_.serialize), fail.messageChain)
-    }
-  }
-
-  def groupDetails(sid: String, req: Req, apiVersion: ApiVersion)(implicit qc: QueryContext): LiftResponse = {
-    implicit val action   = "groupDetails"
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-
-    NodeGroupId.parse(sid).toIO.flatMap(readGroup.getNodeGroup).toBox match {
-      case Full((group, cat)) =>
-        val jsonGroup = List(serializeGroup(group, Some(cat), None))
-        toJsonResponse(Some(sid), ("groups" -> JArray(jsonGroup)))
-      case eb: EmptyBox =>
-        val fail    = eb ?~! (s"Could not find Group ${sid}")
-        val message = s"Could not get Group ${sid} details cause is: ${fail.msg}."
-        toJsonError(Some(sid), message)
-    }
-  }
-
-  def reloadGroup(sid: String, req: Req, apiVersion: ApiVersion)(implicit qc: QueryContext): LiftResponse = {
-    implicit val action   = "reloadGroup"
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-    val actor             = RestUtils.getActor(req)
-
-    NodeGroupId.parse(sid).toIO.flatMap(readGroup.getNodeGroup).toBox match {
-      case Full((group, cat)) =>
-        group.query match {
-          case Some(query) =>
-            queryProcessor.processOnlyId(query) match {
-              case Full(nodeIds) =>
-                val updatedGroup    = group.copy(serverList = nodeIds.toSet)
-                val reloadGroupDiff = ModifyToNodeGroupDiff(updatedGroup)
-                implicit val cc: ChangeContext =
-                  ChangeContext(ModificationId(uuidGen.newUuid), actor, new DateTime(), None, None, qc.nodePerms)
-                createChangeRequestAndAnswer(
-                  sid,
-                  reloadGroupDiff,
-                  group,
-                  Some(group),
-                  None,
-                  actor,
-                  req,
-                  DGModAction.Update,
-                  apiVersion
-                )
-              case eb: EmptyBox =>
-                val fail    = eb ?~ (s"Could not fetch Nodes")
-                val message = s"Could not reload Group ${sid} details cause is: ${fail.msg}."
-                toJsonError(Some(sid), message)
-            }
-          case None        =>
-            val jsonGroup = List(serializeGroup(group, Some(cat), None))
-            toJsonResponse(Some(sid), ("groups" -> JArray(jsonGroup)))
-        }
-        val jsonGroup = List(serializeGroup(group, Some(cat), None))
-        toJsonResponse(Some(sid), ("groups" -> JArray(jsonGroup)))
-      case eb: EmptyBox =>
-        val fail    = eb ?~ (s"Could not find Group ${sid}")
-        val message = s"Could not reload Group ${sid} details cause is: ${fail.msg}."
-        toJsonError(Some(sid), message)
-    }
-  }
-
-  def deleteGroup(sid: String, req: Req, apiVersion: ApiVersion)(implicit qc: QueryContext): LiftResponse = {
-    implicit val action   = "deleteGroup"
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-    val actor             = RestUtils.getActor(req)
-
-    NodeGroupId.parse(sid).toIO.flatMap(readGroup.getNodeGroup).toBox match {
-      case Full((group, cat)) =>
-        val deletionError = s"Could not delete group '${sid}', cause is: system groups cannot be deleted."
-        if (group.isSystem) {
-          toJsonError(Some(sid), deletionError)
-        } else {
-          val deleteGroupDiff = DeleteNodeGroupDiff(group)
-          implicit val cc: ChangeContext =
-            ChangeContext(ModificationId(uuidGen.newUuid), actor, new DateTime(), None, None, qc.nodePerms)
-          createChangeRequestAndAnswer(sid, deleteGroupDiff, group, Some(group), None, actor, req, DGModAction.Delete, apiVersion)
-        }
-
-      case eb: EmptyBox =>
-        val fail    = eb ?~ (s"Could not find Group ${sid}")
-        val message = s"Could not delete Group ${sid} cause is: ${fail.msg}."
-        toJsonError(Some(sid), message)
-    }
-  }
-
-  def updateGroup(sid: String, req: Req, restValues: Box[RestGroup], apiVersion: ApiVersion)(implicit
-      qc: QueryContext
-  ): LiftResponse = {
-    implicit val action   = "updateGroup"
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-    val actor             = getActor(req)
-
-    (for {
-      groupId      <- NodeGroupId.parse(sid).toBox
-      (group, cat) <- readGroup.getNodeGroup(groupId).toBox
-      restGroup    <- restValues
-      updated      <- restGroup.updateGroup(group).toBox
-    } yield {
-      (group, updated, restGroup.category.orElse(Some(cat)), ModifyToNodeGroupDiff(updated))
-    }) match {
-      case Full((group, updated, optCategory, diff)) =>
-        implicit val cc: ChangeContext =
-          ChangeContext(ModificationId(uuidGen.newUuid), actor, new DateTime(), None, None, qc.nodePerms)
-        createChangeRequestAndAnswer(sid, diff, updated, Some(group), optCategory, actor, req, DGModAction.Update, apiVersion)
-      case eb: EmptyBox =>
-        val fail = eb ?~ s"Could not modify Group ${sid}"
-        toJsonError(Some(sid), fail.messageChain)
-    }
+      block(cc)
+    })
   }
-
-}
-
-class GroupApiService6(
-    readGroup:          RoNodeGroupRepository,
-    writeGroup:         WoNodeGroupRepository,
-    restDataSerializer: RestDataSerializer
-) extends Loggable {
-
-  def getCategoryTree(apiVersion: ApiVersion): Box[JValue] = {
-    for {
-      root <- readGroup.getFullGroupLibrary().toBox
-    } yield {
-      restDataSerializer.serializeGroupCategory(root, root.id, FullDetails, apiVersion)
-    }
-  }
-
-  def getCategoryDetails(id: NodeGroupCategoryId, apiVersion: ApiVersion): Box[JValue] = {
-    for {
-      root     <- readGroup.getFullGroupLibrary().toBox
-      category <- Box(root.allCategories.get(id)) ?~! s"Cannot find Group category '${id.value}'"
-      parent   <- Box(root.parentCategories.get(id)) ?~! s"Cannot find Group category '${id.value}' parent"
-    } yield {
-      restDataSerializer.serializeGroupCategory(category, parent.id, MinimalDetails, apiVersion)
-    }
-  }
-
-  def deleteCategory(
-      id:         NodeGroupCategoryId,
-      apiVersion: ApiVersion
-  )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = {
-    for {
-      root     <- readGroup.getFullGroupLibrary().toBox
-      category <- Box(root.allCategories.get(id)) ?~! s"Cannot find Group category '${id.value}'"
-      _        <- if (category.isSystem)
-                    Failure(s"Could not delete group category '${id.value}', cause is: system categories cannot be deleted.")
-                  else Full(())
-      parent   <- Box(root.parentCategories.get(id)) ?~! s"Cannot find Groupl category '${id.value}' parent"
-      _        <- writeGroup.delete(id, modId, actor, reason).toBox
-    } yield {
-      restDataSerializer.serializeGroupCategory(category, parent.id, MinimalDetails, apiVersion)
-    }
-  }
-
-  def updateCategory(
-      id:         NodeGroupCategoryId,
-      restData:   RestGroupCategory,
-      apiVersion: ApiVersion
-  )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = {
-    for {
-      root      <- readGroup.getFullGroupLibrary().toBox
-      category  <- Box(root.allCategories.get(id)) ?~! s"Cannot find Group category '${id.value}'"
-      oldParent <- Box(root.parentCategories.get(id)) ?~! s"Cannot find Group category '${id.value}' parent"
-      parent     = restData.parent.getOrElse(oldParent.id)
-      update     = restData.update(category)
-      _         <- writeGroup.saveGroupCategory(update.toNodeGroupCategory, parent, modId, actor, reason).toBox
-    } yield {
-      restDataSerializer.serializeGroupCategory(update, parent, MinimalDetails, apiVersion)
-    }
-  }
-
-  // defaultId: the id to use if restDateDidn't provide one
-  def createCategory(
-      defaultId:  () => NodeGroupCategoryId,
-      restData:   RestGroupCategory,
-      apiVersion: ApiVersion
-  )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = {
-    for {
-      update  <- restData.create(defaultId)
-      category = update.toNodeGroupCategory
-      parent   = restData.parent.getOrElse(NodeGroupCategoryId("GroupRoot"))
-      _       <- writeGroup.addGroupCategorytoCategory(category, parent, modId, actor, reason).toBox
-    } yield {
-      restDataSerializer.serializeGroupCategory(update, parent, MinimalDetails, apiVersion)
-    }
-  }
-
 }
 
 class GroupApiService14(
@@ -1298,71 +590,64 @@ class GroupApiService14(
     }
   }
 
-  def getCategoryTree(apiVersion: ApiVersion): Box[JValue] = {
-    for {
-      root <- readGroup.getFullGroupLibrary().toBox
-    } yield {
-      restDataSerializer.serializeGroupCategory(root, root.id, FullDetails, apiVersion)
-    }
+  def getCategoryTree(apiVersion: ApiVersion): IOResult[JRFullGroupCategory] = {
+    readGroup.getFullGroupLibrary().map(JRFullGroupCategory.fromCategory(_, None))
   }
 
-  def getCategoryDetails(id: NodeGroupCategoryId, apiVersion: ApiVersion): Box[JValue] = {
+  def getCategoryDetails(id: NodeGroupCategoryId): IOResult[JRMinimalGroupCategory] = {
     for {
-      root     <- readGroup.getFullGroupLibrary().toBox
-      category <- Box(root.allCategories.get(id)) ?~! s"Cannot find Group category '${id.value}'"
-      parent   <- Box(root.parentCategories.get(id)) ?~! s"Cannot find Group category '${id.value}' parent"
+      root     <- readGroup.getFullGroupLibrary()
+      category <- root.allCategories.get(id).notOptional(s"Cannot find Group category '${id.value}'")
+      parent   <- root.parentCategories.get(id).notOptional(s"Cannot find Group category '${id.value}' parent")
     } yield {
-      restDataSerializer.serializeGroupCategory(category, parent.id, MinimalDetails, apiVersion)
+      JRMinimalGroupCategory.fromCategory(category, parent.id)
     }
   }
 
   def deleteCategory(
-      id:         NodeGroupCategoryId,
-      apiVersion: ApiVersion
-  )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = {
+      id: NodeGroupCategoryId
+  )(implicit cc: ChangeContext): IOResult[JRMinimalGroupCategory] = {
     for {
-      root     <- readGroup.getFullGroupLibrary().toBox
-      category <- Box(root.allCategories.get(id)) ?~! s"Cannot find Group category '${id.value}'"
-      _        <- if (category.isSystem)
-                    Failure(s"Could not delete group category '${id.value}', cause is: system categories cannot be deleted.")
-                  else Full(())
-      parent   <- Box(root.parentCategories.get(id)) ?~! s"Cannot find Groupl category '${id.value}' parent"
-      _        <- writeGroup.delete(id, modId, actor, reason).toBox
+      root     <- readGroup.getFullGroupLibrary()
+      category <- root.allCategories.get(id).notOptional(s"Cannot find Group category '${id.value}'")
+      _        <- ZIO.when(category.isSystem) {
+                    Inconsistency(s"Could not delete group category '${id.value}', cause is: system categories cannot be deleted.").fail
+                  }
+      parent   <- root.parentCategories.get(id).notOptional(s"Cannot find Groupl category '${id.value}' parent")
+      _        <- writeGroup.delete(id, cc.modId, cc.actor, cc.message)
     } yield {
-      restDataSerializer.serializeGroupCategory(category, parent.id, MinimalDetails, apiVersion)
+      JRMinimalGroupCategory.fromCategory(category, parent.id)
     }
   }
 
   def updateCategory(
-      id:         NodeGroupCategoryId,
-      restData:   RestGroupCategory,
-      apiVersion: ApiVersion
-  )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = {
+      id:       NodeGroupCategoryId,
+      restData: JQGroupCategory
+  )(implicit cc: ChangeContext): IOResult[JRMinimalGroupCategory] = {
     for {
-      root      <- readGroup.getFullGroupLibrary().toBox
-      category  <- Box(root.allCategories.get(id)) ?~! s"Cannot find Group category '${id.value}'"
-      oldParent <- Box(root.parentCategories.get(id)) ?~! s"Cannot find Group category '${id.value}' parent"
+      root      <- readGroup.getFullGroupLibrary()
+      category  <- root.allCategories.get(id).notOptional(s"Cannot find Group category '${id.value}'")
+      oldParent <- root.parentCategories.get(id).notOptional(s"Cannot find Group category '${id.value}' parent")
       parent     = restData.parent.getOrElse(oldParent.id)
       update     = restData.update(category)
-      _         <- writeGroup.saveGroupCategory(update.toNodeGroupCategory, parent, modId, actor, reason).toBox
+      _         <- writeGroup.saveGroupCategory(update.toNodeGroupCategory, parent, cc.modId, cc.actor, cc.message)
     } yield {
-      restDataSerializer.serializeGroupCategory(update, parent, MinimalDetails, apiVersion)
+      JRMinimalGroupCategory.fromCategory(update, parent)
     }
   }
 
   // defaultId: the id to use if restDateDidn't provide one
   def createCategory(
-      defaultId:  () => NodeGroupCategoryId,
-      restData:   RestGroupCategory,
-      apiVersion: ApiVersion
-  )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = {
+      defaultId: => NodeGroupCategoryId,
+      restData:  JQGroupCategory
+  )(implicit cc: ChangeContext): IOResult[JRMinimalGroupCategory] = {
     for {
-      update  <- restData.create(defaultId)
+      update  <- restData.create(defaultId).toIO
       category = update.toNodeGroupCategory
       parent   = restData.parent.getOrElse(NodeGroupCategoryId("GroupRoot"))
-      _       <- writeGroup.addGroupCategorytoCategory(category, parent, modId, actor, reason).toBox
+      _       <- writeGroup.addGroupCategorytoCategory(category, parent, cc.modId, cc.actor, cc.message)
     } yield {
-      restDataSerializer.serializeGroupCategory(update, parent, MinimalDetails, apiVersion)
+      JRMinimalGroupCategory.fromCategory(update, parent)
     }
   }
   /*
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/HookApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/HookApi.scala
index b90cbbd967d..b462718299b 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/HookApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/HookApi.scala
@@ -23,11 +23,7 @@ class HookApi(
 
   override def getLiftEndpoints(): List[LiftApiModule] = {
 
-    API.endpoints.map(e => {
-      e match {
-        case API.GetHooks => GetHooks
-      }
-    })
+    API.endpoints.map { case API.GetHooks => GetHooks }
   }
 
   object GetHooks extends LiftApiModule0 {
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InfoApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InfoApi.scala
index 0c4cf5f5297..a8cdbd7ec25 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InfoApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InfoApi.scala
@@ -41,16 +41,17 @@ import com.normation.rudder.api.ApiVersion
 import com.normation.rudder.api.HttpAction
 import com.normation.rudder.rest.*
 import com.normation.rudder.rest.InfoApi as API
+import com.normation.rudder.rest.implicits.*
 import net.liftweb.http.LiftResponse
 import net.liftweb.http.Req
-import net.liftweb.json.*
-import net.liftweb.json.JsonDSL.*
+import zio.json.ast.*
+import zio.json.ast.Json.*
+import zio.syntax.*
 
 /*
  * Information about the API
  */
 class InfoApi(
-    restExtractor:     RestExtractorService,
     supportedVersions: List[ApiVersion],
     endpoints:         List[Endpoint]
 ) extends LiftApiModuleProvider[API] {
@@ -59,15 +60,11 @@ class InfoApi(
   def schemas: ApiModuleProvider[API] = API
 
   def getLiftEndpoints(): List[LiftApiModule] = {
-    API.endpoints
-      .map(e => {
-        e match {
-          case API.ApiGeneralInformations => ApiGeneralInformations
-          case API.ApiSubInformations     => ApiSubInformations
-          case API.ApiInformations        => ApiInformations
-        }
-      })
-      .toList
+    API.endpoints.map {
+      case API.ApiGeneralInformations => ApiGeneralInformations
+      case API.ApiSubInformations     => ApiSubInformations
+      case API.ApiInformations        => ApiInformations
+    }
   }
 
   private case class EndpointInfo(
@@ -78,28 +75,37 @@ class InfoApi(
       path:     ApiPath
   )
 
-  private def list(startWith: Option[String]): JValue = {
-    implicit def apiVersionToJValue(version: ApiVersion): JValue = {
-      ("version" -> version.value) ~
-      ("status"  -> { if (version.deprecated) "deprecated" else "maintained" })
+  implicit class ApiVersionToJson(version: ApiVersion) {
+    def json: Json.Obj = {
+      Obj(
+        "version" -> Num(version.value),
+        "status"  -> Str({ if (version.deprecated) "deprecated" else "maintained" })
+      )
     }
+  }
 
-    implicit class EndpointToJValue(endpoint: EndpointInfo) {
-      def json: JValue = {
+  private def list(startWith: Option[String]): Obj = {
+
+    implicit class EndpointToJson(endpoint: EndpointInfo) {
+      def json: Json.Obj = {
         val versions = endpoint.versions.map(_.value).toList.sorted.mkString("[", ",", "]")
         val action   = endpoint.action.name.toUpperCase()
 
-        (endpoint.name -> endpoint.desc) ~
-        (action        -> JString(versions + " /" + endpoint.path.value))
+        Obj(
+          endpoint.name -> Str(endpoint.desc),
+          action        -> Str(versions + " /" + endpoint.path.value)
+        )
       }
     }
 
-    val availableVersions = supportedVersions.toList.sortBy(_.value)
+    val availableVersions = supportedVersions.sortBy(_.value)
 
     availableVersions.reverse match {
       case Nil =>
-        ("documentation" -> "https://docs.rudder.io/api/") ~
-        ("error"         -> "No API version supported. please contact your administrator or report a bug")
+        Obj(
+          "documentation" -> Str("https://docs.rudder.io/api/"),
+          "error"         -> Str("No API version supported. please contact your administrator or report a bug")
+        )
 
       case max :: tail =>
         val list = endpoints.filter(e => {
@@ -110,7 +116,7 @@ class InfoApi(
           })
         })
 
-        // we want to keep endpoints in their zz order, because it's an important information.
+        // we want to keep endpoints in their zz order, because it's important information.
         val jsonInfos     = list.groupBy(_.schema.name).map {
           case (name, seq) =>
             // we just want to gather version for each api
@@ -125,28 +131,26 @@ class InfoApi(
               ).json
             )
         }
-        val jsonEndpoints = list.map(_.schema.name).distinct.map(n => jsonInfos(n)) // can't fails, same source 'list'
+        val jsonEndpoints = list.map(_.schema.name).distinct.map(n => jsonInfos(n)) // can't fail, same source 'list'
 
-        ("documentation"     -> "https://docs.rudder.io/api/") ~
-        ("availableVersions" ->
-        ("latest"            -> max.value) ~
-        ("all"               -> availableVersions)) ~
-        ("endpoints"         -> jsonEndpoints)
+        Obj(
+          "documentation"     -> Str("https://docs.rudder.io/api/"),
+          "availableVersions" -> Obj("latest" -> Num(max.value), "all" -> Arr(availableVersions.map(_.json)*)),
+          "endpoints"         -> Arr(jsonEndpoints*)
+        )
     }
   }
 
   object ApiGeneralInformations extends LiftApiModule0 {
     val schema: API.ApiGeneralInformations.type = API.ApiGeneralInformations
-    val restExtractor = api.restExtractor
+
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      val json = list(None)
-      RestUtils.toJsonResponse(None, json)(schema.name, params.prettify)
+      list(None).succeed.toLiftResponseOne(params, schema, _ => None)
     }
   }
 
   object ApiSubInformations extends LiftApiModule {
     val schema: OneParam = API.ApiSubInformations
-    val restExtractor = api.restExtractor
     def process(
         version:    ApiVersion,
         path:       ApiPath,
@@ -155,14 +159,12 @@ class InfoApi(
         params:     DefaultParams,
         authzToken: AuthzToken
     ): LiftResponse = {
-      val json = list(Some(name))
-      RestUtils.toJsonResponse(None, json)(schema.name, params.prettify)
+      list(Some(name)).succeed.toLiftResponseOne(params, schema, _ => None)
     }
   }
 
   object ApiInformations extends LiftApiModule {
     val schema: OneParam = API.ApiInformations
-    val restExtractor = api.restExtractor
     def process(
         version:    ApiVersion,
         path:       ApiPath,
@@ -171,37 +173,38 @@ class InfoApi(
         params:     DefaultParams,
         authzToken: AuthzToken
     ): LiftResponse = {
-      implicit def apiVersionToJValue(version: ApiVersion): JValue = {
-        ("version" -> version.value) ~
-        ("status"  -> { if (version.deprecated) "deprecated" else "maintained" })
-      }
 
-      implicit class EndpointToJValue(endpoint: Endpoint) {
-        def json: JValue = {
+      implicit class EndpointToJson(endpoint: Endpoint) {
+        def json: Json.Obj = {
           val path   = "/" + endpoint.prefix.value + "/" + endpoint.schema.path.value
           val action = endpoint.schema.action.name.toUpperCase()
 
-          (action    -> path) ~
-          ("version" -> endpoint.version)
+          Obj(
+            action    -> Str(path),
+            "version" -> endpoint.version.json
+          )
         }
       }
 
       val json = endpoints
         .filter(e => e.schema.name.equalsIgnoreCase(name) && e.schema.kind != ApiKind.Internal)
-        .sortBy(_.version.value)
-        .toList match {
+        .sortBy(_.version.value) match {
         case Nil =>
-          ("documentation" -> "https://docs.rudder.io/api/") ~
-          ("error"         -> s"No endpoint with name '${name}' defined.")
+          Obj(
+            "documentation" -> Str("https://docs.rudder.io/api/"),
+            "error"         -> Str(s"No endpoint with name '${name}' defined.")
+          )
 
         case h :: tail =>
           val jsonEndpoints = (h :: tail).map(_.json)
 
-          ("documentation" -> "https://docs.rudder.io/api/") ~
-          (name            -> h.schema.description) ~
-          ("endpoints"     -> jsonEndpoints)
+          Obj(
+            "documentation" -> Str("https://docs.rudder.io/api/"),
+            name            -> Str(h.schema.description),
+            "endpoints"     -> Arr(jsonEndpoints*)
+          )
       }
-      RestUtils.toJsonResponse(None, json)(schema.name, params.prettify)
+      json.succeed.toLiftResponseOne(params, schema, _ => None)
     }
   }
 
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InventoryApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InventoryApi.scala
index 121ee29036d..e802f2a999c 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InventoryApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/InventoryApi.scala
@@ -67,17 +67,13 @@ class InventoryApi(
   def schemas: ApiModuleProvider[API] = API
 
   def getLiftEndpoints(): List[LiftApiModule] = {
-    API.endpoints
-      .map(e => {
-        e match {
-          case API.QueueInformation   => QueueInformation
-          case API.UploadInventory    => UploadInventory
-          case API.FileWatcherStart   => FileWatcherStart
-          case API.FileWatcherStop    => FileWatcherStop
-          case API.FileWatcherRestart => FileWatcherRestart
-        }
-      })
-      .toList
+    API.endpoints.map {
+      case API.QueueInformation   => QueueInformation
+      case API.UploadInventory    => UploadInventory
+      case API.FileWatcherStart   => FileWatcherStart
+      case API.FileWatcherStop    => FileWatcherStop
+      case API.FileWatcherRestart => FileWatcherRestart
+    }
   }
 
   object QueueInformation extends LiftApiModule0 {
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala
index 3fba78a18de..a57035cb6d3 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/LiftApiDispatcher.scala
@@ -276,44 +276,11 @@ class LiftHandler(
   }
 }
 
-/*
- * some type machinery to be able to have an implementation for old RuleApi up to V13
- * and an other for API with zio_json in V14 (and choose processing based on that)
- */
-final case class ChooseApi0[A <: LiftApiModule0](old: A, current: A) extends LiftApiModule0 {
-  override val schema = current.schema
-  override def process0(
-      version:    ApiVersion,
-      path:       ApiPath,
-      req:        Req,
-      params:     DefaultParams,
-      authzToken: AuthzToken
-  ): LiftResponse = {
-    if (version.value < 14) old.process0(version, path, req, params, authzToken)
-    else current.process0(version, path, req, params, authzToken)
-  }
-}
-trait LiftApiModuleN[R]                                              extends LiftApiModule  {
+trait LiftApiModuleN[R] extends LiftApiModule {
   type Aux[a] = EndpointSchema { type RESOURCES = a }
   override val schema: Aux[R]
 }
 
-final case class ChooseApiN[R](old: LiftApiModuleN[R], current: LiftApiModuleN[R]) extends LiftApiModule {
-  override val schema: EndpointSchema = old.schema
-  override def process(
-      version:    ApiVersion,
-      path:       ApiPath,
-      _resources: schema.RESOURCES,
-      req:        Req,
-      params:     DefaultParams,
-      authzToken: AuthzToken
-  ): LiftResponse = {
-    val resources = _resources.asInstanceOf[R]
-    if (version.value < 14) old.process(version, path, resources, req, params, authzToken)
-    else current.process(version, path, resources, req, params, authzToken)
-  }
-}
-
 /*
  * An interface that can be extended by module which are in `ChooseApiN` for String
  */
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala
index 079fad46ee4..fe4891e51bd 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/NodeApi.scala
@@ -57,6 +57,8 @@ import com.normation.rudder.apidata.RenderInheritedProperties
 import com.normation.rudder.apidata.RestDataSerializer
 import com.normation.rudder.apidata.ZioJsonExtractor
 import com.normation.rudder.apidata.implicits.*
+import com.normation.rudder.config.ReasonBehavior
+import com.normation.rudder.config.UserPropertyService
 import com.normation.rudder.domain.NodeDit
 import com.normation.rudder.domain.logger.NodeLogger
 import com.normation.rudder.domain.logger.NodeLoggerPure
@@ -86,14 +88,13 @@ import com.normation.rudder.properties.PropertiesRepository
 import com.normation.rudder.reports.ReportingConfiguration
 import com.normation.rudder.reports.execution.AgentRunWithNodeConfig
 import com.normation.rudder.reports.execution.RoReportsExecutionRepository
-import com.normation.rudder.repository.json.DataExtractor.OptionnalJson
 import com.normation.rudder.repository.ldap.LDAPEntityMapper
 import com.normation.rudder.rest.ApiModuleProvider
 import com.normation.rudder.rest.ApiPath
 import com.normation.rudder.rest.AuthzToken
 import com.normation.rudder.rest.NodeApi as API
 import com.normation.rudder.rest.OneParam
-import com.normation.rudder.rest.RestExtractorService
+import com.normation.rudder.rest.RudderJsonRequest.*
 import com.normation.rudder.rest.RudderJsonResponse
 import com.normation.rudder.rest.data.*
 import com.normation.rudder.rest.data.Creation.CreationError
@@ -118,8 +119,6 @@ import com.normation.rudder.services.reports.ReportingService
 import com.normation.rudder.services.servers.DeleteMode
 import com.normation.rudder.services.servers.NewNodeManager
 import com.normation.rudder.services.servers.RemoveNodeService
-import com.normation.rudder.web.services.ReasonBehavior
-import com.normation.rudder.web.services.UserPropertyService
 import com.normation.utils.StringUuidGenerator
 import com.normation.zio.*
 import io.scalaland.chimney.syntax.*
@@ -165,34 +164,33 @@ class NodeApi(
     deleteDefaultMode:     DeleteMode
 ) extends LiftApiModuleProvider[API] {
 
+  implicit def reasonBehavior: ReasonBehavior = userPropertyService.reasonsFieldBehavior
+
   def schemas: ApiModuleProvider[API] = API
 
   def getLiftEndpoints(): List[LiftApiModule] = {
-    API.endpoints.map(e => {
-
-      e match {
-        case API.ListPendingNodes               => ListPendingNodes
-        case API.NodeDetails                    => NodeDetails
-        case API.NodeInheritedProperties        => NodeInheritedProperties
-        case API.NodeDisplayInheritedProperties => NodeDisplayInheritedProperties
-        case API.PendingNodeDetails             => PendingNodeDetails
-        case API.DeleteNode                     => DeleteNode
-        case API.ChangePendingNodeStatus        => ChangePendingNodeStatus
-        case API.ChangePendingNodeStatus2       => ChangePendingNodeStatus2
-        case API.ApplyPolicyAllNodes            => ApplyPolicyAllNodes
-        case API.UpdateNode                     => UpdateNode
-        case API.ListAcceptedNodes              => ListAcceptedNodes
-        case API.ApplyPolicy                    => ApplyPolicy
-        case API.GetNodesStatus                 => GetNodesStatus
-        case API.NodeDetailsTable               => NodeDetailsTable
-        case API.NodeDetailsSoftware            => NodeDetailsSoftware
-        case API.NodeDetailsProperty            => NodeDetailsProperty
-        case API.CreateNodes                    => CreateNodes
-        case API.NodeGlobalScore                => GetNodeGlobalScore
-        case API.NodeScoreDetails               => GetNodeScoreDetails
-        case API.NodeScoreDetail                => GetNodeScoreDetail
-      }
-    })
+    API.endpoints.map {
+      case API.ListPendingNodes               => ListPendingNodes
+      case API.NodeDetails                    => NodeDetails
+      case API.NodeInheritedProperties        => NodeInheritedProperties
+      case API.NodeDisplayInheritedProperties => NodeDisplayInheritedProperties
+      case API.PendingNodeDetails             => PendingNodeDetails
+      case API.DeleteNode                     => DeleteNode
+      case API.ChangePendingNodeStatus        => ChangePendingNodeStatus
+      case API.ChangePendingNodeStatus2       => ChangePendingNodeStatus2
+      case API.ApplyPolicyAllNodes            => ApplyPolicyAllNodes
+      case API.UpdateNode                     => UpdateNode
+      case API.ListAcceptedNodes              => ListAcceptedNodes
+      case API.ApplyPolicy                    => ApplyPolicy
+      case API.GetNodesStatus                 => GetNodesStatus
+      case API.NodeDetailsTable               => NodeDetailsTable
+      case API.NodeDetailsSoftware            => NodeDetailsSoftware
+      case API.NodeDetailsProperty            => NodeDetailsProperty
+      case API.CreateNodes                    => CreateNodes
+      case API.NodeGlobalScore                => GetNodeGlobalScore
+      case API.NodeScoreDetails               => GetNodeScoreDetails
+      case API.NodeScoreDetail                => GetNodeScoreDetail
+    }
   }
 
   /*
@@ -390,7 +388,7 @@ class NodeApi(
 
       (for {
         restNode <- restExtractor.extractUpdateNode(req).toIO
-        reason   <- extractReason(req)
+        reason   <- extractReason(req).toIO
         result   <- nodeApiService.updateRestNode(NodeId(id), restNode)
         // await all properties update to guarantee that properties are resolved after node modification
         _        <- nodePropertiesService.updateAll()
@@ -534,17 +532,16 @@ class NodeApi(
         optNode <- nodeApiService.nodeFactRepository.get(NodeId(id))
       } yield {
         optNode match {
-          case Some(node)
-              if (node.rudderAgent.agentType == AgentType.CfeCommunity || node.rudderAgent.agentType == AgentType.CfeEnterprise) =>
+          case Some(node) if (node.rudderAgent.agentType == AgentType.CfeCommunity) =>
             OutputStreamResponse(nodeApiService.runNode(node.id, classes))
-          case Some(node) =>
+          case Some(node)                                                           =>
             RudderJsonResponse
               .internalError(
                 None,
                 RudderJsonResponse.ResponseSchema.fromSchema(schema),
                 s"Node with id '${id}' has an agent type (${node.rudderAgent.agentType.displayName}) which doesn't support remote run"
               )
-          case None       =>
+          case None                                                                 =>
             RudderJsonResponse
               .internalError(
                 None,
@@ -712,7 +709,7 @@ class NodeApi(
       implicit val qc       = authzToken.qc
 
       val result = (for {
-        inheritedProperty <- req.json.flatMap(j => OptionnalJson.extractJsonBoolean(j, "inherited")).toIO
+        inheritedProperty <- zioJsonExtractor.extractNodeInherited(req).toIO
         response          <- nodeApiService.property(req, property, inheritedProperty.getOrElse(false))
       } yield {
         response
@@ -735,25 +732,6 @@ class NodeApi(
       DeriveJsonEncoder.gen[JRNodeDetailLevel]
   }
 
-  // TODO: known to be duplicated in change-validation. Some day we will need to factor this out in zio (moving prop service to rudder-core)
-  private def extractReason(req: Req): IOResult[Option[String]] = {
-    import ReasonBehavior.*
-    (userPropertyService.reasonsFieldBehavior match {
-      case Disabled => ZIO.none
-      case mode     =>
-        val reason = req.params.get("reason").flatMap(_.headOption)
-        (mode: @unchecked) match {
-          case Mandatory =>
-            reason
-              .notOptional("Reason field is mandatory and should be at least 5 characters long")
-              .reject {
-                case s if s.lengthIs < 5 => Inconsistency("Reason field should be at least 5 characters long")
-              }
-              .map(Some(_))
-          case Optionnal => reason.succeed
-        }
-    }).chainError("There was an error while extracting reason message")
-  }
 }
 
 class NodeApiInheritedProperties(
@@ -810,7 +788,7 @@ class NodeApiService(
     acceptedDit:                InventoryDit,
     newNodeManager:             NewNodeManager,
     removeNodeService:          RemoveNodeService,
-    restExtractor:              RestExtractorService,
+    restExtractor:              ZioJsonExtractor,
     reportingService:           ReportingService,
     acceptedNodeQueryProcessor: QueryProcessor,
     pendingNodeQueryProcessor:  QueryChecker,
@@ -1090,7 +1068,7 @@ class NodeApiService(
   def software(req: Req, software: String)(implicit qc: QueryContext): IOResult[Map[String, Version]] = {
 
     for {
-      optNodeIds <- req.json.flatMap(restExtractor.extractNodeIdsFromJson).toIO
+      optNodeIds <- restExtractor.extractNodeIdChunk(req).toIO
       nodes      <- optNodeIds match {
                       case None          => nodeFactRepository.getAll()
                       case Some(nodeIds) => nodeFactRepository.getAll().map(_.filterKeys(id => nodeIds.contains(id.value)))
@@ -1106,7 +1084,7 @@ class NodeApiService(
   ): IOResult[Map[String, JRProperty]] = {
 
     for {
-      optNodeIds <- req.json.flatMap(restExtractor.extractNodeIdsFromJson).toIO
+      optNodeIds <- restExtractor.extractNodeIdChunk(req).toIO
       nodes      <- optNodeIds match {
                       case None          => nodeFactRepository.getAll()
                       case Some(nodeIds) => nodeFactRepository.getAll().map(_.filterKeys(id => nodeIds.contains(id.value)))
@@ -1461,7 +1439,7 @@ class NodeApiService(
         } yield {
           // remote run only works for CFEngine based agent
           val commandResult = {
-            if (node.rudderAgent.agentType == AgentType.CfeEnterprise || node.rudderAgent.agentType == AgentType.CfeCommunity) {
+            if (node.rudderAgent.agentType == AgentType.CfeCommunity) {
               val request = remoteRunRequest(node.id, classes, keepOutput = false, asynchronous = true)
               try {
                 val result = request.asString
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala
index f0f2f2ae630..38b61231d51 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ParametersApi.scala
@@ -38,7 +38,6 @@
 package com.normation.rudder.rest.lift
 
 import com.normation.GitVersion
-import com.normation.box.*
 import com.normation.errors.*
 import com.normation.errors.IOResult
 import com.normation.eventlog.EventActor
@@ -46,7 +45,6 @@ import com.normation.eventlog.ModificationId
 import com.normation.rudder.api.ApiVersion
 import com.normation.rudder.apidata.JsonQueryObjects.JQGlobalParameter
 import com.normation.rudder.apidata.JsonResponseObjects.JRGlobalParameter
-import com.normation.rudder.apidata.RestDataSerializer
 import com.normation.rudder.apidata.ZioJsonExtractor
 import com.normation.rudder.apidata.implicits.*
 import com.normation.rudder.domain.properties.*
@@ -55,172 +53,47 @@ import com.normation.rudder.domain.properties.GenericProperty
 import com.normation.rudder.facts.nodes.ChangeContext
 import com.normation.rudder.facts.nodes.QueryContext
 import com.normation.rudder.repository.RoParameterRepository
-import com.normation.rudder.repository.WoParameterRepository
 import com.normation.rudder.rest.ApiModuleProvider
 import com.normation.rudder.rest.ApiPath
 import com.normation.rudder.rest.AuthzToken
 import com.normation.rudder.rest.ParameterApi as API
-import com.normation.rudder.rest.RestExtractorService
-import com.normation.rudder.rest.RestUtils
-import com.normation.rudder.rest.RestUtils.getActor
-import com.normation.rudder.rest.RestUtils.toJsonError
-import com.normation.rudder.rest.RestUtils.toJsonResponse
-import com.normation.rudder.rest.data.RestParameter
 import com.normation.rudder.rest.implicits.*
 import com.normation.rudder.services.workflows.ChangeRequestService
 import com.normation.rudder.services.workflows.GlobalParamChangeRequest
 import com.normation.rudder.services.workflows.GlobalParamModAction
 import com.normation.rudder.services.workflows.WorkflowLevelService
-import com.normation.rudder.users.UserService
 import com.normation.utils.StringUuidGenerator
 import net.liftweb.common.Box
-import net.liftweb.common.EmptyBox
-import net.liftweb.common.Full
-import net.liftweb.common.Loggable
 import net.liftweb.http.LiftResponse
 import net.liftweb.http.Req
-import net.liftweb.json.JArray
-import net.liftweb.json.JsonDSL.*
-import net.liftweb.json.JString
 import org.joda.time.DateTime
 import zio.syntax.*
 
 class ParameterApi(
-    restExtractorService: RestExtractorService,
-    zioJsonExtractor:     ZioJsonExtractor,
-    serviceV2:            ParameterApiService2,
-    serviceV14:           ParameterApiService14
+    zioJsonExtractor: ZioJsonExtractor,
+    service:          ParameterApiService14
 ) extends LiftApiModuleProvider[API] {
 
   def schemas: ApiModuleProvider[API] = API
 
   def getLiftEndpoints(): List[LiftApiModule] = {
-    API.endpoints
-      .map(e => {
-        e match {
-          case API.ListParameters   => ChooseApi0(ListParameters, ListParametersV14)
-          case API.CreateParameter  => ChooseApi0(CreateParameter, CreateParameterV14)
-          case API.DeleteParameter  => ChooseApiN(DeleteParameter, DeleteParameterV14)
-          case API.ParameterDetails => ChooseApiN(ParameterDetails, ParameterDetailsV14)
-          case API.UpdateParameter  => ChooseApiN(UpdateParameter, UpdateParameterV14)
-        }
-      })
-      .toList
-  }
-
-  object ListParameters extends LiftApiModule0 {
-    val schema: API.ListParameters.type = API.ListParameters
-    val restExtractor = restExtractorService
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      serviceV2.listParameters(req)
-    }
-  }
-
-  object CreateParameter extends LiftApiModule0 {
-    val schema: API.CreateParameter.type = API.CreateParameter
-    val restExtractor = restExtractorService
-    implicit val action:                                                                                       String       = "createParameter"
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      implicit val qc: QueryContext = authzToken.qc
-      implicit val prettify = params.prettify
-
-      if (req.json_?) {
-        req.json match {
-          case Full(json) =>
-            val restParameter = restExtractor.extractParameterFromJSON(json)
-            restExtractor.extractParameterNameFromJSON(json) match {
-              case Full(parameterName) =>
-                serviceV2.createParameter(restParameter, parameterName, req)
-              case eb: EmptyBox =>
-                val fail    = eb ?~ (s"Could extract parameter id from request")
-                val message = s"Could not create Parameter cause is: ${fail.msg}."
-                toJsonError(None, message)
-            }
-          case eb: EmptyBox =>
-            toJsonError(None, JString("No Json data sent"))
-        }
-      } else {
-        val restParameter = restExtractor.extractParameter(req.params)
-        restExtractor.extractParameterName(req.params) match {
-          case Full(parameterName) =>
-            serviceV2.createParameter(restParameter, parameterName, req)
-          case eb: EmptyBox =>
-            val fail    = eb ?~ (s"Could extract parameter id from request")
-            val message = s"Could not create Parameter cause is: ${fail.msg}."
-            toJsonError(None, message)
-        }
-      }
-    }
-  }
-
-  object ParameterDetails extends LiftApiModuleString {
-    val schema: API.ParameterDetails.type = API.ParameterDetails
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      serviceV2.parameterDetails(id, req)
-    }
-  }
-
-  object DeleteParameter extends LiftApiModuleString {
-    val schema: API.DeleteParameter.type = API.DeleteParameter
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      implicit val qc: QueryContext = authzToken.qc
-      serviceV2.deleteParameter(id, req)
-    }
-  }
-
-  object UpdateParameter extends LiftApiModuleString {
-    val schema: API.UpdateParameter.type = API.UpdateParameter
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      implicit val qc: QueryContext = authzToken.qc
-      implicit val action   = "updateParameter"
-      implicit val prettify = params.prettify
-      if (req.json_?) {
-        req.json match {
-          case Full(arg) =>
-            val restParameter = restExtractor.extractParameterFromJSON(arg)
-            serviceV2.updateParameter(id, req, restParameter)
-          case eb: EmptyBox =>
-            toJsonError(None, JString("No Json data sent"))
-        }
-      } else {
-        val restParameter = restExtractor.extractParameter(req.params)
-        serviceV2.updateParameter(id, req, restParameter)
-      }
+    API.endpoints.map {
+      case API.ListParameters   => ListParameters
+      case API.CreateParameter  => CreateParameter
+      case API.DeleteParameter  => DeleteParameter
+      case API.ParameterDetails => ParameterDetails
+      case API.UpdateParameter  => UpdateParameter
     }
   }
 
-  object ListParametersV14 extends LiftApiModule0 {
+  object ListParameters extends LiftApiModule0 {
     val schema:                                                                                                API.ListParameters.type = API.ListParameters
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse            = {
-      serviceV14.listParameters().toLiftResponseList(params, schema)
+      service.listParameters().toLiftResponseList(params, schema)
     }
   }
 
-  object ParameterDetailsV14 extends LiftApiModuleString {
+  object ParameterDetails extends LiftApiModuleString {
     val schema: API.ParameterDetails.type = API.ParameterDetails
     def process(
         version:    ApiVersion,
@@ -230,25 +103,25 @@ class ParameterApi(
         params:     DefaultParams,
         authzToken: AuthzToken
     ): LiftResponse = {
-      serviceV14.parameterDetails(id).toLiftResponseOne(params, schema, s => Some(s.id))
+      service.parameterDetails(id).toLiftResponseOne(params, schema, s => Some(s.id))
     }
   }
 
-  object CreateParameterV14 extends LiftApiModule0 {
+  object CreateParameter extends LiftApiModule0 {
     val schema:                                                                                                API.CreateParameter.type = API.CreateParameter
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse             = {
       implicit val qc: QueryContext = authzToken.qc
       (for {
         restParam <-
           zioJsonExtractor.extractGlobalParam(req).chainError(s"Could not extract a global parameter from request").toIO
-        result    <- serviceV14.createParameter(restParam, params, authzToken.qc.actor)
+        result    <- service.createParameter(restParam, params, authzToken.qc.actor)
       } yield {
         result
       }).toLiftResponseOne(params, schema, s => Some(s.id))
     }
   }
 
-  object DeleteParameterV14 extends LiftApiModuleString {
+  object DeleteParameter extends LiftApiModuleString {
     val schema: API.DeleteParameter.type = API.DeleteParameter
     def process(
         version:    ApiVersion,
@@ -259,11 +132,11 @@ class ParameterApi(
         authzToken: AuthzToken
     ): LiftResponse = {
       implicit val qc: QueryContext = authzToken.qc
-      serviceV14.deleteParameter(id, params, authzToken.qc.actor).toLiftResponseOne(params, schema, s => Some(s.id))
+      service.deleteParameter(id, params, authzToken.qc.actor).toLiftResponseOne(params, schema, s => Some(s.id))
     }
   }
 
-  object UpdateParameterV14 extends LiftApiModuleString {
+  object UpdateParameter extends LiftApiModuleString {
     val schema: API.UpdateParameter.type = API.UpdateParameter
     def process(
         version:    ApiVersion,
@@ -276,7 +149,7 @@ class ParameterApi(
       implicit val qc: QueryContext = authzToken.qc
       (for {
         restParam <- zioJsonExtractor.extractGlobalParam(req).chainError(s"Could not extract parameter from request.").toIO
-        result    <- serviceV14.updateParameter(restParam.copy(id = Some(id)), params, authzToken.qc.actor)
+        result    <- service.updateParameter(restParam.copy(id = Some(id)), params, authzToken.qc.actor)
       } yield {
         result
       }).toLiftResponseOne(params, schema, s => Some(s.id))
@@ -285,170 +158,8 @@ class ParameterApi(
 
 }
 
-class ParameterApiService2(
-    readParameter:        RoParameterRepository,
-    writeParameter:       WoParameterRepository,
-    uuidGen:              StringUuidGenerator,
-    workflowLevelService: WorkflowLevelService,
-    restExtractor:        RestExtractorService,
-    restDataSerializer:   RestDataSerializer
-)(implicit userService: UserService)
-    extends Loggable {
-
-  import restDataSerializer.serializeParameter as serialize
-
-  private def createChangeRequestAndAnswer(
-      id:           String,
-      diff:         ChangeRequestGlobalParameterDiff,
-      parameter:    GlobalParameter,
-      initialState: Option[GlobalParameter],
-      actor:        EventActor,
-      req:          Req,
-      act:          GlobalParamModAction
-  )(implicit action: String, prettify: Boolean, qc: QueryContext) = {
-
-    val change = GlobalParamChangeRequest(act, initialState)
-    logger.info(restExtractor.extractReason(req))
-    (for {
-      reason   <- restExtractor.extractReason(req)
-      crName   <- restExtractor.extractChangeRequestName(req).map(_.getOrElse(s"${act} Parameter ${parameter.name} from API"))
-      workflow <- workflowLevelService.getForGlobalParam(actor, change)
-      cr        = ChangeRequestService.createChangeRequestFromGlobalParameter(
-                    crName,
-                    restExtractor.extractChangeRequestDescription(req),
-                    parameter,
-                    initialState,
-                    diff,
-                    actor,
-                    reason
-                  )
-      id       <- {
-        workflow.startWorkflow(cr)(
-          ChangeContext(ModificationId(uuidGen.newUuid), actor, new DateTime(), reason, None, qc.nodePerms)
-        )
-      }
-    } yield {
-      (id, workflow)
-    }) match {
-      case Full((crId, workflow)) =>
-        val optCrId       = if (workflow.needExternalValidation()) Some(crId) else None
-        val jsonParameter = List(serialize(parameter, optCrId))
-        toJsonResponse(Some(id), ("parameters" -> JArray(jsonParameter)))
-      case eb: EmptyBox =>
-        val fail = eb ?~ (s"Could not save changes on Parameter ${id}")
-        val msg  = s"${act} failed, cause is: ${fail.msg}."
-        toJsonError(Some(id), msg)
-    }
-  }
-
-  def listParameters(req: Req): LiftResponse = {
-    implicit val action   = "listParameters"
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-    readParameter.getAllGlobalParameters().toBox match {
-      case Full(parameters) =>
-        toJsonResponse(None, ("parameters" -> JArray(parameters.map(serialize(_, None)).toList)))
-      case eb: EmptyBox =>
-        val message = (eb ?~ ("Could not fetch Parameters")).msg
-        toJsonError(None, message)
-    }
-  }
-
-  def createParameter(restParameter: Box[RestParameter], parameterName: String, req: Req)(implicit
-      qc: QueryContext
-  ): LiftResponse = {
-    implicit val action   = "createParameter"
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-    val actor             = RestUtils.getActor(req)
-
-    restParameter match {
-      case Full(restParameter) =>
-        import GenericProperty.*
-        val parameter =
-          restParameter.updateParameter(GlobalParameter(parameterName, GitVersion.DEFAULT_REV, "".toConfigValue, None, "", None))
-
-        val diff = AddGlobalParameterDiff(parameter)
-        createChangeRequestAndAnswer(
-          parameterName,
-          diff,
-          parameter,
-          None,
-          actor,
-          req,
-          GlobalParamModAction.Create
-        )
-
-      case eb: EmptyBox =>
-        val fail    = eb ?~ (s"Could extract values from request")
-        val message = s"Could not create Parameter ${parameterName} cause is: ${fail.msg}."
-        toJsonError(Some(parameterName), message)
-    }
-  }
-
-  def parameterDetails(id: String, req: Req): LiftResponse = {
-    implicit val action   = "parameterDetails"
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-
-    readParameter.getGlobalParameter(id).notOptional(s"Could not find Parameter ${id}").toBox match {
-      case Full(parameter) =>
-        val jsonParameter = List(serialize(parameter, None))
-        toJsonResponse(Some(id), ("parameters" -> JArray(jsonParameter)))
-      case eb: EmptyBox =>
-        val fail    = eb ?~! (s"Could not find Parameter ${id}")
-        val message = s"Could not get Parameter ${id} details cause is: ${fail.msg}."
-        toJsonError(Some(id), message)
-    }
-  }
-
-  def deleteParameter(id: String, req: Req)(implicit qc: QueryContext): LiftResponse = {
-    implicit val action   = "deleteParameter"
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-    val actor             = RestUtils.getActor(req)
-    val parameterId       = id
-
-    readParameter.getGlobalParameter(parameterId).notOptional(s"Could not find Parameter ${id}").toBox match {
-      case Full(parameter) =>
-        val deleteParameterDiff = DeleteGlobalParameterDiff(parameter)
-        createChangeRequestAndAnswer(id, deleteParameterDiff, parameter, Some(parameter), actor, req, GlobalParamModAction.Delete)
-
-      case eb: EmptyBox =>
-        val fail    = eb ?~ (s"Could not find Parameter ${parameterId}")
-        val message = s"Could not delete Parameter ${parameterId} cause is: ${fail.msg}."
-        toJsonError(Some(parameterId), message)
-    }
-  }
-
-  def updateParameter(id: String, req: Req, restValues: Box[RestParameter])(implicit qc: QueryContext): LiftResponse = {
-    implicit val action   = "updateParameter"
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-    val actor             = getActor(req)
-    val parameterId       = id
-    logger.info(req)
-    readParameter.getGlobalParameter(parameterId).notOptional(s"Could not find Parameter ${id}").toBox match {
-      case Full(parameter) =>
-        restValues match {
-          case Full(restParameter) =>
-            val updatedParameter = restParameter.updateParameter(parameter)
-            val diff             = ModifyToGlobalParameterDiff(updatedParameter)
-            createChangeRequestAndAnswer(id, diff, updatedParameter, Some(parameter), actor, req, GlobalParamModAction.Update)
-
-          case eb: EmptyBox =>
-            val fail    = eb ?~ (s"Could extract values from request")
-            val message = s"Could not modify Parameter ${parameterId} cause is: ${fail.msg}."
-            toJsonError(Some(parameterId), message)
-        }
-
-      case eb: EmptyBox =>
-        val fail    = eb ?~ (s"Could not find Parameter ${parameterId}")
-        val message = s"Could not modify Parameter ${parameterId} cause is: ${fail.msg}."
-        toJsonError(Some(parameterId), message)
-    }
-  }
-
-}
-
 class ParameterApiService14(
     readParameter:        RoParameterRepository,
-    writeParameter:       WoParameterRepository,
     uuidGen:              StringUuidGenerator,
     workflowLevelService: WorkflowLevelService
 ) {
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/PluginApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/PluginApi.scala
index d6a5dd5dbc7..1fc54a82015 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/PluginApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/PluginApi.scala
@@ -66,12 +66,10 @@ class PluginApi(
   def schemas: ApiModuleProvider[API] = API
 
   def getLiftEndpoints(): List[LiftApiModule] = {
-    API.endpoints.map { e =>
-      e match {
-        case API.GetPluginsInfo        => GetPluginInfo
-        case API.GetPluginsSettings    => GetPluginSettings
-        case API.UpdatePluginsSettings => UpdatePluginSettings
-      }
+    API.endpoints.map {
+      case API.GetPluginsInfo        => GetPluginInfo
+      case API.GetPluginsSettings    => GetPluginSettings
+      case API.UpdatePluginsSettings => UpdatePluginSettings
     }
   }
 
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala
index f1aacb1edc3..7702eafc55d 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/RuleApi.scala
@@ -38,343 +38,78 @@
 package com.normation.rudder.rest.lift
 
 import com.normation.GitVersion
-import com.normation.box.*
 import com.normation.errors.*
-import com.normation.eventlog.*
 import com.normation.eventlog.EventActor
+import com.normation.eventlog.ModificationId
 import com.normation.inventory.domain.NodeId
 import com.normation.rudder.api.ApiVersion
-import com.normation.rudder.apidata.DetailLevel
-import com.normation.rudder.apidata.FullDetails
 import com.normation.rudder.apidata.JsonQueryObjects.*
 import com.normation.rudder.apidata.JsonResponseObjects.*
-import com.normation.rudder.apidata.MinimalDetails
-import com.normation.rudder.apidata.RestDataSerializer
 import com.normation.rudder.apidata.ZioJsonExtractor
 import com.normation.rudder.apidata.implicits.*
 import com.normation.rudder.batch.AsyncDeploymentActor
 import com.normation.rudder.batch.AutomaticStartDeployment
 import com.normation.rudder.configuration.ConfigurationRepository
 import com.normation.rudder.domain.logger.ConfigurationLoggerPure
+import com.normation.rudder.domain.policies.*
 import com.normation.rudder.domain.policies.ApplicationStatus
 import com.normation.rudder.domain.policies.ChangeRequestRuleDiff
-import com.normation.rudder.domain.policies.DeleteRuleDiff
-import com.normation.rudder.domain.policies.GlobalPolicyMode
-import com.normation.rudder.domain.policies.ModifyToRuleDiff
-import com.normation.rudder.domain.policies.Rule
-import com.normation.rudder.domain.policies.RuleId
-import com.normation.rudder.domain.policies.RuleUid
-import com.normation.rudder.facts.nodes.ChangeContext
-import com.normation.rudder.facts.nodes.CoreNodeFact
-import com.normation.rudder.facts.nodes.CoreNodeFactRepository
-import com.normation.rudder.facts.nodes.QueryContext
-import com.normation.rudder.repository.FullActiveTechniqueCategory
-import com.normation.rudder.repository.FullNodeGroupCategory
-import com.normation.rudder.repository.RoDirectiveRepository
-import com.normation.rudder.repository.RoNodeGroupRepository
-import com.normation.rudder.repository.RoRuleRepository
-import com.normation.rudder.repository.WoRuleRepository
+import com.normation.rudder.facts.nodes.*
+import com.normation.rudder.repository.*
 import com.normation.rudder.rest.*
 import com.normation.rudder.rest.ApiPath
 import com.normation.rudder.rest.AuthzToken
-import com.normation.rudder.rest.RestExtractorService
-import com.normation.rudder.rest.RestUtils
-import com.normation.rudder.rest.RestUtils.getActor
-import com.normation.rudder.rest.RestUtils.toJsonError
-import com.normation.rudder.rest.RestUtils.toJsonResponse
 import com.normation.rudder.rest.RuleApi as API
-import com.normation.rudder.rest.data.*
 import com.normation.rudder.rest.implicits.*
 import com.normation.rudder.rule.category.*
 import com.normation.rudder.rule.category.RuleCategoryId
 import com.normation.rudder.services.policies.RuleApplicationStatusService
-import com.normation.rudder.services.workflows.ChangeRequestService
-import com.normation.rudder.services.workflows.RuleChangeRequest
-import com.normation.rudder.services.workflows.RuleModAction
-import com.normation.rudder.services.workflows.WorkflowLevelService
-import com.normation.rudder.users.UserService
+import com.normation.rudder.services.workflows.*
 import com.normation.rudder.web.services.ComputePolicyMode
 import com.normation.utils.StringUuidGenerator
-import net.liftweb.common.Box
-import net.liftweb.common.EmptyBox
-import net.liftweb.common.Full
-import net.liftweb.common.Loggable
 import net.liftweb.http.LiftResponse
 import net.liftweb.http.Req
-import net.liftweb.json.*
-import net.liftweb.json.JArray
-import net.liftweb.json.JsonDSL.*
 import org.joda.time.DateTime
 import scala.collection.MapView
 import zio.*
 import zio.syntax.*
 
 class RuleApi(
-    restExtractorService: RestExtractorService,
-    zioJsonExtractor:     ZioJsonExtractor,
-    serviceV2:            RuleApiService2,
-    serviceV6:            RuleApiService6,
-    serviceV14:           RuleApiService14,
-    uuidGen:              StringUuidGenerator
+    zioJsonExtractor: ZioJsonExtractor,
+    service:          RuleApiService14,
+    uuidGen:          StringUuidGenerator
 ) extends LiftApiModuleProvider[API] {
 
-  import RestUtils.*
-
-  def response(function: Box[JValue], req: Req, errorMessage: String, dataName: String)(implicit action: String): LiftResponse = {
-    RestUtils.response(restExtractorService, dataName, None)(function, req, errorMessage)
-  }
-
-  def actionResponse(
-      function:     Box[ActionType],
-      req:          Req,
-      errorMessage: String,
-      id:           Option[String],
-      actor:        EventActor,
-      dataName:     String
-  )(implicit action: String): LiftResponse = {
-    RestUtils.actionResponse2(restExtractorService, dataName, uuidGen, id)(function, req, errorMessage)(action, actor)
-  }
-
   def schemas: ApiModuleProvider[API] = API
 
   def getLiftEndpoints(): List[LiftApiModule] = {
-    API.endpoints.map(e => {
-      e match {
-        case API.ListRules                       => ChooseApi0(ListRules, ListRulesV14)
-        case API.RuleDetails                     => ChooseApiN(RuleDetails, RuleDetailsV14)
-        case API.CreateRule                      => ChooseApi0(CreateRule, CreateRuleV14)
-        case API.UpdateRule                      => ChooseApiN(UpdateRule, UpdateRuleV14)
-        case API.DeleteRule                      => ChooseApiN(DeleteRule, DeleteRuleV14)
-        case API.GetRuleTree                     => ChooseApi0(GetRuleTree, GetRuleTreeV14)
-        case API.GetRuleCategoryDetails          => ChooseApiN(GetRuleCategoryDetails, GetRuleCategoryDetailsV14)
-        case API.CreateRuleCategory              => ChooseApi0(CreateRuleCategory, CreateRuleCategoryV14)
-        case API.UpdateRuleCategory              => ChooseApiN(UpdateRuleCategory, UpdateRuleCategoryV14)
-        case API.DeleteRuleCategory              => ChooseApiN(DeleteRuleCategory, DeleteRuleCategoryV14)
-        case API.LoadRuleRevisionForGeneration   => LoadRuleRevisionForGeneration
-        case API.UnloadRuleRevisionForGeneration => UnloadRuleRevisionForGeneration
-      }
-    })
-  }
-
-  object ListRules extends LiftApiModule0 {
-    val schema: API.ListRules.type = API.ListRules
-    val restExtractor = restExtractorService
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      serviceV2.listRules(req)
-    }
-  }
-
-  object CreateRule extends LiftApiModule0 {
-    val schema: API.CreateRule.type = API.CreateRule
-    val restExtractor = restExtractorService
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      var action = "createRule"
-      val id     = restExtractor.extractId(req)(x => RuleId.parse(x).toBox).map(_.getOrElse(RuleId(RuleUid(uuidGen.newUuid))))
-
-      val response = for {
-        ruleId     <- id
-        restRule   <- restExtractor.extractRule(req) ?~! s"Could not extract Rule parameters from request"
-        optCloneId <- restExtractor.extractString("source")(req)(x => RuleId.parse(x).toBox)
-        result     <- serviceV2.createRule(restRule, ruleId, optCloneId, authzToken.qc.actor)
-      } yield {
-        if (optCloneId.nonEmpty)
-          action = "cloneRule"
-        result
-      }
-
-      actionResponse(response, req, "Could not create Rule", id.map(_.serialize), authzToken.qc.actor, "rules")(action)
-    }
-  }
-
-  object RuleDetails extends LiftApiModuleString {
-    val schema: API.RuleDetails.type = API.RuleDetails
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      serviceV2.ruleDetails(id, req)
-    }
-  }
-
-  object DeleteRule extends LiftApiModuleString {
-    val schema: API.DeleteRule.type = API.DeleteRule
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      implicit val qc: QueryContext = authzToken.qc
-      serviceV2.deleteRule(id, req)
-    }
-  }
-
-  object UpdateRule extends LiftApiModuleString {
-    val schema: API.UpdateRule.type = API.UpdateRule
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      implicit val qc: QueryContext = authzToken.qc
-      if (req.json_?) {
-        req.json match {
-          case Full(arg) =>
-            val restRule = restExtractor.extractRuleFromJSON(arg)
-            serviceV2.updateRule(id, req, restRule)
-          case eb: EmptyBox =>
-            toJsonError(None, JString("No Json data sent"))("updateRule", restExtractor.extractPrettify(req.params))
-        }
-      } else {
-        val restRule = restExtractor.extractRule(req.params)
-        serviceV2.updateRule(id, req, restRule)
-      }
-    }
-  }
-
-  object GetRuleTree extends LiftApiModule0 {
-    val schema: API.GetRuleTree.type = API.GetRuleTree
-    val restExtractor = restExtractorService
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      response(
-        serviceV6.getCategoryTree,
-        req,
-        s"Could not fetch Rule category tree",
-        "ruleCategories"
-      )("getRuleTree")
-    }
-  }
-
-  object GetRuleCategoryDetails extends LiftApiModuleString {
-    val schema: API.GetRuleCategoryDetails.type = API.GetRuleCategoryDetails
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      response(
-        serviceV6.getCategoryDetails(RuleCategoryId(id)),
-        req,
-        s"Could not fetch Rule category '${id}' details",
-        "ruleCategories"
-      )("getRuleCategoryDetails")
-    }
-  }
-
-  object DeleteRuleCategory extends LiftApiModuleString {
-    val schema: API.DeleteRuleCategory.type = API.DeleteRuleCategory
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      actionResponse(
-        Full(serviceV6.deleteCategory(RuleCategoryId(id))),
-        req,
-        s"Could not delete Rule category '${id}'",
-        Some(id),
-        authzToken.qc.actor,
-        "ruleCategories"
-      )("deleteRuleCategory")
-    }
-  }
-
-  object UpdateRuleCategory extends LiftApiModuleString {
-    val schema: API.UpdateRuleCategory.type = API.UpdateRuleCategory
-    val restExtractor = restExtractorService
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        id:         String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      val action = {
-        if (req.json_?) {
-          for {
-            json <- req.json ?~! "No JSON data sent"
-            cat  <- restExtractor.extractRuleCategory(json)
-          } yield {
-            serviceV6.updateCategory(RuleCategoryId(id), cat) _
-          }
-        } else {
-          for {
-            restCategory <- restExtractor.extractRuleCategory(req.params)
-          } yield {
-            serviceV6.updateCategory(RuleCategoryId(id), restCategory) _
-          }
-        }
-      }
-      actionResponse(
-        action,
-        req,
-        s"Could not update Rule category '${id}'",
-        Some(id),
-        authzToken.qc.actor,
-        "ruleCategories"
-      )("updateRuleCategory")
-    }
-  }
-
-  object CreateRuleCategory extends LiftApiModule0 {
-    val schema: API.CreateRuleCategory.type = API.CreateRuleCategory
-    val restExtractor = restExtractorService
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      val restData = if (req.json_?) {
-        for {
-          json <- req.json
-          cat  <- restExtractor.extractRuleCategory(json)
-        } yield {
-          cat
-        }
-      } else { restExtractor.extractRuleCategory(req.params) }
-      val id       = restData.map(_.id).toOption.flatten.getOrElse(RuleCategoryId(uuidGen.newUuid))
-      val action   = restData.map(cat => serviceV6.createCategory(cat, () => id) _)
-
-      actionResponse(
-        action,
-        req,
-        s"Could not create Rule category",
-        Some(id.value), // I'm not sure it's relevant to give that on creation
-
-        authzToken.qc.actor,
-        "ruleCategories"
-      )("createRuleCategory")
+    API.endpoints.map {
+      case API.ListRules                       => ListRules
+      case API.RuleDetails                     => RuleDetails
+      case API.CreateRule                      => CreateRule
+      case API.UpdateRule                      => UpdateRule
+      case API.DeleteRule                      => DeleteRule
+      case API.GetRuleTree                     => GetRuleTree
+      case API.GetRuleCategoryDetails          => GetRuleCategoryDetails
+      case API.CreateRuleCategory              => CreateRuleCategory
+      case API.UpdateRuleCategory              => UpdateRuleCategory
+      case API.DeleteRuleCategory              => DeleteRuleCategory
+      case API.LoadRuleRevisionForGeneration   => LoadRuleRevisionForGeneration
+      case API.UnloadRuleRevisionForGeneration => UnloadRuleRevisionForGeneration
     }
   }
 
   //////////////////// new API using only zio_json ////////////////////
 
-  object ListRulesV14 extends LiftApiModule0 {
+  object ListRules extends LiftApiModule0 {
     val schema:                                                                                                API.ListRules.type = API.ListRules
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse       = {
       implicit val qc: QueryContext = authzToken.qc
-      serviceV14.listRules().toLiftResponseList(params, schema)
+      service.listRules().toLiftResponseList(params, schema)
     }
   }
 
-  object RuleDetailsV14 extends LiftApiModuleString {
+  object RuleDetails extends LiftApiModuleString {
     val schema: API.RuleDetails.type = API.RuleDetails
     def process(
         version:    ApiVersion,
@@ -387,19 +122,19 @@ class RuleApi(
       implicit val qc: QueryContext = authzToken.qc
       (for {
         id <- RuleId.parse(sid).toIO
-        r  <- serviceV14.getRule(id)
+        r  <- service.getRule(id)
       } yield r).toLiftResponseOne(params, schema, s => Some(s.id))
     }
   }
 
-  object CreateRuleV14 extends LiftApiModule0 {
+  object CreateRule extends LiftApiModule0 {
     val schema: API.CreateRule.type = API.CreateRule
 
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
       implicit val qc: QueryContext = authzToken.qc
       (for {
         restRule <- zioJsonExtractor.extractRule(req).chainError(s"Could not extract rule parameters from request").toIO
-        result   <- serviceV14.createRule(
+        result   <- service.createRule(
                       restRule,
                       restRule.id.getOrElse(RuleId(RuleUid(uuidGen.newUuid))),
                       restRule.source,
@@ -413,7 +148,7 @@ class RuleApi(
     }
   }
 
-  object UpdateRuleV14 extends LiftApiModuleString {
+  object UpdateRule extends LiftApiModuleString {
     val schema: API.UpdateRule.type = API.UpdateRule
     def process(
         version:    ApiVersion,
@@ -427,14 +162,14 @@ class RuleApi(
       (for {
         id       <- RuleId.parse(sid).toIO
         restRule <- zioJsonExtractor.extractRule(req).chainError(s"Could not extract a rule from request.").toIO
-        res      <- serviceV14.updateRule(restRule.copy(id = Some(id)), params, authzToken.qc.actor)
+        res      <- service.updateRule(restRule.copy(id = Some(id)), params, authzToken.qc.actor)
       } yield {
         res
       }).toLiftResponseOne(params, schema, s => Some(s.id))
     }
   }
 
-  object DeleteRuleV14 extends LiftApiModuleString {
+  object DeleteRule extends LiftApiModuleString {
     val schema: API.DeleteRule.type = API.DeleteRule
     def process(
         version:    ApiVersion,
@@ -447,22 +182,22 @@ class RuleApi(
       implicit val qc: QueryContext = authzToken.qc
       (for {
         id <- RuleId.parse(sid).toIO
-        r  <- serviceV14.deleteRule(id, params, authzToken.qc.actor)
+        r  <- service.deleteRule(id, params, authzToken.qc.actor)
       } yield r).toLiftResponseOne(params, schema, s => Some(s.id))
 
     }
   }
 
-  object GetRuleTreeV14 extends LiftApiModule0 {
+  object GetRuleTree extends LiftApiModule0 {
     val schema: API.GetRuleTree.type = API.GetRuleTree
 
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
       implicit val qc: QueryContext = authzToken.qc
-      serviceV14.getCategoryTree().toLiftResponseOne(params, schema, s => Some(s.ruleCategories.id))
+      service.getCategoryTree().toLiftResponseOne(params, schema, s => Some(s.ruleCategories.id))
     }
   }
 
-  object GetRuleCategoryDetailsV14 extends LiftApiModuleString {
+  object GetRuleCategoryDetails extends LiftApiModuleString {
     val schema: API.GetRuleCategoryDetails.type = API.GetRuleCategoryDetails
     def process(
         version:    ApiVersion,
@@ -472,23 +207,23 @@ class RuleApi(
         params:     DefaultParams,
         authzToken: AuthzToken
     ): LiftResponse = {
-      serviceV14.getCategoryDetails(RuleCategoryId(id)).toLiftResponseOne(params, schema, s => Some(s.ruleCategories.id))
+      service.getCategoryDetails(RuleCategoryId(id)).toLiftResponseOne(params, schema, s => Some(s.ruleCategories.id))
     }
   }
 
-  object CreateRuleCategoryV14 extends LiftApiModule0 {
+  object CreateRuleCategory extends LiftApiModule0 {
     val schema:                                                                                                API.CreateRuleCategory.type = API.CreateRuleCategory
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse                = {
       (for {
         cat <- zioJsonExtractor.extractRuleCategory(req).toIO
-        res <- serviceV14.createCategory(cat, () => uuidGen.newUuid, params, authzToken.qc.actor)
+        res <- service.createCategory(cat, () => uuidGen.newUuid, params, authzToken.qc.actor)
       } yield {
         res
       }).toLiftResponseOne(params, schema, s => Some(s.ruleCategories.id))
     }
   }
 
-  object UpdateRuleCategoryV14 extends LiftApiModuleString {
+  object UpdateRuleCategory extends LiftApiModuleString {
     val schema: API.UpdateRuleCategory.type = API.UpdateRuleCategory
     def process(
         version:    ApiVersion,
@@ -500,14 +235,14 @@ class RuleApi(
     ): LiftResponse = {
       (for {
         cat <- zioJsonExtractor.extractRuleCategory(req).toIO
-        res <- serviceV14.updateCategory(RuleCategoryId(id), cat, params, authzToken.qc.actor)
+        res <- service.updateCategory(RuleCategoryId(id), cat, params, authzToken.qc.actor)
       } yield {
         res
       }).toLiftResponseOne(params, schema, s => Some(s.ruleCategories.id))
     }
   }
 
-  object DeleteRuleCategoryV14 extends LiftApiModuleString {
+  object DeleteRuleCategory extends LiftApiModuleString {
     val schema: API.DeleteRuleCategory.type = API.DeleteRuleCategory
     def process(
         version:    ApiVersion,
@@ -517,7 +252,7 @@ class RuleApi(
         params:     DefaultParams,
         authzToken: AuthzToken
     ): LiftResponse = {
-      serviceV14
+      service
         .deleteCategory(RuleCategoryId(id), params, authzToken.qc.actor)
         .toLiftResponseOne(params, schema, s => Some(s.ruleCategories.id))
     }
@@ -537,7 +272,7 @@ class RuleApi(
 
       (for {
         rid <- RuleId.parse(id).toIO
-        res <- serviceV14.loadRule(rid, params, authzToken.qc.actor)
+        res <- service.loadRule(rid, params, authzToken.qc.actor)
       } yield res).toLiftResponseOne(params, schema, s => Some(s.id))
     }
   }
@@ -554,305 +289,13 @@ class RuleApi(
     ): LiftResponse = {
       (for {
         rid <- RuleId.parse(id).toIO
-        res <- serviceV14.unloadRule(rid, params, authzToken.qc.actor)
+        res <- service.unloadRule(rid, params, authzToken.qc.actor)
       } yield res).toLiftResponseOne(params, schema, s => Some(s.serialize))
     }
   }
 
 }
 
-class RuleApiService2(
-    readRule:             RoRuleRepository,
-    writeRule:            WoRuleRepository,
-    uuidGen:              StringUuidGenerator,
-    asyncDeploymentAgent: AsyncDeploymentActor,
-    workflowLevelService: WorkflowLevelService,
-    restExtractor:        RestExtractorService,
-    restDataSerializer:   RestDataSerializer
-)(implicit userService: UserService) {
-
-  import restDataSerializer.serializeRule as serialize
-
-  private def createChangeRequestAndAnswer(
-      id:     String,
-      diff:   ChangeRequestRuleDiff,
-      change: RuleChangeRequest,
-      actor:  EventActor,
-      req:    Req
-  )(implicit action: String, prettify: Boolean, qc: QueryContext) = {
-    (for {
-      workflow <- workflowLevelService.getForRule(actor, change)
-      reason   <- restExtractor.extractReason(req)
-      crName   <- restExtractor
-                    .extractChangeRequestName(req)
-                    .map(_.getOrElse(s"${change.action.name} rule '${change.newRule.name}' by API request"))
-      crDesc    = restExtractor.extractChangeRequestDescription(req)
-      cr        = ChangeRequestService.createChangeRequestFromRule(
-                    crName,
-                    crDesc,
-                    change.newRule,
-                    change.previousRule,
-                    diff,
-                    actor,
-                    reason
-                  )
-      id       <- workflowLevelService
-                    .getWorkflowService()
-                    .startWorkflow(cr)(
-                      ChangeContext(ModificationId(uuidGen.newUuid), actor, new DateTime(), reason, None, qc.nodePerms)
-                    )
-    } yield {
-      (workflow.needExternalValidation(), id)
-    }) match {
-      case Full((needValidation, crId)) =>
-        val optCrId  = if (needValidation) Some(crId) else None
-        val jsonRule = List(serialize(change.newRule, optCrId))
-        toJsonResponse(Some(id), ("rules" -> JArray(jsonRule)))
-      case eb: EmptyBox =>
-        val fail = eb ?~ (s"Could not save changes on Rule ${id}")
-        val msg  = s"${change.action.name} failed, cause is: ${fail.msg}."
-        toJsonError(Some(id), msg)
-    }
-  }
-
-  def listRules(req: Req): LiftResponse = {
-    implicit val action   = "listRules"
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-    readRule.getAll(false).toBox match {
-      case Full(rules) =>
-        toJsonResponse(None, ("rules" -> JArray(rules.map(serialize(_, None)).toList)))
-      case eb: EmptyBox =>
-        val message = (eb ?~ ("Could not fetch Rules")).msg
-        toJsonError(None, message)
-    }
-  }
-
-  def actualRuleCreation(
-      change: RuleChangeRequest
-  )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JArray] = {
-    (for {
-      _ <- writeRule.create(change.newRule, modId, actor, reason).toBox
-    } yield {
-      asyncDeploymentAgent ! AutomaticStartDeployment(modId, actor)
-      JArray(serialize(change.newRule, None) :: Nil)
-    }) ?~ (s"Could not save Rule ${change.newRule.id.serialize}")
-  }
-
-  def createRule(
-      restRule: RestRule,
-      ruleId:   RuleId,
-      clone:    Option[RuleId],
-      actor:    EventActor
-  ): Box[(EventActor, ModificationId, Option[String]) => Box[JValue]] = {
-    // decide if we should create a new rule or clone an existing one
-    // Return the source rule to use in each case.
-    def createOrClone(name: String): Box[RuleChangeRequest] = {
-      clone match {
-        case Some(sourceId) =>
-          // clone existing rule
-          for {
-            rule <- readRule.get(sourceId).toBox ?~!
-                    s"Could not create rule '${name}' (id:${ruleId.serialize}) by cloning rule '${sourceId.serialize}')"
-          } yield {
-            RuleChangeRequest(RuleModAction.Create, restRule.updateRule(rule).copy(id = ruleId), Some(rule))
-          }
-
-        case None =>
-          // create from scratch - base rule is the same with default values
-          val category       = restRule.category.getOrElse(RuleCategoryId("rootRuleCategory"))
-          val baseRule       = Rule(ruleId, name, category)
-          // If enable is missing in parameter consider it to true
-          val defaultEnabled = restRule.enabled.getOrElse(true)
-
-          val change = RuleChangeRequest(RuleModAction.Create, restRule.updateRule(baseRule), Some(baseRule))
-          // if only the name parameter is set, consider it to be enabled
-          // if not if workflow are enabled, consider it to be disabled
-          // if there is no workflow, use the value used as parameter (default to true)
-          // code extract :
-          /*
-           * if (restRule.onlyName) true
-           * else if (workflowEnabled) false
-           * else defaultEnabled
-           */
-          for {
-            workflow <- workflowLevelService.getForRule(actor, change) ?~! "Could not find workflow status for that rule creation"
-          } yield {
-            // we don't actually start a workflow, we only disable the rule if a workflow should be
-            // started. Update rule "enable" status accordingly.
-            val enableCheck = restRule.onlyName || (!workflow.needExternalValidation() && defaultEnabled)
-            // Then enabled value in restRule will be used in the saved Rule
-            change.copy(newRule = change.newRule.copy(isEnabledStatus = enableCheck))
-          }
-      }
-    }
-
-    (for {
-      name   <- Box(restRule.name) ?~! "Missing manadatory parameter Name"
-      change <- createOrClone(name)
-    } yield {
-      (actualRuleCreation(change) _)
-    }) ?~ (s"Error when creating new rule")
-  }
-
-  // only used in old API, don't care about revision
-  def ruleDetails(id: String, req: Req): LiftResponse = {
-    implicit val action   = "ruleDetails"
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-
-    readRule.get(RuleId(RuleUid(id))).toBox match {
-      case Full(rule) =>
-        val jsonRule = List(serialize(rule, None))
-        toJsonResponse(Some(id), ("rules" -> JArray(jsonRule)))
-      case eb: EmptyBox =>
-        val fail    = eb ?~! (s"Could not find Rule ${id}")
-        val message = s"Could not get Rule ${id} details cause is: ${fail.msg}."
-        toJsonError(Some(id), message)
-    }
-  }
-
-  def deleteRule(id: String, req: Req)(implicit qc: QueryContext): LiftResponse = {
-    implicit val action   = "deleteRule"
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-    val actor             = RestUtils.getActor(req)
-    val ruleId            = RuleId(RuleUid(id))
-
-    readRule.get(ruleId).toBox match {
-      case Full(rule) =>
-        val deleteRuleDiff = DeleteRuleDiff(rule)
-        val change         = RuleChangeRequest(RuleModAction.Delete, rule, Some(rule))
-        createChangeRequestAndAnswer(id, deleteRuleDiff, change, actor, req)
-
-      case eb: EmptyBox =>
-        val fail    = eb ?~ (s"Could not find Rule ${ruleId.serialize}")
-        val message = s"Could not delete Rule ${ruleId.serialize} cause is: ${fail.msg}."
-        toJsonError(Some(ruleId.serialize), message)
-    }
-  }
-
-  def updateRule(id: String, req: Req, restValues: Box[RestRule])(implicit qc: QueryContext): LiftResponse = {
-    implicit val action   = "updateRule"
-    implicit val prettify = restExtractor.extractPrettify(req.params)
-    val actor             = getActor(req)
-    val ruleId            = RuleId(RuleUid(id))
-
-    readRule.get(ruleId).toBox match {
-      case Full(rule) =>
-        restValues match {
-          case Full(restRule) =>
-            val updatedRule = restRule.updateRule(rule)
-            val diff        = ModifyToRuleDiff(updatedRule)
-            val change      = RuleChangeRequest(RuleModAction.Update, updatedRule, Some(rule))
-            createChangeRequestAndAnswer(id, diff, change, actor, req)
-
-          case eb: EmptyBox =>
-            val fail    = eb ?~ (s"Could extract values from request")
-            val message = s"Could not modify Rule ${ruleId.serialize} cause is: ${fail.msg}."
-            toJsonError(Some(ruleId.serialize), message)
-        }
-
-      case eb: EmptyBox =>
-        val fail    = eb ?~ (s"Could not find Rule ${ruleId.serialize}")
-        val message = s"Could not modify Rule ${ruleId.serialize} cause is: ${fail.msg}."
-        toJsonError(Some(ruleId.serialize), message)
-    }
-  }
-
-}
-
-class RuleApiService6(
-    readRuleCategory:   RoRuleCategoryRepository,
-    readRule:           RoRuleRepository,
-    writeRuleCategory:  WoRuleCategoryRepository,
-    restDataSerializer: RestDataSerializer
-) extends Loggable {
-
-  def getCategoryInformations(category: RuleCategory, parent: RuleCategoryId, detail: DetailLevel): Box[JValue] = {
-    for {
-      rules <- readRule.getAll()
-
-    } yield {
-      restDataSerializer.serializeRuleCategory(category, parent, rules.groupBy(_.categoryId), detail)
-    }
-  }.toBox
-
-  def getCategoryTree: Box[JValue] = {
-    for {
-      root       <- readRuleCategory.getRootCategory().toBox
-      categories <- getCategoryInformations(root, root.id, FullDetails)
-    } yield {
-      categories
-    }
-  }
-
-  def getCategoryDetails(id: RuleCategoryId): Box[JValue] = {
-    for {
-      root              <- readRuleCategory.getRootCategory().toBox
-      found             <- root.find(id)
-      (category, parent) = found
-      categories        <- getCategoryInformations(category, parent, MinimalDetails)
-    } yield {
-      categories
-    }
-  }
-
-  def deleteCategory(id: RuleCategoryId)(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = {
-    for {
-      root              <- readRuleCategory.getRootCategory()
-      found             <- root.find(id).toIO
-      (category, parent) = found
-      rules             <- readRule.getAll()
-      ok                <- ZIO.when(!category.canBeDeleted(rules.toList)) {
-                             Inconsistency(s"Cannot delete category '${category.name}' since that category is not empty").fail
-                           }
-      _                 <- writeRuleCategory.delete(id, modId, actor, reason)
-      category          <- getCategoryInformations(category, parent, MinimalDetails).toIO
-    } yield {
-      category
-    }
-  }.toBox
-
-  def updateCategory(
-      id:       RuleCategoryId,
-      restData: RestRuleCategory
-  )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = {
-    logger.info(restData)
-    for {
-      root              <- readRuleCategory.getRootCategory()
-      found             <- root.find(id).toIO
-      (category, parent) = found
-      rules             <- readRule.getAll()
-      update             = restData.update(category)
-      updatedParent      = restData.parent.getOrElse(parent)
-
-      _        <- restData.parent match {
-                    case Some(parent) =>
-                      writeRuleCategory.updateAndMove(update, parent, modId, actor, reason)
-                    case None         =>
-                      writeRuleCategory.updateAndMove(update, parent, modId, actor, reason)
-                  }
-      category <- getCategoryInformations(update, updatedParent, MinimalDetails).toIO
-    } yield {
-      category
-    }
-  }.toBox
-
-  def createCategory(
-      restData:  RestRuleCategory,
-      defaultId: () => RuleCategoryId
-  )(actor: EventActor, modId: ModificationId, reason: Option[String]): Box[JValue] = {
-    for {
-      name     <- restData.name.notOptional("Could not create Rule Category, cause name is not defined").toBox
-      update    = RuleCategory(restData.id.getOrElse(defaultId()), name, restData.description.getOrElse(""), Nil)
-      parent    = restData.parent.getOrElse(RuleCategoryId("rootRuleCategory"))
-      _        <- writeRuleCategory.create(update, parent, modId, actor, reason).toBox
-      category <- getCategoryInformations(update, parent, MinimalDetails)
-    } yield {
-      category
-    }
-  }
-
-}
-
 final case class RuleApplicationStatus(policyMode: (String, String), applicationStatusDetails: (String, Option[String]))
 
 class RuleApiService14(
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ScoreApiImpl.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ScoreApiImpl.scala
index 7c0ee9bf92d..899692ca68c 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ScoreApiImpl.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/ScoreApiImpl.scala
@@ -16,7 +16,7 @@ class ScoreApiImpl(restExtractorService: RestExtractorService, scoreService: Sco
   def schemas: ApiModuleProvider[API] = API
 
   override def getLiftEndpoints(): List[LiftApiModule] = {
-    GetScoreList :: Nil
+    API.endpoints.map { case ScoreApi.GetScoreList => GetScoreList }
   }
 
   object GetScoreList extends LiftApiModule0 {
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala
index 6faae352d18..c0af5844c3f 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SettingsApi.scala
@@ -49,8 +49,12 @@ import com.normation.rudder.batch.AsyncDeploymentActor
 import com.normation.rudder.batch.AutomaticStartDeployment
 import com.normation.rudder.batch.PolicyGenerationTrigger
 import com.normation.rudder.domain.appconfig.FeatureSwitch
+import com.normation.rudder.domain.nodes.NodeKind
 import com.normation.rudder.domain.nodes.NodeState
 import com.normation.rudder.domain.policies.PolicyMode
+import com.normation.rudder.facts.nodes.NodeFactRepository
+import com.normation.rudder.facts.nodes.QueryContext
+import com.normation.rudder.facts.nodes.SelectNodeStatus
 import com.normation.rudder.reports.*
 import com.normation.rudder.rest.ApiModuleProvider
 import com.normation.rudder.rest.ApiPath
@@ -59,7 +63,6 @@ import com.normation.rudder.rest.OneParam
 import com.normation.rudder.rest.RestExtractorService
 import com.normation.rudder.rest.RestUtils
 import com.normation.rudder.rest.SettingsApi as API
-import com.normation.rudder.services.nodes.NodeInfoService
 import com.normation.rudder.services.policies.SendMetrics
 import com.normation.rudder.services.servers.AllowedNetwork
 import com.normation.rudder.services.servers.PolicyServerManagementService
@@ -88,10 +91,11 @@ class SettingsApi(
     val asyncDeploymentAgent:          AsyncDeploymentActor,
     val uuidGen:                       StringUuidGenerator,
     val policyServerManagementService: PolicyServerManagementService,
-    val nodeInfoService:               NodeInfoService
+    val nodeFactRepo:                  NodeFactRepository
 ) extends LiftApiModuleProvider[API] {
 
-  val allSettings_v10: List[RestSetting[?]] = {
+  val allSettings: List[RestSetting[?]] = {
+    RestReportProtocolDefault ::
     RestPolicyMode ::
     RestPolicyModeOverridable ::
     RestRunFrequency ::
@@ -133,33 +137,21 @@ class SettingsApi(
     Nil
   }
 
-  val allSettings_v12: List[RestSetting[?]] = RestReportProtocolDefault :: allSettings_v10
-
-  def allSettings(version: ApiVersion): List[RestSetting[?]] = {
-    if (version.value <= 10) {
-      allSettings_v10
-    } else {
-      allSettings_v12
-    }
-  }
-
   val kind = "settings"
 
   def schemas: ApiModuleProvider[API] = API
 
   def getLiftEndpoints(): List[LiftApiModule] = {
-    API.endpoints.map(e => {
-      e match {
-        case API.GetAllAllowedNetworks     => GetAllAllowedNetworks
-        case API.GetAllowedNetworks        => GetAllowedNetworks
-        case API.ModifyAllowedNetworks     => ModifyAllowedNetworks
-        case API.ModifyDiffAllowedNetworks => ModifyDiffAllowedNetworks
-        case API.GetAllSettings            => GetAllSettings
-        case API.ModifySettings            => ModifySettings
-        case API.GetSetting                => GetSetting
-        case API.ModifySetting             => ModifySetting
-      }
-    })
+    API.endpoints.map {
+      case API.GetAllAllowedNetworks     => GetAllAllowedNetworks
+      case API.GetAllowedNetworks        => GetAllowedNetworks
+      case API.ModifyAllowedNetworks     => ModifyAllowedNetworks
+      case API.ModifyDiffAllowedNetworks => ModifyDiffAllowedNetworks
+      case API.GetAllSettings            => GetAllSettings
+      case API.ModifySettings            => ModifySettings
+      case API.GetSetting                => GetSetting
+      case API.ModifySetting             => ModifySetting
+    }
   }
 
   object GetAllSettings extends LiftApiModule0 {
@@ -167,7 +159,7 @@ class SettingsApi(
     val restExtractor = restExtractorService
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
       val settings = for {
-        setting <- allSettings(version)
+        setting <- allSettings
       } yield {
         val result = setting.getJson match {
           case Full(res) => res
@@ -178,7 +170,7 @@ class SettingsApi(
         JField(setting.key, result)
       }
       val data     = if (version.value >= 11) {
-        val networks = GetAllAllowedNetworks.getAllowedNetworks().either.runNow match {
+        val networks = GetAllAllowedNetworks.getAllowedNetworks()(authzToken.qc).either.runNow match {
           case Right(nets) =>
             nets
           case Left(err)   =>
@@ -192,7 +184,8 @@ class SettingsApi(
 
       // sort settings alphanum
       RestUtils.response(restExtractorService, "settings", None)(Full(data.sortBy(_.name)), req, s"Could not settings")(
-        "getAllSettings"
+        "getAllSettings",
+        params.prettify
       )
     }
   }
@@ -203,14 +196,17 @@ class SettingsApi(
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
       var generate = false
       val data     = for {
-        setting <- allSettings(version)
+        setting <- allSettings
         value   <- setting.setFromRequestOpt(req, authzToken.qc.actor)
       } yield {
         if (value.isDefined) generate = generate || setting.startPolicyGeneration
         JField(setting.key, value)
       }
       startNewPolicyGeneration(authzToken.qc.actor)
-      RestUtils.response(restExtractorService, "settings", None)(Full(data), req, s"Could not modfiy settings")("modifySettings")
+      RestUtils.response(restExtractorService, "settings", None)(Full(data), req, s"Could not modfiy settings")(
+        "modifySettings",
+        params.prettify
+      )
     }
   }
 
@@ -226,13 +222,14 @@ class SettingsApi(
         authzToken: AuthzToken
     ): LiftResponse = {
       val data: Box[JValue] = for {
-        setting <- settingFromKey(key, allSettings(version))
+        setting <- settingFromKey(key, allSettings)
         value   <- setting.getJson
       } yield {
         (key -> value)
       }
       RestUtils.response(restExtractorService, "settings", Some(key))(data, req, s"Could not get parameter '${key}'")(
-        "getSetting"
+        "getSetting",
+        params.prettify
       )
     }
   }
@@ -249,13 +246,14 @@ class SettingsApi(
         authzToken: AuthzToken
     ): LiftResponse = {
       val data: Box[JValue] = for {
-        setting <- settingFromKey(key, allSettings(version))
+        setting <- settingFromKey(key, allSettings)
         value   <- setting.setFromRequest(req, authzToken.qc.actor)
       } yield {
         (key -> value)
       }
       RestUtils.response(restExtractorService, "settings", Some(key))(data, req, s"Could not modify parameter '${key}'")(
-        "modifySetting"
+        "modifySetting",
+        params.prettify
       )
     }
   }
@@ -701,7 +699,8 @@ class SettingsApi(
   }
 
   def response(function: Box[JValue], req: Req, errorMessage: String, id: Option[String])(implicit
-      action: String
+      action:   String,
+      prettify: Boolean
   ): LiftResponse = {
     RestUtils.response(restExtractorService, kind, id)(function, req, errorMessage)
   }
@@ -831,9 +830,11 @@ class SettingsApi(
 
   object GetAllAllowedNetworks extends LiftApiModule0 {
 
-    def getAllowedNetworks(): ZIO[Any, RudderError, JArray] = {
+    def getAllowedNetworks()(implicit qc: QueryContext): ZIO[Any, RudderError, JArray] = {
       for {
-        servers         <- nodeInfoService.getAllSystemNodeIds()
+        servers         <- nodeFactRepo
+                             .getAll()(qc, SelectNodeStatus.Accepted)
+                             .map(_.collect { case (_, n) if (n.rudderSettings.kind != NodeKind.Node) => n.id }.toSeq)
         allowedNetworks <- policyServerManagementService.getAllAllowedNetworks()
       } yield {
         val toKeep = servers.map(id => (id.value, allowedNetworks.getOrElse(id, Nil).map(_.inet))).sortWith {
@@ -853,8 +854,9 @@ class SettingsApi(
     val restExtractor = restExtractorService
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
       implicit val action = "getAllAllowedNetworks"
+      implicit val prettify: Boolean = params.prettify
       RestUtils.response(restExtractorService, getRootNameForVersion(version), None)(
-        getAllowedNetworks().toBox,
+        getAllowedNetworks()(authzToken.qc).toBox,
         req,
         s"Could not get allowed networks"
       )
@@ -874,16 +876,17 @@ class SettingsApi(
     ): LiftResponse = {
 
       implicit val action = "getAllowedNetworks"
-      val result          = for {
-        nodeInfo <- nodeInfoService.getNodeInfo(NodeId(id))
+      implicit val prettify: Boolean = params.prettify
+      val result = for {
+        nodeInfo <- nodeFactRepo.get(NodeId(id))(authzToken.qc)
         isServer <- nodeInfo match {
-                      case Some(info) if info.isPolicyServer =>
+                      case Some(info) if info.rudderSettings.isPolicyServer =>
                         ZIO.unit
-                      case Some(_)                           =>
+                      case Some(_)                                          =>
                         Inconsistency(
                           s"Can get allowed networks of node with '${id}' because it is node a policy server (root or relay)"
                         ).fail
-                      case None                              =>
+                      case None                                             =>
                         Inconsistency(s"Could not find node information for id '${id}', this node does not exist").fail
                     }
         networks <- getAllowedNetworksForServer(NodeId(id))
@@ -915,6 +918,7 @@ class SettingsApi(
     ): LiftResponse = {
 
       implicit val action = "modifyAllowedNetworks"
+      implicit val prettify: Boolean = params.prettify
 
       def checkAllowedNetwork(v: String) = {
         val netWithoutSpaces = v.replaceAll("""\s""", "")
@@ -933,15 +937,15 @@ class SettingsApi(
       val modificationId = new ModificationId(uuidGen.newUuid)
       val nodeId         = NodeId(id)
       val result         = for {
-        nodeInfo <- nodeInfoService.getNodeInfo(nodeId).toBox
+        nodeInfo <- nodeFactRepo.get(nodeId)(authzToken.qc).toBox
         isServer <- nodeInfo match {
-                      case Some(info) if info.isPolicyServer =>
+                      case Some(info) if info.rudderSettings.isPolicyServer =>
                         Full(())
-                      case Some(_)                           =>
+                      case Some(_)                                          =>
                         Failure(
                           s"Can set allowed networks of node with '${id}' because it is node a policy server (root or relay)"
                         )
-                      case None                              =>
+                      case None                                             =>
                         Failure(s"Could not find node information for id '${id}', this node does not exist")
                     }
         networks <- if (req.json_?) {
@@ -998,6 +1002,7 @@ class SettingsApi(
     ): LiftResponse = {
 
       implicit val action = "modifyDiffAllowedNetworks"
+      implicit val prettify: Boolean = params.prettify
 
       def checkAllowedNetwork(v: String) = {
         val netWithoutSpaces = v.replaceAll("""\s""", "")
@@ -1019,15 +1024,15 @@ class SettingsApi(
       implicit val formats = DefaultFormats
 
       val result = for {
-        nodeInfo <- nodeInfoService.getNodeInfo(nodeId).toBox
+        nodeInfo <- nodeFactRepo.get(nodeId)(authzToken.qc).toBox
         isServer <- nodeInfo match {
-                      case Some(info) if info.isPolicyServer =>
+                      case Some(info) if info.rudderSettings.isPolicyServer =>
                         Full(())
-                      case Some(_)                           =>
+                      case Some(_)                                          =>
                         Failure(
                           s"Can set allowed networks of node with '${id}' because it is node a policy server (root or relay)"
                         )
-                      case None                              =>
+                      case None                                             =>
                         Failure(s"Could not find node information for id '${id}', this node does not exist")
                     }
         json      = if (req.json_?) {
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala
index 9990838d836..045e6dd9f5b 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/SystemApi.scala
@@ -106,50 +106,48 @@ class SystemApi(
 
   override def getLiftEndpoints(): List[LiftApiModule] = {
 
-    API.endpoints.map(e => {
-      e match {
-        case API.Info                           => Info
-        case API.Status                         => Status
-        case API.DebugInfo                      => DebugInfo
-        case API.TechniquesReload               => TechniquesReload
-        case API.DyngroupsReload                => DyngroupsReload
-        case API.ReloadAll                      => ReloadAll
-        case API.PoliciesUpdate                 => PoliciesUpdate
-        case API.PoliciesRegenerate             => PoliciesRegenerate
-        case API.ArchivesGroupsList             => ArchivesGroupsList
-        case API.ArchivesDirectivesList         => ArchivesDirectivesList
-        case API.ArchivesRulesList              => ArchivesRulesList
-        case API.ArchivesParametersList         => ArchivesParametersList
-        case API.ArchivesFullList               => ArchivesFullList
-        case API.RestoreGroupsLatestArchive     => RestoreGroupsLatestArchive
-        case API.RestoreDirectivesLatestArchive => RestoreDirectivesLatestArchive
-        case API.RestoreRulesLatestArchive      => RestoreRulesLatestArchive
-        case API.RestoreParametersLatestArchive => RestoreParametersLatestArchive
-        case API.RestoreFullLatestArchive       => RestoreFullLatestArchive
-        case API.RestoreGroupsLatestCommit      => RestoreGroupsLatestCommit
-        case API.RestoreDirectivesLatestCommit  => RestoreDirectivesLatestCommit
-        case API.RestoreRulesLatestCommit       => RestoreRulesLatestCommit
-        case API.RestoreParametersLatestCommit  => RestoreParametersLatestCommit
-        case API.RestoreFullLatestCommit        => RestoreFullLatestCommit
-        case API.ArchiveGroups                  => ArchiveGroups
-        case API.ArchiveDirectives              => ArchiveDirectives
-        case API.ArchiveRules                   => ArchiveRules
-        case API.ArchiveParameters              => ArchiveParameters
-        case API.ArchiveFull                    => ArchiveAll
-        case API.ArchiveGroupDateRestore        => ArchiveGroupDateRestore
-        case API.ArchiveDirectiveDateRestore    => ArchiveDirectiveDateRestore
-        case API.ArchiveRuleDateRestore         => ArchiveRuleDateRestore
-        case API.ArchiveParameterDateRestore    => ArchiveParameterDateRestore
-        case API.ArchiveFullDateRestore         => ArchiveFullDateRestore
-        case API.GetGroupsZipArchive            => GetGroupsZipArchive
-        case API.GetDirectivesZipArchive        => GetDirectivesZipArchive
-        case API.GetRulesZipArchive             => GetRulesZipArchive
-        case API.GetParametersZipArchive        => GetParametersZipArchive
-        case API.GetAllZipArchive               => GetAllZipArchive
-        case API.GetHealthcheckResult           => GetHealthcheckResult
-        case API.PurgeSoftware                  => PurgeSoftware
-      }
-    })
+    API.endpoints.map {
+      case API.Info                           => Info
+      case API.Status                         => Status
+      case API.DebugInfo                      => DebugInfo
+      case API.TechniquesReload               => TechniquesReload
+      case API.DyngroupsReload                => DyngroupsReload
+      case API.ReloadAll                      => ReloadAll
+      case API.PoliciesUpdate                 => PoliciesUpdate
+      case API.PoliciesRegenerate             => PoliciesRegenerate
+      case API.ArchivesGroupsList             => ArchivesGroupsList
+      case API.ArchivesDirectivesList         => ArchivesDirectivesList
+      case API.ArchivesRulesList              => ArchivesRulesList
+      case API.ArchivesParametersList         => ArchivesParametersList
+      case API.ArchivesFullList               => ArchivesFullList
+      case API.RestoreGroupsLatestArchive     => RestoreGroupsLatestArchive
+      case API.RestoreDirectivesLatestArchive => RestoreDirectivesLatestArchive
+      case API.RestoreRulesLatestArchive      => RestoreRulesLatestArchive
+      case API.RestoreParametersLatestArchive => RestoreParametersLatestArchive
+      case API.RestoreFullLatestArchive       => RestoreFullLatestArchive
+      case API.RestoreGroupsLatestCommit      => RestoreGroupsLatestCommit
+      case API.RestoreDirectivesLatestCommit  => RestoreDirectivesLatestCommit
+      case API.RestoreRulesLatestCommit       => RestoreRulesLatestCommit
+      case API.RestoreParametersLatestCommit  => RestoreParametersLatestCommit
+      case API.RestoreFullLatestCommit        => RestoreFullLatestCommit
+      case API.ArchiveGroups                  => ArchiveGroups
+      case API.ArchiveDirectives              => ArchiveDirectives
+      case API.ArchiveRules                   => ArchiveRules
+      case API.ArchiveParameters              => ArchiveParameters
+      case API.ArchiveFull                    => ArchiveAll
+      case API.ArchiveGroupDateRestore        => ArchiveGroupDateRestore
+      case API.ArchiveDirectiveDateRestore    => ArchiveDirectiveDateRestore
+      case API.ArchiveRuleDateRestore         => ArchiveRuleDateRestore
+      case API.ArchiveParameterDateRestore    => ArchiveParameterDateRestore
+      case API.ArchiveFullDateRestore         => ArchiveFullDateRestore
+      case API.GetGroupsZipArchive            => GetGroupsZipArchive
+      case API.GetDirectivesZipArchive        => GetDirectivesZipArchive
+      case API.GetRulesZipArchive             => GetRulesZipArchive
+      case API.GetParametersZipArchive        => GetParametersZipArchive
+      case API.GetAllZipArchive               => GetAllZipArchive
+      case API.GetHealthcheckResult           => GetHealthcheckResult
+      case API.PurgeSoftware                  => PurgeSoftware
+    }
   }
 
   object Info extends LiftApiModule0 {
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala
index 1020c1d51f0..a8b553408bb 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/TechniqueApi.scala
@@ -42,12 +42,13 @@ import com.normation.box.*
 import com.normation.cfclerk.domain.*
 import com.normation.cfclerk.services.TechniqueRepository
 import com.normation.errors.*
-import com.normation.eventlog.EventActor
 import com.normation.eventlog.ModificationId
 import com.normation.rudder.api.ApiVersion
 import com.normation.rudder.apidata.JsonResponseObjects.*
 import com.normation.rudder.apidata.RestDataSerializer
 import com.normation.rudder.apidata.implicits.*
+import com.normation.rudder.config.ReasonBehavior
+import com.normation.rudder.config.UserPropertyService
 import com.normation.rudder.domain.logger.ApiLoggerPure
 import com.normation.rudder.domain.policies.Directive
 import com.normation.rudder.ncf.*
@@ -56,7 +57,6 @@ import com.normation.rudder.ncf.yaml.YamlTechniqueSerializer
 import com.normation.rudder.repository.RoDirectiveRepository
 import com.normation.rudder.repository.xml.TechniqueRevisionRepository
 import com.normation.rudder.rest.{TechniqueApi as API, *}
-import com.normation.rudder.rest.RestUtils.ActionType
 import com.normation.rudder.rest.RestUtils.response
 import com.normation.rudder.rest.implicits.*
 import com.normation.rudder.rest.lift.TechniqueApi.QueryFormat
@@ -91,13 +91,13 @@ object TechniqueApi {
 
 class TechniqueApi(
     restExtractorService: RestExtractorService,
-    apiV6:                TechniqueAPIService6,
-    serviceV14:           TechniqueAPIService14,
+    service:              TechniqueAPIService14,
     techniqueWriter:      TechniqueWriter,
     techniqueReader:      EditorTechniqueReader,
     techniqueRepository:  TechniqueRepository,
     techniqueSerializer:  TechniqueSerializer,
     uuidGen:              StringUuidGenerator,
+    userPropertyService:  UserPropertyService,
     resourceFileService:  ResourceFileService,
     configRepoPath:       String
 ) extends LiftApiModuleProvider[API] {
@@ -105,66 +105,40 @@ class TechniqueApi(
   import TechniqueApi.*
   import zio.json.*
   import zio.json.yaml.*
+
+  implicit def reasonBehavior: ReasonBehavior = userPropertyService.reasonsFieldBehavior
+
   def schemas: ApiModuleProvider[API] = API
 
   val dataName = "techniques"
-  def resp(function: Box[JValue], req: Req, errorMessage: String)(action: String)(implicit dataName: String): LiftResponse = {
-    response(restExtractorService, dataName, None)(function, req, errorMessage)
-  }
-
-  def actionResp(function: Box[ActionType], req: Req, errorMessage: String, actor: EventActor)(implicit
+  def resp(function: Box[JValue], req: Req, errorMessage: String)(
       action: String
-  ): LiftResponse = {
-    // implementation copied from RestUtils#actionResponse2
-    // but changed to never fail on reason message extraction
-    implicit val prettify = restExtractorService.extractPrettify(req.params)
-    import net.liftweb.json.JsonDSL.*
-    import net.liftweb.common.EmptyBox
-
-    (
-      for {
-        reason <- restExtractorService.extractReason(req).or(Full(Some("Technique updated via technique editor API")))
-        modId   = ModificationId(uuidGen.newUuid)
-        result <- function.flatMap(_(actor, modId, reason))
-      } yield {
-        result
-      }
-    ) match {
-      case Full(result: JValue) =>
-        RestUtils.toJsonResponse(None, (dataName -> result))
-      case eb: EmptyBox =>
-        val message = (eb ?~! errorMessage).messageChain
-        RestUtils.toJsonError(None, message)
-    }
-
+  )(implicit dataName: String, prettify: Boolean): LiftResponse = {
+    response(restExtractorService, dataName, None)(function, req, errorMessage)
   }
 
   def getLiftEndpoints(): List[LiftApiModule] = {
-    API.endpoints
-      .map(e => {
-        e match {
-          case API.GetTechniques             => ChooseApi0(ListTechniques, GetTechniques)
-          case API.ListTechniques            => ListTechniquesV14
-          case API.ListTechniquesDirectives  => ChooseApiN(ListTechniquesDirectives, ListTechniquesDirectivesV14)
-          case API.ListTechniqueDirectives   => ChooseApiN(ListTechniqueDirectives, ListTechniqueDirectivesV14)
-          case API.TechniqueRevisions        => TechniqueRevisions
-          case API.UpdateTechnique           => UpdateTechnique
-          case API.CreateTechnique           => CreateTechnique
-          case API.GetResources              => new GetResources[API.GetResources.type](newTechnique = false, schema = API.GetResources)
-          case API.GetNewResources           =>
-            new GetResources[API.GetNewResources.type](newTechnique = true, schema = API.GetNewResources)
-          case API.DeleteTechnique           => DeleteTechnique
-          case API.GetMethods                => GetMethods
-          case API.UpdateMethods             => UpdateMethods
-          case API.UpdateTechniques          => UpdateTechniques
-          case API.GetAllTechniqueCategories => GetAllTechniqueCategories
-          case API.GetTechniqueAllVersion    => GetTechniqueDetailsAllVersion
-          case API.GetTechnique              => GetTechnique
-          case API.CheckTechnique            => CheckTechnique
-          case API.CopyResourcesWhenCloning  => CopyResourcesWhenCloning
-        }
-      })
-      .toList
+    API.endpoints.map {
+      case API.GetTechniques             => GetTechniques
+      case API.ListTechniques            => ListTechniques
+      case API.ListTechniquesDirectives  => ListTechniquesDirectives
+      case API.ListTechniqueDirectives   => ListTechniqueDirectives
+      case API.TechniqueRevisions        => TechniqueRevisions
+      case API.UpdateTechnique           => UpdateTechnique
+      case API.CreateTechnique           => CreateTechnique
+      case API.GetResources              => new GetResources[API.GetResources.type](newTechnique = false, schema = API.GetResources)
+      case API.GetNewResources           =>
+        new GetResources[API.GetNewResources.type](newTechnique = true, schema = API.GetNewResources)
+      case API.DeleteTechnique           => DeleteTechnique
+      case API.GetMethods                => GetMethods
+      case API.UpdateMethods             => UpdateMethods
+      case API.UpdateTechniques          => UpdateTechniques
+      case API.GetAllTechniqueCategories => GetAllTechniqueCategories
+      case API.GetTechniqueAllVersion    => GetTechniqueDetailsAllVersion
+      case API.GetTechnique              => GetTechnique
+      case API.CheckTechnique            => CheckTechnique
+      case API.CopyResourcesWhenCloning  => CopyResourcesWhenCloning
+    }
   }
 
   class GetResources[T <: TwoParam](newTechnique: Boolean, val schema: T) extends LiftApiModule {
@@ -183,6 +157,8 @@ class TechniqueApi(
       import net.liftweb.json.JsonDSL.*
       import zio.syntax.*
 
+      implicit val prettify: Boolean = params.prettify
+
       def serializeResourceWithState(resource: ResourceFile) = {
         (("path" -> resource.path) ~ ("state" -> resource.state.value))
       }
@@ -250,6 +226,7 @@ class TechniqueApi(
         params:        DefaultParams,
         authzToken:    AuthzToken
     ): LiftResponse = {
+      implicit val prettify: Boolean = params.prettify
 
       val modId = ModificationId(uuidGen.newUuid)
 
@@ -293,7 +270,7 @@ class TechniqueApi(
             }
           methodMap        <- techniqueReader.getMethodsMetadata
           updatedTechnique <- techniqueWriter.writeTechniqueAndUpdateLib(technique, modId, authzToken.qc.actor)
-          json             <- serviceV14.getTechniqueJson(updatedTechnique)
+          json             <- service.getTechniqueJson(updatedTechnique)
         } yield {
           json
         }
@@ -307,7 +284,7 @@ class TechniqueApi(
     implicit val dataName: String                 = "techniques"
 
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      serviceV14.getTechniquesWithData().toLiftResponseList(params, schema)
+      service.getTechniquesWithData().toLiftResponseList(params, schema)
     }
 
   }
@@ -319,6 +296,7 @@ class TechniqueApi(
     implicit val dataName: String = "methods"
 
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
+      implicit val prettify: Boolean = params.prettify
       val response = for {
         methods <- techniqueReader.getMethodsMetadata
         sorted   = methods.toList.sortBy(_._1.value)
@@ -337,6 +315,7 @@ class TechniqueApi(
     implicit val dataName: String = "methods"
 
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
+      implicit val prettify: Boolean = params.prettify
       val response = for {
         _       <- techniqueReader.updateMethodsMetadataFile
         methods <- techniqueReader.getMethodsMetadata
@@ -384,6 +363,7 @@ class TechniqueApi(
     implicit val dataName: String = "techniqueCategories"
 
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
+      implicit val prettify: Boolean = params.prettify
       val response = {
         val categories = techniqueRepository.getAllCategories
         def serializeTechniqueCategory(t: TechniqueCategory): JObject = {
@@ -477,7 +457,7 @@ class TechniqueApi(
           // If no internalId (used to manage temporary folder for resources), ignore resources, this can happen when importing techniques through the api
           resoucesMoved <- technique.internalId.map(internalId => moveRessources(technique, internalId)).getOrElse("Ok".succeed)
           updatedTech   <- techniqueWriter.writeTechniqueAndUpdateLib(technique, modId, authzToken.qc.actor)
-          json          <- serviceV14.getTechniqueJson(updatedTech)
+          json          <- service.getTechniqueJson(updatedTech)
         } yield {
           json
         }
@@ -486,23 +466,6 @@ class TechniqueApi(
     }
   }
 
-  object ListTechniques extends LiftApiModule0 {
-    val schema: API.ListTechniques.type = API.ListTechniques
-    val restExtractor = restExtractorService
-
-    def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      response(
-        restExtractor,
-        "techniques",
-        None
-      )(
-        apiV6.listTechniques,
-        req,
-        s"Could not find list of techniques"
-      )("listTechniques")
-    }
-  }
-
   object CheckTechnique extends LiftApiModule0 {
     val schema: API.CheckTechnique.type = API.CheckTechnique
     val restExtractor = restExtractorService
@@ -549,74 +512,15 @@ class TechniqueApi(
     }
   }
 
-  object ListTechniquesDirectives extends LiftApiModuleString {
-    val schema: API.ListTechniquesDirectives.type = API.ListTechniquesDirectives
-    val restExtractor = restExtractorService
-
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        name:       String,
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-      val techniqueName = TechniqueName(name)
-      response(
-        restExtractor,
-        "directives",
-        Some(name)
-      )(
-        apiV6.listDirectives(techniqueName, None),
-        req,
-        s"Could not find list of directives based on '${techniqueName.value}' Technique"
-      )("listTechniquesDirectives")
-    }
-  }
-
-  object ListTechniqueDirectives extends LiftApiModuleString2 {
-    val schema: API.ListTechniqueDirectives.type = API.ListTechniqueDirectives
-    val restExtractor = restExtractorService
-
-    def process(
-        version:    ApiVersion,
-        path:       ApiPath,
-        nv:         (String, String),
-        req:        Req,
-        params:     DefaultParams,
-        authzToken: AuthzToken
-    ): LiftResponse = {
-
-      val (techniqueName, version) = (TechniqueName(nv._1), nv._2)
-      val directives               = TechniqueVersion.parse(version) match {
-        case Right(techniqueVersion) =>
-          apiV6.listDirectives(techniqueName, Some(techniqueVersion :: Nil))
-        case Left(err)               =>
-          Failure(
-            s"Could not find list of directives based on '${techniqueName.value}' Technique, because we could not parse '${version}' as a valid technique version"
-          )
-      }
-      response(
-        restExtractor,
-        "directives",
-        Some(s"${techniqueName.value}/${version}")
-      )(
-        directives,
-        req,
-        s"Could not find list of directives based on version '${version}' of '${techniqueName.value}' Technique"
-      )("listTechniqueDirectives")
-    }
-  }
-
-  object ListTechniquesV14 extends LiftApiModule0 {
+  object ListTechniques extends LiftApiModule0 {
     val schema: API.ListTechniques.type = API.ListTechniques
 
     def process0(version: ApiVersion, path: ApiPath, req: Req, params: DefaultParams, authzToken: AuthzToken): LiftResponse = {
-      serviceV14.listTechniques.toLiftResponseList(params, schema)
+      service.listTechniques.toLiftResponseList(params, schema)
     }
   }
 
-  object ListTechniquesDirectivesV14 extends LiftApiModuleString {
+  object ListTechniquesDirectives extends LiftApiModuleString {
     val schema: API.ListTechniquesDirectives.type = API.ListTechniquesDirectives
 
     def process(
@@ -628,11 +532,11 @@ class TechniqueApi(
         authzToken: AuthzToken
     ): LiftResponse = {
       val techniqueName = TechniqueName(name)
-      serviceV14.listDirectives(techniqueName, None).toLiftResponseList(params, schema)
+      service.listDirectives(techniqueName, None).toLiftResponseList(params, schema)
     }
   }
 
-  object ListTechniqueDirectivesV14 extends LiftApiModuleString2 {
+  object ListTechniqueDirectives extends LiftApiModuleString2 {
     val schema: API.ListTechniqueDirectives.type = API.ListTechniqueDirectives
 
     def process(
@@ -647,7 +551,7 @@ class TechniqueApi(
 
       val directives = TechniqueVersion.parse(version) match {
         case Right(techniqueVersion) =>
-          serviceV14.listDirectives(techniqueName, Some(techniqueVersion :: Nil))
+          service.listDirectives(techniqueName, Some(techniqueVersion :: Nil))
         case Left(error)             =>
           Inconsistency(
             s"Could not find list of directives based on '${techniqueName.value}' technique, because we could not parse '${version}' as a valid technique version"
@@ -669,7 +573,7 @@ class TechniqueApi(
         authzToken: AuthzToken
     ): LiftResponse = {
       val techniqueName = TechniqueName(name)
-      serviceV14.getTechniqueWithData(techniqueName, None, QueryFormat.Json).toLiftResponseList(params, schema)
+      service.getTechniqueWithData(techniqueName, None, QueryFormat.Json).toLiftResponseList(params, schema)
     }
   }
 
@@ -690,7 +594,7 @@ class TechniqueApi(
         req.params.get("format").flatMap(_.map(QueryFormat.parse).headOption).getOrElse(QueryFormat.Json)
       val json = TechniqueVersion.parse(version) match {
         case Right(techniqueVersion) =>
-          serviceV14.getTechniqueWithData(techniqueName, Some(techniqueVersion), format)
+          service.getTechniqueWithData(techniqueName, Some(techniqueVersion), format)
         case Left(error)             =>
           Inconsistency(
             s"Could not find technique '${techniqueName.value}' details, because we could not parse '${version}' as a valid technique version"
@@ -715,7 +619,7 @@ class TechniqueApi(
 
       val revisions = ParseVersion.parse(version) match {
         case Right(v)    =>
-          serviceV14.techniqueRevisions(techniqueName, v)
+          service.techniqueRevisions(techniqueName, v)
         case Left(error) =>
           Inconsistency(
             s"Could not find list of directives based on '${techniqueName.value}' technique, because we could not parse '${version}' as a valid technique version: ${error}"
@@ -726,82 +630,6 @@ class TechniqueApi(
   }
 }
 
-class TechniqueAPIService6(
-    readDirective:      RoDirectiveRepository,
-    restDataSerializer: RestDataSerializer
-) extends Loggable {
-
-  def serialize(technique: Technique, directive: Directive): JValue =
-    restDataSerializer.serializeDirective(technique, directive, None)
-
-  def listTechniques: Box[JValue] = {
-    (for {
-      lib             <- readDirective.getFullDirectiveLibrary()
-      activeTechniques = lib.allActiveTechniques.values.toSeq
-      serialized       = activeTechniques.map(restDataSerializer.serializeTechnique)
-    } yield {
-      serialized
-    }).toBox.map(v => JArray(v.toList))
-  }
-
-  def listDirectives(techniqueName: TechniqueName, wantedVersions: Option[List[TechniqueVersion]]): Box[JValue] = {
-    def serializeDirectives(
-        directives:     Seq[Directive],
-        techniques:     SortedMap[TechniqueVersion, Technique],
-        wantedVersions: Option[List[TechniqueVersion]]
-    ) = {
-      val filter = (d: Directive) => {
-        wantedVersions match {
-          case None           => true
-          case Some(versions) => versions.contains(d.techniqueVersion)
-        }
-      }
-
-      ZIO.foreach(directives.filter(filter)) { directive =>
-        techniques.get(directive.techniqueVersion) match {
-          case None            =>
-            Inconsistency(
-              s"Version '${directive.techniqueVersion.serialize}' of Technique '${techniqueName.value}' does not exist, but is used by Directive '${directive.id.uid.value}'"
-            ).fail
-          case Some(technique) =>
-            serialize(technique, directive).succeed
-        }
-      }
-    }
-
-    def checkWantedVersions(
-        techniques:     SortedMap[TechniqueVersion, Technique],
-        wantedVersions: Option[List[TechniqueVersion]]
-    ) = {
-      wantedVersions match {
-        case Some(versions) =>
-          ZIO.foreach(versions) { version =>
-            ZIO.when(!techniques.keySet.contains(version)) {
-              Inconsistency(s"Version '${version.serialize}' of Technique '${techniqueName.value}' does not exist").fail
-            }
-          }
-        case None           => ZIO.unit
-      }
-    }
-
-    (for {
-      lib                  <- readDirective.getFullDirectiveLibrary()
-      activeTech           <- lib.allActiveTechniques.values
-                                .find(_.techniqueName == techniqueName)
-                                .notOptional(
-                                  s"Technique '${techniqueName.value}' does not exist"
-                                )
-
-      // Check if version we want exists in technique library, We don't need the result
-      _                    <- checkWantedVersions(activeTech.techniques, wantedVersions)
-      serializedDirectives <- serializeDirectives(activeTech.directives, activeTech.techniques, wantedVersions)
-    } yield {
-      serializedDirectives.toList
-    }).toBox.map(v => JArray(v.toList))
-  }
-
-}
-
 class TechniqueAPIService14(
     readDirective:       RoDirectiveRepository,
     techniqueRevisions:  TechniqueRevisionRepository,
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/UserManagementApi.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/UserManagementApi.scala
index 2f88d1543d1..fe0dd49db35 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/UserManagementApi.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/rest/lift/UserManagementApi.scala
@@ -196,7 +196,6 @@ class UserManagementApiImpl(
     userRepo:                  UserRepository,
     userService:               FileUserDetailListProvider,
     userManagementService:     UserManagementService,
-    roleApiMapping:            RoleApiMapping,
     tenantsService:            TenantService,
     getProviderRoleExtensions: () => Map[String, ProviderRoleExtension],
     getAuthBackendsProviders:  () => Set[String]
@@ -218,7 +217,7 @@ class UserManagementApiImpl(
       case UserManagementApi.DisableUser     => DisableUser
       case UserManagementApi.RoleCoverage    => RoleCoverage
       case UserManagementApi.GetRoles        => GetRoles
-    }.toList
+    }
   }
 
   /*
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala
index 6d54431a5ee..e0fed360801 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/DirectiveEditor.scala
@@ -172,7 +172,7 @@ trait DirectiveField extends BaseField with SectionChildField {
     <tr>
       <td colspan="2">
       <span>{if (optional) displayName else <b>{displayName}</b>} {tooltipElem} {
-      if (optional) <span> - <small class="greyscala">Optional</small></span>
+      if (optional) <span> - <small class="text-secondary">Optional</small></span>
     }</span>
       </td>
       <td class="directiveVarValue">{value}</td>
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/JsInitContextLinkUtil.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/JsInitContextLinkUtil.scala
index 33b409a21be..d9ba5e47295 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/JsInitContextLinkUtil.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/model/JsInitContextLinkUtil.scala
@@ -43,11 +43,11 @@ import com.normation.rudder.domain.policies.DirectiveUid
 import com.normation.rudder.domain.policies.RuleId
 import com.normation.rudder.domain.policies.RuleTarget
 import com.normation.rudder.domain.workflows.ChangeRequestId
+import com.normation.rudder.facts.nodes.NodeFactRepository
 import com.normation.rudder.facts.nodes.QueryContext
 import com.normation.rudder.repository.RoDirectiveRepository
 import com.normation.rudder.repository.RoNodeGroupRepository
 import com.normation.rudder.repository.RoRuleRepository
-import com.normation.rudder.services.nodes.NodeInfoService
 import com.normation.zio.*
 import net.liftweb.common.Loggable
 import net.liftweb.http.S
@@ -67,7 +67,7 @@ class LinkUtil(
     roRuleRepository:      RoRuleRepository,
     roGroupRepository:     RoNodeGroupRepository,
     roDirectiveRepository: RoDirectiveRepository,
-    nodeInfoService:       NodeInfoService
+    nodeFactRepo:          NodeFactRepository
 ) extends Loggable {
   def baseGroupLink(id: NodeGroupId): String =
     s"""/secure/nodeManager/groups#{"groupId":"${id.serialize}"}"""
@@ -167,16 +167,16 @@ class LinkUtil(
     }
   }
 
-  def createNodeLink(id: NodeId):              Elem = {
-    nodeInfoService.getNodeInfo(id).either.runNow match {
+  def createNodeLink(id: NodeId)(implicit qc: QueryContext): Elem = {
+    nodeFactRepo.get(id).either.runNow match {
       case Right(Some(node)) =>
-        <span>Node <a href={baseNodeLink(id)}>{node.hostname}</a> (Rudder ID: {id.value})</span>
+        <span>Node <a href={baseNodeLink(id)}>{node.fqdn}</a> (Rudder ID: {id.value})</span>
       case _                 =>
         <span>Node {id.value}</span>
     }
   }
   // Naive implementation that redirect simply to all Global Parameter page
-  def createGlobalParameterLink(name: String): Elem = {
+  def createGlobalParameterLink(name: String):               Elem = {
     <span> <a href={baseGlobalParameterLink(name)}>{name}</a></span>
   }
 }
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/DiffDisplayer.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/DiffDisplayer.scala
index 010747973ee..aa9de006e49 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/DiffDisplayer.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/DiffDisplayer.scala
@@ -159,7 +159,7 @@ class DiffDisplayer(linkUtil: LinkUtil) extends Loggable {
             .map { targetInfo =>
               <span>
             {targetInfo.name}
-            {if (targetInfo.isSystem) <span class="greyscala">(System)</span>}
+            {if (targetInfo.isSystem) <span class="text-secondary">(System)</span>}
           </span>
             }
             .getOrElse(<span> {x.target}</span>)
diff --git a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/EventLogDetailsGenerator.scala b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/EventLogDetailsGenerator.scala
index bd6ea02717e..8cd085cecf2 100644
--- a/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/EventLogDetailsGenerator.scala
+++ b/webapp/sources/rudder/rudder-rest/src/main/scala/com/normation/rudder/web/services/EventLogDetailsGenerator.scala
@@ -63,8 +63,6 @@ import com.normation.rudder.rule.category.RuleCategory
 import com.normation.rudder.services.eventlog.EventLogDetailsService
 import com.normation.rudder.services.eventlog.RollbackInfo
 import com.normation.rudder.services.modification.ModificationService
-import com.normation.rudder.services.nodes.NodeInfoService
-import com.normation.rudder.services.user.PersonIdentService
 import com.normation.rudder.web.model.LinkUtil
 import com.normation.utils.DateFormaterService
 import com.normation.zio.UnsafeRun
@@ -84,16 +82,13 @@ import scala.util.Random
 import scala.util.Success
 import scala.util.Try
 import scala.xml.*
+import zio.json.*
 
 class EventLogDetailsGenerator(
     logDetailsService:   EventLogDetailsService,
-    repos:               EventLogRepository,
     nodeGroupRepository: RoNodeGroupRepository,
-    directiveRepository: RoDirectiveRepository,
-    nodeInfoService:     NodeInfoService,
     ruleCatRepository:   RoRuleCategoryRepository,
     modificationService: ModificationService,
-    personIdentService:  PersonIdentService,
     linkUtil:            LinkUtil,
     diffDisplayer:       DiffDisplayer
 ) extends Loggable {
@@ -502,7 +497,7 @@ class EventLogDetailsGenerator(
                           val mapOptionQuery = (opt: Option[Query]) => {
                             opt match {
                               case None    => Text("None")
-                              case Some(q) => Text(q.toJSONString)
+                              case Some(q) => Text(q.toJson)
                             }
                           }
 
@@ -1187,9 +1182,9 @@ class EventLogDetailsGenerator(
       name: String
   )(implicit fun: T => String = (t: T) => t.toString): NodeSeq = {
     <pre style="width:200px;" id={s"before${name}"}
-         class="nodisplay">{fun(diff.oldValue)}</pre>
+         class="d-none">{fun(diff.oldValue)}</pre>
       <pre style="width:200px;" id={s"after${name}"}
-           class="nodisplay">{fun(diff.newValue)}</pre>
+           class="d-none">{fun(diff.newValue)}</pre>
       <pre id={s"result${name}"} ></pre> ++
     Script(
       OnLoad(
@@ -1209,9 +1204,9 @@ class EventLogDetailsGenerator(
       case Some(id) =>
         (
           <pre style="width:200px;" id={"before" + id}
-               class="nodisplay">{xmlPretty.format(SectionVal.toXml(diff.oldValue))}</pre>
+               class="d-none">{xmlPretty.format(SectionVal.toXml(diff.oldValue))}</pre>
             <pre style="width:200px;" id={"after" + id}
-                 class="nodisplay">{xmlPretty.format(SectionVal.toXml(diff.newValue))}</pre>
+                 class="d-none">{xmlPretty.format(SectionVal.toXml(diff.newValue))}</pre>
             <pre id={"result" + id} ></pre>
         ) ++ Script(OnLoad(JsRaw(s"""
             var before = "before${id}";
@@ -1245,7 +1240,7 @@ class EventLogDetailsGenerator(
     </div>
   }
 
-  private def nodeGroupDetails(nodes: Set[NodeId]): NodeSeq = {
+  private def nodeGroupDetails(nodes: Set[NodeId])(implicit qc: QueryContext): NodeSeq = {
     val res = nodes.toSeq match {
       case Seq() => NodeSeq.Empty
       case t     =>
@@ -1296,7 +1291,7 @@ class EventLogDetailsGenerator(
       "#shortDescription" #> group.description &
       "#query" #> (group.query match {
         case None    => Text("None")
-        case Some(q) => Text(q.toJSONString)
+        case Some(q) => Text(q.toJson)
       }) &
       "#isDynamic" #> group.isDynamic &
       "#nodes" #> ({
diff --git a/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_eventlogs.yml b/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_eventlogs.yml
new file mode 100644
index 00000000000..06fbb431e70
--- /dev/null
+++ b/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_eventlogs.yml
@@ -0,0 +1,288 @@
+description: Get event logs with valid filters
+method: POST
+url: /secure/api/eventlog
+headers:
+  - "Content-Type: application/json"
+body: >-
+  {
+    "draw": 5,
+    "columns": [
+      {
+        "data": "id",
+        "name": "",
+        "searchable": true,
+        "orderable": true,
+        "search": {
+          "value": "",
+          "regex": false
+        }
+      },
+      {
+        "data": "date",
+        "name": "",
+        "searchable": true,
+        "orderable": true,
+        "search": {
+          "value": "",
+          "regex": false
+        }
+      },
+      {
+        "data": "actor",
+        "name": "",
+        "searchable": true,
+        "orderable": true,
+        "search": {
+          "value": "",
+          "regex": false
+        }
+      },
+      {
+        "data": "type",
+        "name": "",
+        "searchable": true,
+        "orderable": true,
+        "search": {
+          "value": "",
+          "regex": false
+        }
+      },
+      {
+        "data": "description",
+        "name": "",
+        "searchable": true,
+        "orderable": false,
+        "search": {
+          "value": "",
+          "regex": false
+        }
+      }
+    ],
+    "order": [
+      {
+        "column": 0,
+        "dir": "desc"
+      }
+    ],
+    "start": 0,
+    "length": 25,
+    "search": {
+      "value": "",
+      "regex": false
+    },
+    "startDate": "2024-12-04 15:31:15",
+    "endDate": "2024-12-04 15:30:54"
+  }
+response:
+  code: 200
+  content: >-
+    {
+      "draw" : 5,
+      "recordsTotal" : 0,
+      "recordsFiltered" : 0,
+      "data" : [
+        {
+          "id" : 42,
+          "date" : "2024-12-04 15:30:10+0100",
+          "actor" : "test",
+          "type" : "NodeGroupModified",
+          "description" : "Group ",
+          "hasDetails" : true
+        }
+      ]
+    }
+---
+description: Get event logs with invalid column value
+method: POST
+url: /secure/api/eventlog
+headers:
+  - "Content-Type: application/json"
+body: >-
+  {
+    "draw": 5,
+    "columns": [
+      {
+        "data": "id",
+        "name": "",
+        "searchable": true,
+        "orderable": true,
+        "search": {
+          "value": "",
+          "regex": false
+        }
+      }
+    ],
+    "order": [
+      {
+        "column": -1,
+        "dir": "desc"
+      }
+    ],
+    "start": 0,
+    "length": 25,
+    "search": {
+      "value": "",
+      "regex": false
+    },
+    "startDate": "2024-12-04 15:31:15",
+    "endDate": "2024-12-04 15:30:54"
+  }
+response:
+  code: 500
+  content: >-
+    {
+      "draw" : 0,
+      "recordsTotal" : 0,
+      "recordsFiltered" : 0,
+      "data" : "",
+      "error" : "Error when fetching event logs; cause was: Unexpected: .order[0].column(Not a valid column id : -1, columns are 0=id,1=creationdate,2=principal,3=eventtype)"
+    }
+---
+description: Get event logs with invalid direction value
+method: POST
+url: /secure/api/eventlog
+headers:
+  - "Content-Type: application/json"
+body: >-
+  {
+    "draw": 5,
+    "columns": [
+      {
+        "data": "id",
+        "name": "",
+        "searchable": true,
+        "orderable": true,
+        "search": {
+          "value": "",
+          "regex": false
+        }
+      }
+    ],
+    "order": [
+      {
+        "column": 1,
+        "dir": "d"
+      }
+    ],
+    "start": 0,
+    "length": 25,
+    "search": {
+      "value": "",
+      "regex": false
+    },
+    "startDate": "2024-12-04 15:31:15",
+    "endDate": "2024-12-04 15:30:54"
+  }
+response:
+  code: 500
+  content: >-
+    {
+      "draw" : 0,
+      "recordsTotal" : 0,
+      "recordsFiltered" : 0,
+      "data" : "",
+      "error" : "Error when fetching event logs; cause was: Unexpected: .order[0].dir(not a valid sorting order: d)"
+    }
+---
+description: Get event logs with missing order direction
+method: POST
+url: /secure/api/eventlog
+headers:
+  - "Content-Type: application/json"
+body: >-
+  {
+    "draw": 5,
+    "columns": [
+      {
+        "data": "id",
+        "name": "",
+        "searchable": true,
+        "orderable": true,
+        "search": {
+          "value": "",
+          "regex": false
+        }
+      }
+    ],
+    "order": [
+      {
+        "column": 1
+      }
+    ],
+    "start": 0,
+    "length": 25,
+    "search": {
+      "value": "",
+      "regex": false
+    },
+    "startDate": "2024-12-04 15:31:15",
+    "endDate": "2024-12-04 15:30:54"
+  }
+response:
+  code: 500
+  content: >-
+    {
+      "draw" : 0,
+      "recordsTotal" : 0,
+      "recordsFiltered" : 0,
+      "data" : "",
+      "error" : "Error when fetching event logs; cause was: Unexpected: .order[0].dir(missing)"
+    }
+---
+description: Get details of a specific event log
+method: GET
+url: /secure/api/eventlog/1/details
+response:
+  code: 200
+  content: >-
+    {
+      "action" : "getEventLogDetails",
+      "result" : "success",
+      "data" : {
+        "id" : "1",
+        "content" : "<div class=\"py-2 flex-fill\">\n        \n          <div class=\"evloglmargin\">\n            <h5>Details for that node were not in a recognized format.\n              Raw data are displayed next:</h5><button id=\"showParameters42\" class=\"btn btn-default showParameters\">\n              <b class=\"action\">Show</b>\n              raw technical details\n            </button><pre id=\"showParametersInfo42\" style=\"display:none;\" class=\"technical-details\">&lt;test/&gt;\n</pre>\n          </div>\n        \n      </div>",
+        "canRollback" : true
+      }
+    }
+---
+description: Rollback a specific event log after
+method: GET
+url: /secure/api/eventlog/1/details/rollback?action=after
+response:
+  code: 200
+  content: >-
+    {
+      "action" : "rollbackEventLog",
+      "result" : "success",
+      "data" : {
+        "action" : "after",
+        "id" : "1"
+      }
+    }
+---
+description: Rollback a specific event log with multiple action
+method: GET
+url: /secure/api/eventlog/1/details/rollback?action=some&action=other
+response:
+  code: 500
+  content: >-
+    {
+      "action" : "rollbackEventLog",
+      "result" : "error",
+      "errorDetails" : "Error when performing eventlog's rollback with id '1'; cause was: Inconsistency: Only one action is excepted, 2 found in request : some,other"
+    }
+
+
+---
+description: Rollback a specific event log with invalid action
+method: GET
+url: /secure/api/eventlog/1/details/rollback?action=unknown
+response:
+  code: 500
+  content: >-
+    {
+      "action" : "rollbackEventLog",
+      "result" : "error",
+      "errorDetails" : "Error when performing eventlog's rollback with id '1'; cause was: Inconsistency: Unknown rollback's action : unknown"
+    }
+
diff --git a/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_groups.yml b/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_groups.yml
index 1ee41a6e3d6..d1676cb5940 100644
--- a/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_groups.yml
+++ b/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_groups.yml
@@ -1536,6 +1536,65 @@ response:
       }
     }
 ---
+description: Fail to update group category name
+method: POST
+url: /api/latest/groups/categories/219b9c98-4c2f-44c9-aff5-95b4fc7c4ada
+headers:
+  - "Content-Type: application/json"
+body: >-
+  {
+    "parent": "GroupRoot",
+    "name": "sh"
+  }
+response:
+  code: 500
+  content: >-
+    {
+      "action":"updateGroupCategory",
+      "id":"219b9c98-4c2f-44c9-aff5-95b4fc7c4ada",
+      "result" : "error",
+      "errorDetails" : "Could not update Group category '219b9c98-4c2f-44c9-aff5-95b4fc7c4ada'; cause was: Unexpected: (Group category name 'sh' must at least have a 3 character size)"
+    }
+---
+description: Fail to create a node group category without name
+method: PUT
+url: /api/latest/groups/categories
+headers:
+  - "Content-Type: application/json"
+body: >-
+  {
+    "parent": "GroupRoot",
+    "id": "219b9c98-4c2f-44c9-aff5-95b4fc7c4ada"
+  }
+response:
+  code: 500
+  content: >-
+    {
+      "action":"createGroupCategory",
+      "result" : "error",
+      "errorDetails" : "Could not create group category; cause was: Inconsistency: Could not create group Category, cause: name is not defined"
+    }
+---
+description: Fail to create a node group category with name too short
+method: PUT
+url: /api/latest/groups/categories
+headers:
+  - "Content-Type: application/json"
+body: >-
+  {
+    "parent": "GroupRoot",
+    "name": "sh",
+    "id": "219b9c98-4c2f-44c9-aff5-95b4fc7c4ada"
+  }
+response:
+  code: 500
+  content: >-
+    {
+      "action":"createGroupCategory",
+      "result" : "error",
+      "errorDetails" : "Could not create group category; cause was: Unexpected: (Group category name 'sh' must at least have a 3 character size)"
+    }
+---
 description: Delete a group category
 method: DELETE
 url: /api/latest/groups/categories/category-to-be-deleted
@@ -1569,7 +1628,7 @@ response:
       "action" : "deleteGroupCategory",
       "id" : "system-category1",
       "result" : "error",
-      "errorDetails" : "Could not delete Group category 'system-category1' <- Could not delete group category 'system-category1', cause is: system categories cannot be deleted."
+      "errorDetails" : "Could not delete Group category 'system-category1'; cause was: Inconsistency: Could not delete group category 'system-category1', cause is: system categories cannot be deleted."
     }
 ---
 description: Get minimal info on group category category1
@@ -1599,6 +1658,423 @@ response:
         }
       }
     }
+---
+description: List all group categories and group in a tree format
+method: GET
+url: /api/latest/groups/tree
+response:
+  code: 200
+  content: >-
+    {
+      "action" : "getGroupTree",
+      "result" : "success",
+      "data" : {
+        "groupCategories" : {
+          "id" : "GroupRoot",
+          "name" : "GroupRoot",
+          "description" : "root of group categories",
+          "parent" : "GroupRoot",
+          "categories" : [
+            {
+              "id" : "219b9c98-3d1e-44c9-0001-95b4fc7c4ada",
+              "name" : "category 2",
+              "description" : "",
+              "parent" : "GroupRoot",
+              "categories" : [],
+              "groups" : [],
+              "targets" : []
+            },
+            {
+              "id" : "219b9c98-3d1e-44c9-aff5-95b4fc7c4ada",
+              "name" : "category 2",
+              "description" : "",
+              "parent" : "GroupRoot",
+              "categories" : [],
+              "groups" : [],
+              "targets" : []
+            },
+            {
+              "id" : "category1",
+              "name" : "category 1",
+              "description" : "the first category",
+              "parent" : "GroupRoot",
+              "categories" : [
+                {
+                  "id" : "219b9c98-3d1e-44c9-0001-95b4fc7c4ada",
+                  "name" : "category 2 update",
+                  "description" : "category 2",
+                  "parent" : "category1",
+                  "categories" : [],
+                  "groups" : [],
+                  "targets" : []
+                },
+                {
+                  "id" : "219b9c98-3d1e-44c9-aff5-95b4fc7c4ada",
+                  "name" : "category 2 update",
+                  "description" : "category 2",
+                  "parent" : "category1",
+                  "categories" : [],
+                  "groups" : [],
+                  "targets" : []
+                }
+              ],
+              "groups" : [
+                {
+                  "id" : "0000f5d3-8c61-4d20-88a7-bb947705ba8a",
+                  "displayName" : "Real nodes",
+                  "description" : "",
+                  "category" : "category1",
+                  "query" : {
+                    "select" : "nodeAndPolicyServer",
+                    "composition" : "or",
+                    "where" : [
+                      {
+                        "objectType" : "node",
+                        "attribute" : "nodeId",
+                        "comparator" : "eq",
+                        "value" : "node1"
+                      },
+                      {
+                        "objectType" : "node",
+                        "attribute" : "nodeId",
+                        "comparator" : "eq",
+                        "value" : "node2"
+                      },
+                      {
+                        "objectType" : "node",
+                        "attribute" : "nodeId",
+                        "comparator" : "eq",
+                        "value" : "root"
+                      }
+                    ]
+                  },
+                  "nodeIds" : [
+                    "node1",
+                    "node2",
+                    "root"
+                  ],
+                  "dynamic" : false,
+                  "enabled" : true,
+                  "groupClass" : [
+                    "group_0000f5d3_8c61_4d20_88a7_bb947705ba8a",
+                    "group_real_nodes"
+                  ],
+                  "properties" : [
+                    {
+                      "name" : "stringParam",
+                      "value" : "string",
+                      "inheritMode" : "map",
+                      "provider" : "datasources"
+                    },
+                    {
+                      "name" : "jsonParam",
+                      "value" : {
+                        "array" : [
+                          5,
+                          6
+                        ],
+                        "group" : "string",
+                        "json" : {
+                          "g1" : "g1"
+                        }
+                      }
+                    }
+                  ],
+                  "target" : "group:0000f5d3-8c61-4d20-88a7-bb947705ba8a",
+                  "system" : false
+                }
+              ],
+              "targets" : []
+            },
+            {
+              "id" : "system-category1",
+              "name" : "system category 1",
+              "description" : "a system group category",
+              "parent" : "GroupRoot",
+              "categories" : [],
+              "groups" : [],
+              "targets" : []
+            }
+          ],
+          "groups" : [
+            {
+              "id" : "00000000-cb9d-4f7b-0001-ca38c5d643ea",
+              "displayName" : "clone from api of debian group",
+              "description" : "Some long description",
+              "category" : "GroupRoot",
+              "query" : {
+                "select" : "node",
+                "composition" : "and",
+                "where" : [
+                  {
+                    "objectType" : "node",
+                    "attribute" : "osName",
+                    "comparator" : "eq",
+                    "value" : "Debian"
+                  },
+                  {
+                    "objectType" : "node",
+                    "attribute" : "osVersion",
+                    "comparator" : "regex",
+                    "value" : "10\\..*"
+                  }
+                ]
+              },
+              "nodeIds" : [],
+              "dynamic" : true,
+              "enabled" : true,
+              "groupClass" : [
+                "group_00000000_cb9d_4f7b_0001_ca38c5d643ea",
+                "group_clone_from_api_of_debian_group"
+              ],
+              "properties" : [
+                {
+                  "name" : "os",
+                  "value" : {
+                    "name" : "debian",
+                    "nickname" : "Buster"
+                  }
+                }
+              ],
+              "target" : "group:00000000-cb9d-4f7b-0001-ca38c5d643ea",
+              "system" : false
+            },
+            {
+              "id" : "00000000-cb9d-4f7b-abda-ca38c5d643ea",
+              "displayName" : "clone from api of debian group",
+              "description" : "Some long description",
+              "category" : "GroupRoot",
+              "query" : {
+                "select" : "node",
+                "composition" : "and",
+                "where" : [
+                  {
+                    "objectType" : "node",
+                    "attribute" : "osName",
+                    "comparator" : "eq",
+                    "value" : "Debian"
+                  },
+                  {
+                    "objectType" : "node",
+                    "attribute" : "osVersion",
+                    "comparator" : "regex",
+                    "value" : "10\\..*"
+                  }
+                ]
+              },
+              "nodeIds" : [],
+              "dynamic" : true,
+              "enabled" : true,
+              "groupClass" : [
+                "group_00000000_cb9d_4f7b_abda_ca38c5d643ea",
+                "group_clone_from_api_of_debian_group"
+              ],
+              "properties" : [
+                {
+                  "name" : "os",
+                  "value" : {
+                    "name" : "debian",
+                    "nickname" : "Buster"
+                  }
+                }
+              ],
+              "target" : "group:00000000-cb9d-4f7b-abda-ca38c5d643ea",
+              "system" : false
+            },
+            {
+              "id" : "1111f5d3-8c61-4d20-88a7-bb947705ba8a",
+              "displayName" : "Empty group",
+              "description" : "",
+              "category" : "GroupRoot",
+              "nodeIds" : [],
+              "dynamic" : false,
+              "enabled" : true,
+              "groupClass" : [
+                "group_1111f5d3_8c61_4d20_88a7_bb947705ba8a",
+                "group_empty_group"
+              ],
+              "properties" : [],
+              "target" : "group:1111f5d3-8c61-4d20-88a7-bb947705ba8a",
+              "system" : false
+            },
+            {
+              "id" : "2222f5d3-8c61-4d20-88a7-bb947705ba8a",
+              "displayName" : "only root",
+              "description" : "",
+              "category" : "GroupRoot",
+              "nodeIds" : [
+                "root"
+              ],
+              "dynamic" : false,
+              "enabled" : true,
+              "groupClass" : [
+                "group_2222f5d3_8c61_4d20_88a7_bb947705ba8a",
+                "group_only_root"
+              ],
+              "properties" : [],
+              "target" : "group:2222f5d3-8c61-4d20-88a7-bb947705ba8a",
+              "system" : false
+            },
+            {
+              "id" : "3333f5d3-8c61-4d20-88a7-bb947705ba8a",
+              "displayName" : "Even nodes",
+              "description" : "",
+              "category" : "GroupRoot",
+              "nodeIds" : [
+                "0",
+                "10",
+                "2",
+                "4",
+                "6",
+                "8"
+              ],
+              "dynamic" : false,
+              "enabled" : true,
+              "groupClass" : [
+                "group_3333f5d3_8c61_4d20_88a7_bb947705ba8a",
+                "group_even_nodes"
+              ],
+              "properties" : [],
+              "target" : "group:3333f5d3-8c61-4d20-88a7-bb947705ba8a",
+              "system" : false
+            },
+            {
+              "id" : "4444f5d3-8c61-4d20-88a7-bb947705ba8a",
+              "displayName" : "Odd nodes",
+              "description" : "",
+              "category" : "GroupRoot",
+              "nodeIds" : [
+                "1",
+                "3",
+                "5",
+                "7",
+                "9"
+              ],
+              "dynamic" : false,
+              "enabled" : true,
+              "groupClass" : [
+                "group_4444f5d3_8c61_4d20_88a7_bb947705ba8a",
+                "group_odd_nodes"
+              ],
+              "properties" : [],
+              "target" : "group:4444f5d3-8c61-4d20-88a7-bb947705ba8a",
+              "system" : false
+            },
+            {
+              "id" : "5555f5d3-8c61-4d20-88a7-bb947705ba8a",
+              "displayName" : "Nodes id divided by 3",
+              "description" : "",
+              "category" : "GroupRoot",
+              "nodeIds" : [
+                "0",
+                "3",
+                "6",
+                "9"
+              ],
+              "dynamic" : false,
+              "enabled" : true,
+              "groupClass" : [
+                "group_5555f5d3_8c61_4d20_88a7_bb947705ba8a",
+                "group_nodes_id_divided_by_3"
+              ],
+              "properties" : [],
+              "target" : "group:5555f5d3-8c61-4d20-88a7-bb947705ba8a",
+              "system" : false
+            },
+            {
+              "id" : "6666f5d3-8c61-4d20-88a7-bb947705ba8a",
+              "displayName" : "Nodes id divided by 5",
+              "description" : "",
+              "category" : "GroupRoot",
+              "nodeIds" : [
+                "0",
+                "10",
+                "5"
+              ],
+              "dynamic" : false,
+              "enabled" : true,
+              "groupClass" : [
+                "group_6666f5d3_8c61_4d20_88a7_bb947705ba8a",
+                "group_nodes_id_divided_by_5"
+              ],
+              "properties" : [],
+              "target" : "group:6666f5d3-8c61-4d20-88a7-bb947705ba8a",
+              "system" : false
+            },
+            {
+              "id" : "a-group-for-root-only",
+              "displayName" : "Serveurs [€ðŋ] cassés",
+              "description" : "Liste de l'ensemble de serveurs cassés à réparer",
+              "category" : "GroupRoot",
+              "nodeIds" : [
+                "root"
+              ],
+              "dynamic" : true,
+              "enabled" : true,
+              "groupClass" : [
+                "group_a_group_for_root_only",
+                "group_serveurs_______casses"
+              ],
+              "properties" : [],
+              "target" : "group:a-group-for-root-only",
+              "system" : false
+            },
+            {
+              "id" : "all-nodes",
+              "displayName" : "All nodes",
+              "description" : "All nodes known by Rudder (including Rudder policy servers)",
+              "category" : "GroupRoot",
+              "nodeIds" : [
+                "0",
+                "1",
+                "10",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "7",
+                "8",
+                "9"
+              ],
+              "dynamic" : false,
+              "enabled" : true,
+              "groupClass" : [
+                "group_all_nodes",
+                "group_all_nodes"
+              ],
+              "properties" : [],
+              "target" : "group:all-nodes",
+              "system" : true
+            }
+          ],
+          "targets" : [
+            {
+              "id" : "policyServer:root",
+              "displayName" : "special:policyServer_root",
+              "description" : "The root policy server",
+              "enabled" : true,
+              "target" : "policyServer:root"
+            },
+            {
+              "id" : "special:all_exceptPolicyServers",
+              "displayName" : "special:all_exceptPolicyServers",
+              "description" : "All groups without policy servers",
+              "enabled" : true,
+              "target" : "special:all_exceptPolicyServers"
+            },
+            {
+              "id" : "special:all",
+              "displayName" : "special:all",
+              "description" : "All nodes",
+              "enabled" : true,
+              "target" : "special:all"
+            }
+          ]
+        }
+      }
+    }
+
 
 #
 # API GROUPSINTERNAL
diff --git a/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_info.yml b/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_info.yml
new file mode 100644
index 00000000000..cdccc5fd5b0
--- /dev/null
+++ b/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_info.yml
@@ -0,0 +1,168 @@
+description: API info
+method: GET
+url: /secure/api/info
+response:
+  code: 200
+  content: >-
+    {
+      "action" : "apiGeneralInformations",
+      "result" : "success",
+      "data" : {
+        "documentation" : "https://docs.rudder.io/api/",
+        "availableVersions" : {
+          "latest" : 20,
+          "all" : [
+            {
+              "version" : 19,
+              "status" : "deprecated"    
+            },
+            {
+              "version" : 20,
+              "status" : "maintained"
+            }
+          ]
+        },
+        "endpoints" : [
+          {
+            "listParameters" : "List all global parameters",
+            "GET" : "[19,20] /parameters"
+          },
+          {
+            "createParameter" : "Create a new parameter",
+            "PUT" : "[19,20] /parameters"
+          },
+          {
+            "parameterDetails" : "Get information about the given parameter",
+            "GET" : "[19,20] /parameters/{id}"
+          },
+          {
+            "deleteParameter" : "Delete given parameter",
+            "DELETE" : "[19,20] /parameters/{id}"
+          },
+          {
+            "updateParameter" : "Update information about given parameter",
+            "POST" : "[19,20] /parameters/{id}"
+          },
+          {
+            "apiGeneralInformations" : "Get information about Rudder public API",
+            "GET" : "[19,20] /info"
+          },
+          {
+            "apiInformations" : "Get detailed information about Rudder public API with the given name",
+            "GET" : "[19,20] /info/details/{id}"
+          },
+          {
+            "apiSubInformations" : "Get information about Rudder public API starting with given path",
+            "GET" : "[19,20] /info/{id}"
+          }
+        ]
+      }
+    }
+---
+description: API details for parameters
+method: GET
+url: /secure/api/info/details/deleteParameter
+response:
+  code: 200
+  content: >-
+    {
+      "action" : "apiInformations",
+      "result" : "success",
+      "data" : {
+        "documentation" : "https://docs.rudder.io/api/",
+        "deleteParameter" : "Delete given parameter",
+        "endpoints" : [
+          {
+            "DELETE" : "/api/19/parameters/{id}",
+            "version" : {
+              "version" : 19,
+              "status" : "deprecated"
+            }
+          },
+          {
+            "DELETE" : "/api/parameters/{id}",
+            "version" : {
+              "version" : 19,
+              "status" : "deprecated"
+            }
+          },
+          {
+            "DELETE" : "/secure/api/parameters/{id}",
+            "version" : {
+              "version" : 20,
+              "status" : "maintained"
+            }
+          },
+          {
+            "DELETE" : "/api/20/parameters/{id}",
+            "version" : {
+              "version" : 20,
+              "status" : "maintained"
+            }
+          },
+          {
+            "DELETE" : "/api/latest/parameters/{id}",
+            "version" : {
+              "version" : 20,
+              "status" : "maintained"
+            }
+          },
+          {
+            "DELETE" : "/api/parameters/{id}",
+            "version" : {
+              "version" : 20,
+              "status" : "maintained"
+            }
+          }
+        ]
+      }
+    }
+---
+description: API details for path starting with parameters
+method: GET
+url: /secure/api/info/parameters
+response:
+  code: 200
+  content: >-
+    {
+      "action" : "apiSubInformations",
+      "result" : "success",
+      "data" : {
+        "documentation" : "https://docs.rudder.io/api/",
+        "availableVersions" : {
+          "latest" : 20,
+          "all" : [
+            {
+              "version" : 19,
+              "status" : "deprecated"    
+            },
+            {
+              "version" : 20,
+              "status" : "maintained"
+            }
+          ]
+        },
+        "endpoints" : [
+          {
+            "listParameters" : "List all global parameters",
+            "GET" : "[19,20] /parameters"
+          },
+          {
+            "createParameter" : "Create a new parameter",
+            "PUT" : "[19,20] /parameters"
+          },
+          {
+            "parameterDetails" : "Get information about the given parameter",
+            "GET" : "[19,20] /parameters/{id}"
+          },
+          {
+            "deleteParameter" : "Delete given parameter",
+            "DELETE" : "[19,20] /parameters/{id}"
+          },
+          {
+            "updateParameter" : "Update information about given parameter",
+            "POST" : "[19,20] /parameters/{id}"
+          }
+        ]
+      }
+    }
diff --git a/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_nodes.yml b/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_nodes.yml
index b313c7a98c6..df3354ec615 100644
--- a/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_nodes.yml
+++ b/webapp/sources/rudder/rudder-rest/src/test/resources/api/api_nodes.yml
@@ -78,7 +78,7 @@ response:
             ],
             "managementTechnologyDetails":{
               "cfengineKeys":[
-                "-----BEGIN RSA PUBLIC KEY-----\nMIIBCAKCAQEAlntroa72gD50MehPoyp6mRS5fzZpsZEHu42vq9KKxbqSsjfUmxnT\nRsi8CDvBt7DApIc7W1g0eJ6AsOfV7CEh3ooiyL/fC9SGATyDg5TjYPJZn3MPUktg\nYBzTd1MMyZL6zcLmIpQBH6XHkH7Do/RxFRtaSyicLxiO3H3wapH20TnkUvEpV5Qh\nzUkNM8vHZuu3m1FgLrK5NCN7BtoGWgeyVJvBMbWww5hS15IkCRuBkAOK/+h8xe2f\nhMQjrt9gW2qJpxZyFoPuMsWFIaX4wrN7Y8ZiN37U2q1G11tv2oQlJTQeiYaUnTX4\nz5VEb9yx2KikbWyChM1Akp82AV5BzqE80QIBIw==\n-----END RSA PUBLIC KEY-----"
+                "-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUO0kEJ2Fwb4MWT2yBVqR+UX4osMcwDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUxMB4XDTI0MTEwMjE2MTIxOVoXDTM0\nMTAzMTE2MTIxOVowFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUxMIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAptzhnQCPvgOwjn6LCfVhTMAs10hwYj5YxqOX\ni8MPiFT4Rlrn6xyB24O7E+O2EL/IUYSk5Lbp2OGSJWvNe1d+KbESpmGoM1UnAa8j\nVsW+HY/uJ23THKAhe9ykOxWObSp/sSwFhw6C0p7SriI72uW/fJ40XCh2m2FuJuQP\nYHjNOR5P/cOLhKs/cEkt3icMxyfipor+kcqC/GsCPtwwXFwnS5yWlmRxVSzkI1fZ\n6B403aHMe5PSqD0kxWX8roR/9sIVRvLVbxQtiuyM2xUeSuIlg3bho9wN4/shhqKv\nq3zqJQy86YZVC9jRmX21BeQukTWiu3uqppxVcyTM5Wzf3jrE7A+2Iea6ZvMFA0fq\nD39CgXhkuCGdGaBQtVzuYBASyECUEmMgQMb99rnlONVVVdFQHS26+c1fR1rn+Iyq\nkGOmrTRSaf1F8OLnvAY9UhXi/oJNDh57y+Y+X11XY2mBgmt/zRFN05HxD0UpsvlS\np850QzmoO7qusRY5CnrX40HHhhB9wr5lhKTVEAgoEhrYvC/wDWLBElECNQzC99ye\nFUR2T1sc1qsmDVki5eivm086viHt231plJIXKtAdTLc2EXYxtNiVowXKbhujtwOR\ngIcG9YXEwc7woXnpxOJHYlFfB9TKMKzc8FfKVZnOibp0Ceenpxj0nUItlLJMoEaM\nG4upElcCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBT9f5l3IkLI\ndwooamw/OugzXWT8RjBSBgNVHSMESzBJgBT9f5l3IkLIdwooamw/OugzXWT8RqEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUxghQ7SQQnYXBvgxZPbIFWpH5Rfiiw\nxzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAF0LWEG8O3W18U0r+6v1\npSS1UqcP0HI3M27+Pq2Gk+/s9DRlgeyPmSYTGMdbP1eL5lR5BubUrZlKmXCneda+\nVl4akoNaYXHFKpRIKm4y2ezX6XRugblurc+tL3V17UAhYjSglL/5yRXiLrJKACOP\n0NNjjrqn2JM2PfD29Ge6K+yir92V8aOByElZVYNH4f9Avc+zzg4yBDTONutZ2TBx\ncPZ3s2Z7bsbOYhJey+j99Oc/puyUNyvh5R/hLV5QP+FA/N8JR8N2IeaIwF8/Kyhu\nMTSajF4pLY1N8YbQA0jd6zwz6NvRu5HBJ+u53JX4kyMc8mMAG0PZz6pUmAwlqq7V\nEqsjDVYHB19WKh9gaJkKNkft7IsB1b7exklGRPUuR/Sb4a5rgl47a3EM38KCVfFX\nBBNUhCn0Lt3lKs4RUXxLSh36ptEPre9qkWtdTnjR+T6KLxVonLdNQSOeqRplb4la\nUu/CwaqyaPf39pzyXLNdZszknsXk+ih1+Kn/X7cTTUjNsvlMRqlh/wW2Ss0FK3R3\n7GObkgYD5hHVDrH5tp9gh0a0r0GT3bT4119BgE8zgwqMGbOHkg5ENT+nyL0b0niZ\n0ITz1f3/arh35zGKGr1mueUrJuSLeRG1v62+Mire+5PIliT+tQM7Bk8TptlSIl37\n3jccIfXR+UOVrHdSl0QmGOxb\n-----END CERTIFICATE-----"
               ],
               "cfengineUser":"root"
             },
@@ -178,7 +178,7 @@ response:
             ],
             "managementTechnologyDetails" : {
               "cfengineKeys" : [
-                "-----BEGIN RSA PUBLIC KEY-----\nMIIBCAKCAQEAlntroa72gD50MehPoyp6mRS5fzZpsZEHu42vq9KKxbqSsjfUmxnT\nRsi8CDvBt7DApIc7W1g0eJ6AsOfV7CEh3ooiyL/fC9SGATyDg5TjYPJZn3MPUktg\nYBzTd1MMyZL6zcLmIpQBH6XHkH7Do/RxFRtaSyicLxiO3H3wapH20TnkUvEpV5Qh\nzUkNM8vHZuu3m1FgLrK5NCN7BtoGWgeyVJvBMbWww5hS15IkCRuBkAOK/+h8xe2f\nhMQjrt9gW2qJpxZyFoPuMsWFIaX4wrN7Y8ZiN37U2q1G11tv2oQlJTQeiYaUnTX4\nz5VEb9yx2KikbWyChM1Akp82AV5BzqE80QIBIw==\n-----END RSA PUBLIC KEY-----"
+                "-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUO0kEJ2Fwb4MWT2yBVqR+UX4osMcwDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUxMB4XDTI0MTEwMjE2MTIxOVoXDTM0\nMTAzMTE2MTIxOVowFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUxMIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAptzhnQCPvgOwjn6LCfVhTMAs10hwYj5YxqOX\ni8MPiFT4Rlrn6xyB24O7E+O2EL/IUYSk5Lbp2OGSJWvNe1d+KbESpmGoM1UnAa8j\nVsW+HY/uJ23THKAhe9ykOxWObSp/sSwFhw6C0p7SriI72uW/fJ40XCh2m2FuJuQP\nYHjNOR5P/cOLhKs/cEkt3icMxyfipor+kcqC/GsCPtwwXFwnS5yWlmRxVSzkI1fZ\n6B403aHMe5PSqD0kxWX8roR/9sIVRvLVbxQtiuyM2xUeSuIlg3bho9wN4/shhqKv\nq3zqJQy86YZVC9jRmX21BeQukTWiu3uqppxVcyTM5Wzf3jrE7A+2Iea6ZvMFA0fq\nD39CgXhkuCGdGaBQtVzuYBASyECUEmMgQMb99rnlONVVVdFQHS26+c1fR1rn+Iyq\nkGOmrTRSaf1F8OLnvAY9UhXi/oJNDh57y+Y+X11XY2mBgmt/zRFN05HxD0UpsvlS\np850QzmoO7qusRY5CnrX40HHhhB9wr5lhKTVEAgoEhrYvC/wDWLBElECNQzC99ye\nFUR2T1sc1qsmDVki5eivm086viHt231plJIXKtAdTLc2EXYxtNiVowXKbhujtwOR\ngIcG9YXEwc7woXnpxOJHYlFfB9TKMKzc8FfKVZnOibp0Ceenpxj0nUItlLJMoEaM\nG4upElcCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBT9f5l3IkLI\ndwooamw/OugzXWT8RjBSBgNVHSMESzBJgBT9f5l3IkLIdwooamw/OugzXWT8RqEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUxghQ7SQQnYXBvgxZPbIFWpH5Rfiiw\nxzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAF0LWEG8O3W18U0r+6v1\npSS1UqcP0HI3M27+Pq2Gk+/s9DRlgeyPmSYTGMdbP1eL5lR5BubUrZlKmXCneda+\nVl4akoNaYXHFKpRIKm4y2ezX6XRugblurc+tL3V17UAhYjSglL/5yRXiLrJKACOP\n0NNjjrqn2JM2PfD29Ge6K+yir92V8aOByElZVYNH4f9Avc+zzg4yBDTONutZ2TBx\ncPZ3s2Z7bsbOYhJey+j99Oc/puyUNyvh5R/hLV5QP+FA/N8JR8N2IeaIwF8/Kyhu\nMTSajF4pLY1N8YbQA0jd6zwz6NvRu5HBJ+u53JX4kyMc8mMAG0PZz6pUmAwlqq7V\nEqsjDVYHB19WKh9gaJkKNkft7IsB1b7exklGRPUuR/Sb4a5rgl47a3EM38KCVfFX\nBBNUhCn0Lt3lKs4RUXxLSh36ptEPre9qkWtdTnjR+T6KLxVonLdNQSOeqRplb4la\nUu/CwaqyaPf39pzyXLNdZszknsXk+ih1+Kn/X7cTTUjNsvlMRqlh/wW2Ss0FK3R3\n7GObkgYD5hHVDrH5tp9gh0a0r0GT3bT4119BgE8zgwqMGbOHkg5ENT+nyL0b0niZ\n0ITz1f3/arh35zGKGr1mueUrJuSLeRG1v62+Mire+5PIliT+tQM7Bk8TptlSIl37\n3jccIfXR+UOVrHdSl0QmGOxb\n-----END CERTIFICATE-----"
               ],
               "cfengineUser" : "root"
             },
@@ -307,7 +307,7 @@ response:
             "status":"accepted",
             "managementTechnologyDetails":{
               "cfengineKeys":[
-                "-----BEGIN RSA PUBLIC KEY-----\nMIIBCAKCAQEAlntroa72gD50MehPoyp6mRS5fzZpsZEHu42vq9KKxbqSsjfUmxnT\nRsi8CDvBt7DApIc7W1g0eJ6AsOfV7CEh3ooiyL/fC9SGATyDg5TjYPJZn3MPUktg\nYBzTd1MMyZL6zcLmIpQBH6XHkH7Do/RxFRtaSyicLxiO3H3wapH20TnkUvEpV5Qh\nzUkNM8vHZuu3m1FgLrK5NCN7BtoGWgeyVJvBMbWww5hS15IkCRuBkAOK/+h8xe2f\nhMQjrt9gW2qJpxZyFoPuMsWFIaX4wrN7Y8ZiN37U2q1G11tv2oQlJTQeiYaUnTX4\nz5VEb9yx2KikbWyChM1Akp82AV5BzqE80QIBIw==\n-----END RSA PUBLIC KEY-----"
+                "-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUO0kEJ2Fwb4MWT2yBVqR+UX4osMcwDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUxMB4XDTI0MTEwMjE2MTIxOVoXDTM0\nMTAzMTE2MTIxOVowFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUxMIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAptzhnQCPvgOwjn6LCfVhTMAs10hwYj5YxqOX\ni8MPiFT4Rlrn6xyB24O7E+O2EL/IUYSk5Lbp2OGSJWvNe1d+KbESpmGoM1UnAa8j\nVsW+HY/uJ23THKAhe9ykOxWObSp/sSwFhw6C0p7SriI72uW/fJ40XCh2m2FuJuQP\nYHjNOR5P/cOLhKs/cEkt3icMxyfipor+kcqC/GsCPtwwXFwnS5yWlmRxVSzkI1fZ\n6B403aHMe5PSqD0kxWX8roR/9sIVRvLVbxQtiuyM2xUeSuIlg3bho9wN4/shhqKv\nq3zqJQy86YZVC9jRmX21BeQukTWiu3uqppxVcyTM5Wzf3jrE7A+2Iea6ZvMFA0fq\nD39CgXhkuCGdGaBQtVzuYBASyECUEmMgQMb99rnlONVVVdFQHS26+c1fR1rn+Iyq\nkGOmrTRSaf1F8OLnvAY9UhXi/oJNDh57y+Y+X11XY2mBgmt/zRFN05HxD0UpsvlS\np850QzmoO7qusRY5CnrX40HHhhB9wr5lhKTVEAgoEhrYvC/wDWLBElECNQzC99ye\nFUR2T1sc1qsmDVki5eivm086viHt231plJIXKtAdTLc2EXYxtNiVowXKbhujtwOR\ngIcG9YXEwc7woXnpxOJHYlFfB9TKMKzc8FfKVZnOibp0Ceenpxj0nUItlLJMoEaM\nG4upElcCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBT9f5l3IkLI\ndwooamw/OugzXWT8RjBSBgNVHSMESzBJgBT9f5l3IkLIdwooamw/OugzXWT8RqEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGUxghQ7SQQnYXBvgxZPbIFWpH5Rfiiw\nxzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBAF0LWEG8O3W18U0r+6v1\npSS1UqcP0HI3M27+Pq2Gk+/s9DRlgeyPmSYTGMdbP1eL5lR5BubUrZlKmXCneda+\nVl4akoNaYXHFKpRIKm4y2ezX6XRugblurc+tL3V17UAhYjSglL/5yRXiLrJKACOP\n0NNjjrqn2JM2PfD29Ge6K+yir92V8aOByElZVYNH4f9Avc+zzg4yBDTONutZ2TBx\ncPZ3s2Z7bsbOYhJey+j99Oc/puyUNyvh5R/hLV5QP+FA/N8JR8N2IeaIwF8/Kyhu\nMTSajF4pLY1N8YbQA0jd6zwz6NvRu5HBJ+u53JX4kyMc8mMAG0PZz6pUmAwlqq7V\nEqsjDVYHB19WKh9gaJkKNkft7IsB1b7exklGRPUuR/Sb4a5rgl47a3EM38KCVfFX\nBBNUhCn0Lt3lKs4RUXxLSh36ptEPre9qkWtdTnjR+T6KLxVonLdNQSOeqRplb4la\nUu/CwaqyaPf39pzyXLNdZszknsXk+ih1+Kn/X7cTTUjNsvlMRqlh/wW2Ss0FK3R3\n7GObkgYD5hHVDrH5tp9gh0a0r0GT3bT4119BgE8zgwqMGbOHkg5ENT+nyL0b0niZ\n0ITz1f3/arh35zGKGr1mueUrJuSLeRG1v62+Mire+5PIliT+tQM7Bk8TptlSIl37\n3jccIfXR+UOVrHdSl0QmGOxb\n-----END CERTIFICATE-----"
               ],
               "cfengineUser":"root"
             }
@@ -339,7 +339,7 @@ body: >-
       "state": "enabled",
       "policyMode": "enforce",
       "agentKey": {
-        "value": "-----BEGIN CERTIFICATE-----\nMIIFqDCC[...]3tALNn\n-----END CERTIFICATE-----",
+        "value": "-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUfa0+S+CyJahRzuwNNOFLNQQjIH8wDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MB4XDTI0MDMwMTExMDIxM1oXDTM0\nMDIyNzExMDIxM1owFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAsmBUYI1A5vqkOTCW24m/mQhBaRu4WaAUXDAr\nArdIAAMN0KyHhEXP1/X32Flw90E0VjtUH4P+DYLBozXYWhJrUxdWLyn3TRSbv3Kr\npXoCWhMhMp8OK2s/mG+rfiMpTXIwaMhPnBaJFNV3c+bkijGAMHtFjl3+leXJvNZ7\nw3bIg4cA3e77kz7EWMyqxOUvvLMyY6wpd03ahe/By+iLgtOkgUwl9hMqMU8tJeaz\nNIeUporsHk5rrk8bSf6Mxxdknm43Sk6oflnueNCIUFdd4rS2JLieMugsTh8n/oH+\nk29ZyirE3ikhftmZ3vY8GQ3IcIzaXwiAOGnCKcze79zVx5jmOTGSZitGZaU/cZc6\nLjzEp+ZDmE8caVIksiA+hIlaZeBXNHB+YRv/gV1Rbt7kS1am+XUZJSfVFf+99YqE\nlZ5p0hqJsczkBb2RuMxWxxsWO3pesPUNCuL/yaeggTIp7eK06tQWi1EfXr40ctrf\noimbzMAKNBpRKWruL7652SlF75Usaq+PaPi1TtqYQjLRZmbpr+IR4uMeKnEMIZPw\n3dLDKBV6d71XkTAalCmcJU+fgYrRmgz1dEnaZDIXY+f+fYR15hsFpDrZ0avHgkzJ\nca/nT/rKeX7136BttxVSbZaTU9hnmjAvl+v0BF+JUWPQ3VPTcrmyUNAICt8xdVae\nuo1tsvkCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSRG0uHQRIA\ngl91YqzSjaeaw+F7PDBSBgNVHSMESzBJgBSRG0uHQRIAgl91YqzSjaeaw+F7PKEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3ghR9rT5L4LIlqFHO7A004Us1BCMg\nfzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBABR2vTH/6WlqjaTZ/hQc\nB+crqRlFimqCiVTRdX6qfkt0tLX2dK6scHNTBT04ORLjLTAn0KbcOUz3k6i0mIqB\nnG5UjqCFEQR+i2V4Hz7aK6+7LBQuwXWRhDhvO5xMn7MxjvP0LGgNf5iiA4r/N22L\nEMc1prDESIOGmWdKg9XlfLxd877R2d8/3hXyT82Y2uJHO25b53skj4pbUOWLsGSw\nd4FBNnWqM+7Hbg2v9xFvmtfs2G2Inqk4Xjtjnj8qkVk3ft6KzClUIMXGXQ8QqaRp\nYPkTJm5g2UBYDiguD/tlz3VmbsNYU6fkap7DKqhttbaseIx1zDwdAv4jtVOWDyjx\nWq4b7pljYiczfRa84X/9v1x05pT3raELy5udY+Pxmnz+hOXOM+jY5bzSKS24b8rS\n5Sklmutm0IdflMKd5vNrXd9yPFLu3QzN50ArzHHXczwBLgjaMlZsPAp1wITlqM7+\nWCjy3qM5/KgAjH3L24MPTq23o9PokBVh1NH7lesZqgJPgsj+OG7FMQDvKzg7ytrs\nQlIDF1c8Ko+9/RrnRVAS8C4GZOqbmMmfJjMp09GBz2d0ixlTusF6m6iwfIVMf/nI\nP/V0D7STRiV62cfnZ3e0w8kIeZwWAgXI7RMHJU3skLyurUu8yxkp635IQyzQsW2A\nYo7t7O7fxjqD9yVI2QfkERZ7\n-----END CERTIFICATE-----\n",
         "status": "certified"
       },
       "properties": [
@@ -412,7 +412,7 @@ body: >-
       "state": "enabled",
       "policyMode": "enforce",
       "agentKey": {
-        "value": "-----BEGIN CERTIFICATE-----\nMIIFqDCC[...]3tALNn\n-----END CERTIFICATE-----",
+        "value": "-----BEGIN CERTIFICATE-----\nMIIFTjCCAzagAwIBAgIUfa0+S+CyJahRzuwNNOFLNQQjIH8wDQYJKoZIhvcNAQEL\nBQAwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MB4XDTI0MDMwMTExMDIxM1oXDTM0\nMDIyNzExMDIxM1owFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3MIICIjANBgkqhkiG\n9w0BAQEFAAOCAg8AMIICCgKCAgEAsmBUYI1A5vqkOTCW24m/mQhBaRu4WaAUXDAr\nArdIAAMN0KyHhEXP1/X32Flw90E0VjtUH4P+DYLBozXYWhJrUxdWLyn3TRSbv3Kr\npXoCWhMhMp8OK2s/mG+rfiMpTXIwaMhPnBaJFNV3c+bkijGAMHtFjl3+leXJvNZ7\nw3bIg4cA3e77kz7EWMyqxOUvvLMyY6wpd03ahe/By+iLgtOkgUwl9hMqMU8tJeaz\nNIeUporsHk5rrk8bSf6Mxxdknm43Sk6oflnueNCIUFdd4rS2JLieMugsTh8n/oH+\nk29ZyirE3ikhftmZ3vY8GQ3IcIzaXwiAOGnCKcze79zVx5jmOTGSZitGZaU/cZc6\nLjzEp+ZDmE8caVIksiA+hIlaZeBXNHB+YRv/gV1Rbt7kS1am+XUZJSfVFf+99YqE\nlZ5p0hqJsczkBb2RuMxWxxsWO3pesPUNCuL/yaeggTIp7eK06tQWi1EfXr40ctrf\noimbzMAKNBpRKWruL7652SlF75Usaq+PaPi1TtqYQjLRZmbpr+IR4uMeKnEMIZPw\n3dLDKBV6d71XkTAalCmcJU+fgYrRmgz1dEnaZDIXY+f+fYR15hsFpDrZ0avHgkzJ\nca/nT/rKeX7136BttxVSbZaTU9hnmjAvl+v0BF+JUWPQ3VPTcrmyUNAICt8xdVae\nuo1tsvkCAwEAAaOBkTCBjjAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSRG0uHQRIA\ngl91YqzSjaeaw+F7PDBSBgNVHSMESzBJgBSRG0uHQRIAgl91YqzSjaeaw+F7PKEb\npBkwFzEVMBMGCgmSJomT8ixkAQEMBW5vZGU3ghR9rT5L4LIlqFHO7A004Us1BCMg\nfzALBgNVHQ8EBAMCArwwDQYJKoZIhvcNAQELBQADggIBABR2vTH/6WlqjaTZ/hQc\nB+crqRlFimqCiVTRdX6qfkt0tLX2dK6scHNTBT04ORLjLTAn0KbcOUz3k6i0mIqB\nnG5UjqCFEQR+i2V4Hz7aK6+7LBQuwXWRhDhvO5xMn7MxjvP0LGgNf5iiA4r/N22L\nEMc1prDESIOGmWdKg9XlfLxd877R2d8/3hXyT82Y2uJHO25b53skj4pbUOWLsGSw\nd4FBNnWqM+7Hbg2v9xFvmtfs2G2Inqk4Xjtjnj8qkVk3ft6KzClUIMXGXQ8QqaRp\nYPkTJm5g2UBYDiguD/tlz3VmbsNYU6fkap7DKqhttbaseIx1zDwdAv4jtVOWDyjx\nWq4b7pljYiczfRa84X/9v1x05pT3raELy5udY+Pxmnz+hOXOM+jY5bzSKS24b8rS\n5Sklmutm0IdflMKd5vNrXd9yPFLu3QzN50ArzHHXczwBLgjaMlZsPAp1wITlqM7+\nWCjy3qM5/KgAjH3L24MPTq23o9PokBVh1NH7lesZqgJPgsj+OG7FMQDvKzg7ytrs\nQlIDF1c8Ko+9/RrnRVAS8C4GZOqbmMmfJjMp09GBz2d0ixlTusF6m6iwfIVMf/nI\nP/V0D7STRiV62cfnZ3e0w8kIeZwWAgXI7RMHJU3skLyurUu8yxkp635IQyzQsW2A\nYo7t7O7fxjqD9yVI2QfkERZ7\n-----END CERTIFICATE-----\n",
         "status": "certified"
       },
       "properties": [
diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala
index 61b0bd22669..92fdd049495 100644
--- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala
+++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/MockServices.scala
@@ -288,6 +288,7 @@ class MockCompliance(mockDirectives: MockDirectives) {
       ).map(n => (n.id, n)).toMap.view.succeed
     }
 
+    override def getNumberOfManagedNodes(): IOResult[RuntimeFlags] = 8.succeed
     def registerChangeCallbackAction(callback: NodeFactChangeEventCallback): IOResult[Unit] = ???
     def getStatus(id:                          NodeId)(implicit qc:   QueryContext): IOResult[InventoryStatus] = ???
     def get(nodeId:                            NodeId)(implicit qc:   QueryContext, status:    SelectNodeStatus): IOResult[Option[CoreNodeFact]]  = ???
diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala
index 7659ef0d61c..f82668f5f12 100644
--- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala
+++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/RestTestSetUp.scala
@@ -47,6 +47,7 @@ import com.normation.cfclerk.services.UpdateTechniqueLibrary
 import com.normation.errors.IOResult
 import com.normation.eventlog.EventActor
 import com.normation.eventlog.EventLog
+import com.normation.eventlog.EventLogDetails
 import com.normation.eventlog.EventLogFilter
 import com.normation.eventlog.ModificationId
 import com.normation.inventory.domain.FullInventory
@@ -59,7 +60,9 @@ import com.normation.rudder.apidata.ZioJsonExtractor
 import com.normation.rudder.batch.*
 import com.normation.rudder.batch.PolicyGenerationTrigger.AllGeneration
 import com.normation.rudder.campaigns.CampaignSerializer
+import com.normation.rudder.config.StatelessUserPropertyService
 import com.normation.rudder.domain.appconfig.FeatureSwitch
+import com.normation.rudder.domain.eventlog.ModifyNodeGroup
 import com.normation.rudder.domain.nodes.NodeGroup
 import com.normation.rudder.domain.nodes.NodeGroupId
 import com.normation.rudder.domain.policies.DirectiveId
@@ -101,6 +104,8 @@ import com.normation.rudder.repository.*
 import com.normation.rudder.rest.data.Creation
 import com.normation.rudder.rest.data.Creation.CreationError
 import com.normation.rudder.rest.data.NodeSetup
+import com.normation.rudder.rest.internal.EventLogAPI
+import com.normation.rudder.rest.internal.EventLogService
 import com.normation.rudder.rest.internal.GroupInternalApiService
 import com.normation.rudder.rest.internal.GroupsInternalApi
 import com.normation.rudder.rest.internal.RestQuicksearch
@@ -112,6 +117,7 @@ import com.normation.rudder.rest.v1.RestStatus
 import com.normation.rudder.rule.category.RuleCategoryService
 import com.normation.rudder.services.ClearCacheService
 import com.normation.rudder.services.eventlog.EventLogDeploymentService
+import com.normation.rudder.services.eventlog.EventLogDetailsServiceImpl
 import com.normation.rudder.services.eventlog.EventLogFactory
 import com.normation.rudder.services.healthcheck.CheckCoreNumber
 import com.normation.rudder.services.healthcheck.CheckFileDescriptorLimit
@@ -119,6 +125,7 @@ import com.normation.rudder.services.healthcheck.CheckFreeSpace
 import com.normation.rudder.services.healthcheck.HealthcheckNotificationService
 import com.normation.rudder.services.healthcheck.HealthcheckService
 import com.normation.rudder.services.marshalling.DeploymentStatusSerialisation
+import com.normation.rudder.services.modification.ModificationService
 import com.normation.rudder.services.policies.DependencyAndDeletionServiceImpl
 import com.normation.rudder.services.policies.FindDependencies
 import com.normation.rudder.services.policies.InterpolationContext
@@ -146,8 +153,8 @@ import com.normation.rudder.web.model.DirectiveField
 import com.normation.rudder.web.model.LinkUtil
 import com.normation.rudder.web.services.DirectiveEditorServiceImpl
 import com.normation.rudder.web.services.DirectiveFieldFactory
+import com.normation.rudder.web.services.EventLogDetailsGenerator
 import com.normation.rudder.web.services.Section2FieldService
-import com.normation.rudder.web.services.StatelessUserPropertyService
 import com.normation.rudder.web.services.Translator
 import com.normation.utils.StringUuidGeneratorImpl
 import com.normation.zio.*
@@ -254,6 +261,13 @@ class RestTestSetUp {
     null // not able to search techniques
   )
 
+  val linkUtil = new LinkUtil(
+    mockRules.ruleRepo,
+    mockNodeGroups.groupsRepo,
+    mockDirectives.directiveRepo,
+    mockNodes.nodeFactRepo
+  )
+
   object dynGroupService extends DynGroupService {
     override def getAllDynGroups(): Box[Seq[NodeGroup]] = {
       mockNodeGroups.groupsRepo
@@ -271,18 +285,30 @@ class RestTestSetUp {
   val deploymentStatusSerialisation: DeploymentStatusSerialisation = new DeploymentStatusSerialisation {
     override def serialise(deploymentStatus: CurrentDeploymentStatus): Elem = <test/>
   }
+  val fakeModifyNodeGroupEventLog = new ModifyNodeGroup(
+    EventLogDetails(
+      id = Some(42),
+      modificationId = None,
+      principal = EventActor("test"),
+      creationDate = DateTime.parse("2024-12-04T15:30:10"),
+      details = <test/>,
+      reason = None
+    )
+  )
   val eventLogRepo:                  EventLogRepository            = new EventLogRepository {
     override def saveEventLog(modId: ModificationId, eventLog: EventLog): IOResult[EventLog] = eventLog.succeed
 
-    override def eventLogFactory: EventLogFactory = ???
+    override def eventLogFactory:           EventLogFactory    = ???
     override def getEventLogByCriteria(
         criteria:       Option[Fragment],
         limit:          Option[Int],
         orderBy:        List[Fragment],
         extendedFilter: Option[Fragment]
-    ): IOResult[Seq[EventLog]] = ???
-    override def getEventLogById(id: Long): IOResult[EventLog] = ???
-    override def getEventLogCount(criteria:       Option[Fragment], extendedFilter: Option[Fragment]): IOResult[Long] = ???
+    ): IOResult[Seq[EventLog]] = List(fakeModifyNodeGroupEventLog).succeed
+    override def getEventLogById(id: Long): IOResult[EventLog] = {
+      fakeModifyNodeGroupEventLog.succeed
+    }
+    override def getEventLogCount(criteria: Option[Fragment], extendedFilter: Option[Fragment]): IOResult[Long] = 0L.succeed
     override def getEventLogByChangeRequest(
         changeRequest:   ChangeRequestId,
         xpath:           String,
@@ -290,7 +316,9 @@ class RestTestSetUp {
         orderBy:         Option[String],
         eventTypeFilter: List[EventLogFilter]
     ): IOResult[Vector[EventLog]] = ???
-    override def getEventLogWithChangeRequest(id: Int): IOResult[Option[(EventLog, Option[ChangeRequestId])]] = ???
+    override def getEventLogWithChangeRequest(id: Int): IOResult[Option[(EventLog, Option[ChangeRequestId])]] = {
+      ZIO.none
+    }
     override def getLastEventByChangeRequest(
         xpath:           String,
         eventTypeFilter: List[EventLogFilter]
@@ -317,10 +345,27 @@ class RestTestSetUp {
     ): IOResult[EventLog] = ZIO.succeed(null)
 
   }
-  val eventLogger:                   EventLogDeploymentService     = new EventLogDeploymentService(eventLogRepo, null) {
+  val eventLogDetailsService = new EventLogDetailsServiceImpl(null, null, null, null, null, null, null, null, null)
+  val modificationService = new ModificationService(null, null, null, null) {
+    override def restoreToEventLog(
+        eventLog:         EventLog,
+        commiter:         PersonIdent,
+        rollbackedEvents: Seq[EventLog],
+        target:           EventLog
+    ): Box[GitCommitId] = Full(fakeGitCommitId)
+  }
+  val eventLogDetailGenerator: EventLogDetailsGenerator = new EventLogDetailsGenerator(
+    eventLogDetailsService,
+    mockNodeGroups.groupsRepo,
+    mockRules.ruleCategoryRepo,
+    modificationService,
+    linkUtil,
+    null
+  )
+  val eventLogger:      EventLogDeploymentService = new EventLogDeploymentService(eventLogRepo, null) {
     override def getLastDeployement(): Box[CurrentDeploymentStatus] = Full(NoStatus)
   }
-  val policyGeneration:              PromiseGenerationService      = new PromiseGenerationService {
+  val policyGeneration: PromiseGenerationService  = new PromiseGenerationService {
     override def deploy():       Box[Set[NodeId]]                   = Full(Set())
     override def getNodeFacts(): Box[MapView[NodeId, CoreNodeFact]] = ???
     override def getDirectiveLibrary(ids: Set[DirectiveId]): Box[FullActiveTechniqueCategory] = ???
@@ -422,7 +467,7 @@ class RestTestSetUp {
     ): Box[Unit] = ???
     override def invalidateComplianceCache(actions: Seq[(NodeId, CacheExpectedReportAction)]): IOResult[Unit] = ???
   }
-  val bootGuard:                     Promise[Nothing, Unit]        = (for {
+  val bootGuard:        Promise[Nothing, Unit]    = (for {
     p <- Promise.make[Nothing, Unit]
     _ <- p.succeed(())
   } yield p).runNow
@@ -656,23 +701,15 @@ class RestTestSetUp {
     null
   )
 
-  val ruleApiService2 = new RuleApiService2(
-    mockRules.ruleRepo,
-    mockRules.ruleRepo,
-    uuidGen,
-    asyncDeploymentAgent,
-    workflowLevelService,
-    restExtractorService,
-    restDataSerializer
+  val eventLogService = new EventLogService(eventLogRepo, eventLogDetailGenerator, fakePersonIndentService)
+  val eventLogApi     = new EventLogAPI(
+    eventLogService,
+    eventLogDetailGenerator,
+    _.serialize
   )
 
-  val ruleCategoryService     = new RuleCategoryService()
-  val ruleApiService6         = new RuleApiService6(
-    mockRules.ruleCategoryRepo,
-    mockRules.ruleRepo,
-    mockRules.ruleCategoryRepo,
-    restDataSerializer
-  )
+  val ruleCategoryService = new RuleCategoryService()
+
   val ruleApiService14        = new RuleApiService14(
     mockRules.ruleRepo,
     mockRules.ruleRepo,
@@ -696,7 +733,7 @@ class RestTestSetUp {
   )
   val groupInternalApiService = new GroupInternalApiService(mockNodeGroups.groupsRepo)
 
-  val fieldFactory:         DirectiveFieldFactory = new DirectiveFieldFactory {
+  val fieldFactory: DirectiveFieldFactory = new DirectiveFieldFactory {
     override def forType(fieldType: VariableSpec, id: String): DirectiveField = default(id)
     override def default(withId: String): DirectiveField = new DirectiveField {
       self => type ValueType = String
@@ -721,19 +758,6 @@ class RestTestSetUp {
     mockConfigRepo.configurationRepository,
     new Section2FieldService(fieldFactory, Translator.defaultTranslators)
   )
-  val directiveApiService2: DirectiveApiService2  = {
-    new DirectiveApiService2(
-      mockDirectives.directiveRepo,
-      mockDirectives.directiveRepo,
-      uuidGen,
-      asyncDeploymentAgent,
-      workflowLevelService,
-      restExtractorService,
-      directiveEditorService,
-      restDataSerializer,
-      mockTechniques.techniqueRepo
-    )
-  }
 
   val directiveApiService14: DirectiveApiService14 = {
     new DirectiveApiService14(
@@ -749,11 +773,6 @@ class RestTestSetUp {
     )
   }
 
-  val techniqueAPIService6 = new TechniqueAPIService6(
-    mockDirectives.directiveRepo,
-    restDataSerializer
-  )
-
   val techniqueAPIService14 = new TechniqueAPIService14(
     mockDirectives.directiveRepo,
     mockTechniques.techniqueRevisionRepo,
@@ -790,7 +809,7 @@ class RestTestSetUp {
         null,
         mockNodes.newNodeManager,
         mockNodes.removeNodeService,
-        restExtractorService,
+        zioJsonExtractor,
         mockCompliance.reportingService(Map.empty),
         mockNodes.queryProcessor,
         null,
@@ -838,33 +857,13 @@ class RestTestSetUp {
     }
   }
 
-  val parameterApiService2  = new ParameterApiService2(
-    mockParameters.paramsRepo,
-    mockParameters.paramsRepo,
-    uuidGen,
-    workflowLevelService,
-    restExtractorService,
-    restDataSerializer
-  )
   val parameterApiService14 = new ParameterApiService14(
-    mockParameters.paramsRepo,
     mockParameters.paramsRepo,
     uuidGen,
     workflowLevelService
   )
 
-  val groupService2               = new GroupApiService2(
-    mockNodeGroups.groupsRepo,
-    mockNodeGroups.groupsRepo,
-    uuidGen,
-    asyncDeploymentAgent,
-    workflowLevelService,
-    restExtractorService,
-    mockNodes.queryProcessor,
-    restDataSerializer
-  )
-  val groupService6               = new GroupApiService6(mockNodeGroups.groupsRepo, mockNodeGroups.groupsRepo, restDataSerializer)
-  val groupService14              = new GroupApiService14(
+  val groupService14 = new GroupApiService14(
     mockNodes.nodeFactRepo,
     mockNodeGroups.groupsRepo,
     mockNodeGroups.groupsRepo,
@@ -877,7 +876,6 @@ class RestTestSetUp {
     mockNodes.queryProcessor,
     restDataSerializer
   )
-  val groupApiInheritedProperties = new GroupApiInheritedProperties(mockNodes.propRepo)
   val ncfTechniqueWriter:  TechniqueWriter       = null
   val ncfTechniqueReader:  EditorTechniqueReader = null
   val techniqueRepository: TechniqueRepository   = null
@@ -921,33 +919,43 @@ class RestTestSetUp {
     val translator = new CampaignSerializer()
     translator.addJsonTranslater(mockCampaign.dumbCampaignTranslator)
     import mockCampaign.*
-    val api        = new CampaignApi(repo, translator, dumbCampaignEventRepository, mainCampaignService, restExtractorService, uuidGen)
+    val api        = new CampaignApi(repo, translator, dumbCampaignEventRepository, mainCampaignService, uuidGen)
+  }
+
+  // name that one for version API
+  val parameterApi = new ParameterApi(zioJsonExtractor, parameterApiService14)
+  // info is special and should be based on all api and version, but to avoid change at each tests/version, build
+  // it with static values
+  val infoApi      = {
+    val infoVersion = ApiVersion(19, deprecated = true) ::
+      ApiVersion(20, deprecated = false) ::
+      Nil
+    val schemas     = parameterApi.schemas.endpoints ++ InfoApi.endpoints
+    val endpoints   = schemas.flatMap(new RudderEndpointDispatcher(LiftApiProcessingLogger).withVersion(_, infoVersion))
+    new InfoApi(infoVersion, endpoints)
   }
 
   val apiModules: List[LiftApiModuleProvider[? <: EndpointSchema with SortIndex]] = List(
     systemApi,
-    new ParameterApi(restExtractorService, zioJsonExtractor, parameterApiService2, parameterApiService14),
+    parameterApi,
     new TechniqueApi(
       restExtractorService,
-      techniqueAPIService6,
       techniqueAPIService14,
       ncfTechniqueWriter,
       ncfTechniqueReader,
       techniqueRepository,
       techniqueSerializer,
       uuidGen,
+      userPropertyService,
       resourceFileService,
       mockGitRepo.configurationRepositoryRoot.pathAsString
     ),
     new DirectiveApi(
-      mockDirectives.directiveRepo,
-      restExtractorService,
       zioJsonExtractor,
       uuidGen,
-      directiveApiService2,
       directiveApiService14
     ),
-    new RuleApi(restExtractorService, zioJsonExtractor, ruleApiService2, ruleApiService6, ruleApiService14, uuidGen),
+    new RuleApi(zioJsonExtractor, ruleApiService14, uuidGen),
     new RulesInternalApi(ruleInternalApiService, ruleApiService14),
     new GroupsInternalApi(groupInternalApiService),
     new NodeApi(
@@ -961,15 +969,11 @@ class RestTestSetUp {
       DeleteMode.Erase
     ),
     new GroupsApi(
-      mockNodeGroups.groupsRepo,
       mockNodeGroups.propService,
-      restExtractorService,
       zioJsonExtractor,
       uuidGen,
-      groupService2,
-      groupService6,
-      groupService14,
-      groupApiInheritedProperties
+      userPropertyService,
+      groupService14
     ),
     new SettingsApi(
       restExtractorService,
@@ -977,7 +981,7 @@ class RestTestSetUp {
       asyncDeploymentAgent,
       uuidGen,
       settingsService.policyServerManagementService,
-      mockNodes.nodeInfoService
+      mockNodes.nodeFactRepo
     ),
     archiveAPIModule.api,
     campaignApiModule.api,
@@ -990,21 +994,20 @@ class RestTestSetUp {
       mockUserManagement.userRepo,
       mockUserManagement.userService,
       mockUserManagement.userManagementService,
-      new RoleApiMapping(new ExtensibleAuthorizationApiMapping(AuthorizationApiMapping.Core :: Nil)),
       mockUserManagement.tenantsService,
       () => mockUserManagement.providerRoleExtension,
       () => mockUserManagement.authBackendProviders
-    )
+    ),
+    infoApi,
+    eventLogApi
   )
 
   val apiVersions: List[ApiVersion] = {
-    ApiVersion(14, deprecated = true) ::
-    ApiVersion(15, deprecated = true) ::
-    ApiVersion(16, deprecated = true) ::
     ApiVersion(17, deprecated = true) ::
-    ApiVersion(18, deprecated = false) ::
-    ApiVersion(19, deprecated = false) ::
+    ApiVersion(18, deprecated = true) ::
+    ApiVersion(19, deprecated = true) ::
     ApiVersion(20, deprecated = false) ::
+    ApiVersion(21, deprecated = false) ::
     Nil
   }
   val (rudderApi, liftRules) = TraitTestApiFromYamlFiles.buildLiftRules(apiModules, apiVersions, Some(userService))
@@ -1016,12 +1019,7 @@ class RestTestSetUp {
     new RestQuicksearch(
       quickSearchService,
       userService,
-      new LinkUtil(
-        mockRules.ruleRepo,
-        mockNodeGroups.groupsRepo,
-        mockDirectives.directiveRepo,
-        mockNodes.nodeInfoService
-      )
+      linkUtil
     )
   )
 
@@ -1145,14 +1143,29 @@ class RestTest(liftRules: LiftRules) {
     mockReq
   }
 
+  // String-based API alternative to lift-json
+  private def mockJsonRequest(path: String, method: String, data: String) = {
+    val mockReq = mockRequest(path, method)
+    mockReq.body_=(data, "application/json")
+    mockReq
+  }
+
   def jsonPUT(path: String, json: JValue): MockHttpServletRequest = {
     mockJsonRequest(path, "PUT", json)
   }
 
+  def jsonPUT(path: String, json: String): MockHttpServletRequest = {
+    mockJsonRequest(path, "PUT", json)
+  }
+
   def jsonPOST(path: String, json: JValue): MockHttpServletRequest = {
     mockJsonRequest(path, "POST", json)
   }
 
+  def jsonPOST(path: String, json: String): MockHttpServletRequest = {
+    mockJsonRequest(path, "POST", json)
+  }
+
   // url encode the data for param name
   def binaryPOST(
       path:         String,
@@ -1192,6 +1205,12 @@ class RestTest(liftRules: LiftRules) {
   def testPOSTResponse[T](path: String, json: JValue)(tests: Box[LiftResponse] => MatchResult[T]): MatchResult[T] = {
     execRequestResponse(jsonPOST(path, json))(tests)
   }
+  def testPUTResponse[T](path: String, json: String)(tests: Box[LiftResponse] => MatchResult[T]):  MatchResult[T] = {
+    execRequestResponse(jsonPUT(path, json))(tests)
+  }
+  def testPOSTResponse[T](path: String, json: String)(tests: Box[LiftResponse] => MatchResult[T]): MatchResult[T] = {
+    execRequestResponse(jsonPOST(path, json))(tests)
+  }
   def testBinaryPOSTResponse[T](
       path:         String,
       paramName:    String,
diff --git a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestRestFromFileDef.scala b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestRestFromFileDef.scala
index 1d9b9597c0f..6046e00fa58 100644
--- a/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestRestFromFileDef.scala
+++ b/webapp/sources/rudder/rudder-rest/src/test/scala/com/normation/rudder/rest/TestRestFromFileDef.scala
@@ -92,7 +92,7 @@ class TestRestFromFileDef extends ZIOSpecDefault {
                yamlSourceDirectory,
                yamlDestTmpDirectory,
                restTestSetUp.liftRules,
-               Nil,
+               List("api_eventlogs.yml"),
                transformations
              )
         _ <- effectUioUnit(
diff --git a/webapp/sources/rudder/rudder-templates-cli/pom.xml b/webapp/sources/rudder/rudder-templates-cli/pom.xml
index fa21dfe14ba..2ac5eb3d36b 100644
--- a/webapp/sources/rudder/rudder-templates-cli/pom.xml
+++ b/webapp/sources/rudder/rudder-templates-cli/pom.xml
@@ -37,7 +37,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation.rudder</groupId>
     <artifactId>rudder-parent</artifactId>
-    <version>8.2.4-SNAPSHOT</version>
+    <version>8.3.0~alpha1-SNAPSHOT</version>
   </parent>
 
   <description>
diff --git a/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/cf-served.st b/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/cf-served.st
index 093595add43..cadafd47cfd 100644
--- a/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/cf-served.st
+++ b/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/cf-served.st
@@ -1,23 +1,9 @@
 bundle server access_rules
 {
-&if(NOVA)&
-  vars:
-    enterprise::
-      "query_types" slist => {"delta", "rebase", "full"};
-&endif&
-
-
   # Access rules are only defined on a policy server. Standard nodes should not share any files.
   access:
 
     policy_server|role_rudder_relay_promises_only::
-      &if(NOVA)&
-      "&UUID&"
-        handle        => "policy_server_uuid",
-        resource_type => "literal",
-        admit         => {".*"};
-      &endif&
-
       "${def.dir_masterfiles}"
         handle  => "grant_access_policy",
         comment => "Grant access to the policy updates",
@@ -49,17 +35,6 @@ bundle server access_rules
 
       &endif&
 
-    &if(NOVA)&
-    role_rudder_cfengine_mission_portal::
-      "${query_types}"
-        handle             => "server_access_grant_${query_types}_for_hub",
-        comment            => "Grant ${query_types} reporting query for the hub on the policy server",
-        resource_type      => "query",
-        report_data_select => rudder_data_select_policy_hub,
-        admit              => { ${def.policy_server}, @{sys.ip_addresses} }; # an enterprise policy server needs to be able to contact itself
-    &endif&
-
-
     any::
     &MANAGED_NODES_NAME, MANAGED_NODES_ID : {host, uuid |
       "/var/rudder/share/&uuid&/"
@@ -74,15 +49,6 @@ bundle server access_rules
       "${sys.workdir}/bin/cf-agent"
         admit   => { host2ip("${server_info.cfserved}"), string_downcase(escape("${server_info.cfserved}")) };
 
-  &if(NOVA)&
-      "${query_types}"
-        handle => "server_access_grant_${query_types}_for_hosts",
-        comment => "Grant ${query_types} reporting query for the hub on the hosts",
-        resource_type => "query",
-        report_data_select => rudder_data_select_host,
-        admit => { ${def.policy_server}, @{sys.ip_addresses} };
-  &endif&
-
   roles:
       # Allow user root to set any class
       ".*"  authorize => { "root" };
@@ -179,21 +145,12 @@ body server control
 &if(MANAGED_NODES_NAME)&
 body runagent control
 {
-  &if(NOVA)&
-  # If using enterprise, the nodes to connect to are using default port
-        hosts => {
-          &MANAGED_NODES_NAME: {
-          "&it&",}&
-        };
-  &else&
   # When using community, we must use the port &COMMUNITYPORT& to connect to nodes
         hosts => {
           &MANAGED_NODES_NAME: {
           "&it&:&COMMUNITYPORT&",}&
         };
 
-  &endif&
-
         max_children => "25";
 
     community_edition.!debug_port::
@@ -202,29 +159,3 @@ body runagent control
         port => "5310";
 }
 &endif&
-
-&if(NOVA)&
-body report_data_select rudder_data_select_host
-# @brief Data to collect from remote hosts by default
-#
-# By convention variables and classes known to be internal, (having no
-# reporting value) should be prefixed with an underscore. By default the policy
-# framework explicitly excludes these variables and classes from collection.
-{
-    metatags_include => { "inventory", "report" };
-    metatags_exclude => { "noreport" };
-    monitoring_include => { ".*" };
-}
-
-body report_data_select rudder_data_select_policy_hub
-# @brief Data to collect from policy servers by default
-#
-# By convention variables and classes known to be internal, (having no
-# reporting value) should be prefixed with an underscore. By default the policy
-# framework explicitly excludes these variables and classes from collection.
-{
-    metatags_include => { "inventory", "report" };
-    metatags_exclude => { "noreport" };
-    monitoring_include => { ".*" };
-}
-&endif&
diff --git a/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/expected/cf-served b/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/expected/cf-served
index bbf234a09b2..2d38eab1220 100644
--- a/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/expected/cf-served
+++ b/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/expected/cf-served
@@ -1,18 +1,9 @@
 bundle server access_rules
 {
-  vars:
-    enterprise::
-      "query_types" slist => {"delta", "rebase", "full"};
-
   # Access rules are only defined on a policy server. Standard nodes should not share any files.
   access:
 
     policy_server|role_rudder_relay_promises_only::
-      "695031f3-4123-4c2a-bded-0c6b56d7cf0f"
-        handle        => "policy_server_uuid",
-        resource_type => "literal",
-        admit         => {".*"};
-
       "${def.dir_masterfiles}"
         handle  => "grant_access_policy",
         comment => "Grant access to the policy updates",
@@ -36,15 +27,6 @@ bundle server access_rules
         deny    => {  ".*"  };
 
 
-    role_rudder_cfengine_mission_portal::
-      "${query_types}"
-        handle             => "server_access_grant_${query_types}_for_hub",
-        comment            => "Grant ${query_types} reporting query for the hub on the policy server",
-        resource_type      => "query",
-        report_data_select => rudder_data_select_policy_hub,
-        admit              => { ${def.policy_server}, @{sys.ip_addresses} }; # an enterprise policy server needs to be able to contact itself
-
-
     any::
           "/var/rudder/share/aaaaaaaa-3ad9-4347-866c-56a692ca8d39/"
             maproot => { host2ip("node1"), string_downcase(escape("node1"))  },
@@ -64,13 +46,6 @@ bundle server access_rules
       "${sys.workdir}/bin/cf-agent"
         admit   => { host2ip("${server_info.cfserved}"), string_downcase(escape("${server_info.cfserved}")) };
 
-      "${query_types}"
-        handle => "server_access_grant_${query_types}_for_hosts",
-        comment => "Grant ${query_types} reporting query for the hub on the hosts",
-        resource_type => "query",
-        report_data_select => rudder_data_select_host,
-        admit => { ${def.policy_server}, @{sys.ip_addresses} };
-
   roles:
       # Allow user root to set any class
       ".*"  authorize => { "root" };
@@ -163,12 +138,12 @@ body server control
 
 body runagent control
 {
-  # If using enterprise, the nodes to connect to are using default port
+  # When using community, we must use the port 424242 to connect to nodes
         hosts => {
 
-                    "node1",
-                    "node2",
-                    "node3",
+                    "node1:424242",
+                    "node2:424242",
+                    "node3:424242",
         };
 
         max_children => "25";
@@ -178,26 +153,3 @@ body runagent control
     community_edition.debug_port::
         port => "5310";
 }
-body report_data_select rudder_data_select_host
-# @brief Data to collect from remote hosts by default
-#
-# By convention variables and classes known to be internal, (having no
-# reporting value) should be prefixed with an underscore. By default the policy
-# framework explicitly excludes these variables and classes from collection.
-{
-    metatags_include => { "inventory", "report" };
-    metatags_exclude => { "noreport" };
-    monitoring_include => { ".*" };
-}
-
-body report_data_select rudder_data_select_policy_hub
-# @brief Data to collect from policy servers by default
-#
-# By convention variables and classes known to be internal, (having no
-# reporting value) should be prefixed with an underscore. By default the policy
-# framework explicitly excludes these variables and classes from collection.
-{
-    metatags_include => { "inventory", "report" };
-    metatags_exclude => { "noreport" };
-    monitoring_include => { ".*" };
-}
diff --git a/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/variables.json b/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/variables.json
index 45e47152eb5..50f80fc679d 100644
--- a/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/variables.json
+++ b/webapp/sources/rudder/rudder-templates-cli/src/test/resources/templates1/variables.json
@@ -1,9 +1,7 @@
 {
     "SYSLOGPORT": "514"
   , "RUDDER_REPORT_MODE": "changes-only"
-  , "NOVA": true
   , "UUID": "695031f3-4123-4c2a-bded-0c6b56d7cf0f"
-  , "NOVA": "true"
   , "MANAGED_NODES_NAME": [ "node1", "node2", "node3" ]
   , "MANAGED_NODES_ID": [
       "aaaaaaaa-3ad9-4347-866c-56a692ca8d39"
diff --git a/webapp/sources/rudder/rudder-templates/pom.xml b/webapp/sources/rudder/rudder-templates/pom.xml
index 73a73e648bf..a9612243ce6 100644
--- a/webapp/sources/rudder/rudder-templates/pom.xml
+++ b/webapp/sources/rudder/rudder-templates/pom.xml
@@ -37,7 +37,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation.rudder</groupId>
     <artifactId>rudder-parent</artifactId>
-    <version>8.2.4-SNAPSHOT</version>
+    <version>8.3.0~alpha1-SNAPSHOT</version>
   </parent>
 
   <description>
diff --git a/webapp/sources/rudder/rudder-web/pom.xml b/webapp/sources/rudder/rudder-web/pom.xml
index f13211c79c2..2c9fe918bfe 100644
--- a/webapp/sources/rudder/rudder-web/pom.xml
+++ b/webapp/sources/rudder/rudder-web/pom.xml
@@ -37,7 +37,7 @@ along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
   <parent>
     <groupId>com.normation.rudder</groupId>
     <artifactId>rudder-parent</artifactId>
-    <version>8.2.4-SNAPSHOT</version>
+    <version>8.3.0~alpha1-SNAPSHOT</version>
   </parent>
 
   <description>
diff --git a/webapp/sources/rudder/rudder-web/src/main/.gitignore b/webapp/sources/rudder/rudder-web/src/main/.gitignore
index 482ec785396..e554f5b7af5 100644
--- a/webapp/sources/rudder/rudder-web/src/main/.gitignore
+++ b/webapp/sources/rudder/rudder-web/src/main/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 webapp/javascript
-webapp/style
\ No newline at end of file
+webapp/style
+webapp/images/**/*svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm
index 8b316adb3fb..4a4275c30ce 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm
@@ -179,7 +179,7 @@ displayModal model =
                               ]
                           , div [ class "form-group" ]
                               [ label [ for "newAccount-description" ] [ text "Description" ]
-                              , textarea [ id "newAccount-description", class "form-control vresize float-inherit", value account.description, onInput (\s -> UpdateAccountForm { account | description = s }) ] []
+                              , textarea [ id "newAccount-description", class "form-control vresize float-none", value account.description, onInput (\s -> UpdateAccountForm { account | description = s }) ] []
                               ]
                           , div [ class "form-group" ]
                               [ label [ for "newAccount-expiration", class "mb-1" ]
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Agentschedule.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Agentschedule.elm
index de3f790c2ec..f2370d2b5ea 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Agentschedule.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Agentschedule.elm
@@ -58,4 +58,4 @@ update msg model =
           , splayMinute = checkValue schedule.splayMinute (minutes schedule)
           }
       in
-        ({model | selectedSettings = Just newSchedule}, Cmd.none)
\ No newline at end of file
+        ({model | selectedSettings = Just newSchedule}, Cmd.none)
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewBlock.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewBlock.elm
index b3b09aa9f77..44f1d3e61ce 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewBlock.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewBlock.elm
@@ -394,7 +394,7 @@ blockBody model parentId block ui techniqueUi =
                   |> appendChild removeIcon
     condition = element "div"
                 |> addClass "method-condition flex-form"
-                |> addClassConditional "visually-hidden" (block.condition.os == Nothing && block.condition.advanced == "")
+                |> addClassConditional "d-none" (block.condition.os == Nothing && block.condition.advanced == "")
                 |> appendChildList
                    [ element "label"
                      |> appendText "Condition:"
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethod.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethod.elm
index 7a519417e23..26db414a5ef 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethod.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewMethod.elm
@@ -487,7 +487,7 @@ callBody model ui techniqueUi call pid =
 --}
     condition = element "div"
                 |> addClass "method-condition flex-form"
-                |> addClassConditional "visually-hidden" (call.condition.os == Nothing && call.condition.advanced == "")
+                |> addClassConditional "d-none" (call.condition.os == Nothing && call.condition.advanced == "")
                 |> appendChildList
                    [ element "label"
                      |> appendText "Condition:"
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechnique.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechnique.elm
index 5ea90e8c051..479fc8a36d9 100755
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechnique.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Editor/ViewTechnique.elm
@@ -449,7 +449,7 @@ view model =
 
                 TechniqueDetails technique state uiInfo editInfo ->
                   showTechnique model technique state uiInfo editInfo
-    classes = "rudder-template " ++ if model.genericMethodsOpen then "show-methods" else "show-techniques"
+    classes = "rudder-template " ++ if model.genericMethodsOpen then "show-right" else "show-left"
 
 
   in
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Filters/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Filters/View.elm
index 012b3b16912..0693e2506af 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Filters/View.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Filters/View.elm
@@ -31,7 +31,7 @@ view model =
         ]
       , button [ class "btn btn-default more-filters", onClick ShowMore][]
       ]
-    , div [ class ("filters-container" ++ if model.showMore then "" else " visually-hidden")]
+    , div [ class ("filters-container" ++ if model.showMore then "" else " d-none")]
       [ div [class "filterTag"]
         [ div [ id "form-tag" ]
           [ displayTagForm model.newTag model.tags model.completionKeys model.completionValues Filters.DataTypes.UpdateTag Filters.DataTypes.UpdateTags addBtnDisabled
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/View.elm
index 38f2af38778..391b179c1a7 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/View.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Groups/View.elm
@@ -49,7 +49,7 @@ view model =
               ]
             ))
             [ text item.name
-            , small [class "greyscala"] [text (" - " ++ if item.dynamic then "Dynamic" else "Static")]
+            , small [class "text-secondary"] [text (" - " ++ if item.dynamic then "Dynamic" else "Static")]
             , badgeDisabled
             ]
           ]
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewTabContent.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewTabContent.elm
index 58646abbce8..13c161fda7f 100644
--- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewTabContent.elm
+++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Rules/ViewTabContent.elm
@@ -871,7 +871,7 @@ groupsTab model details =
             [ i [class "jstree-icon jstree-ocl"][]
             , a [class ("jstree-anchor" ++ includeClass), onClick (SelectGroup item.target True)]
               [ i [class "jstree-icon jstree-themeicon fa fa-sitemap jstree-themeicon-custom"][]
-              , span [class "item-name"][text item.name, (if item.dynamic then (small [class "greyscala"][text "- Dynamic"]) else (text ""))]
+              , span [class "item-name"][text item.name, (if item.dynamic then (small [class "text-secondary"][text "- Dynamic"]) else (text ""))]
               , disabledLabel
               , div [class "treeActions-container"]
                 [ span [class "treeActions"][ span [class "fa action-icon accept"][]]
diff --git a/webapp/sources/rudder/rudder-web/src/main/favicon.sh b/webapp/sources/rudder/rudder-web/src/main/favicon.sh
new file mode 100755
index 00000000000..61326863fcc
--- /dev/null
+++ b/webapp/sources/rudder/rudder-web/src/main/favicon.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Build the .ico favicon from the svg source file
+# This script need to be run when modifying the Rudder logo
+
+# SVG favicons would be a good choice if browers had a sane behavior...
+# See https://dev.to/masakudamatsu/favicon-nightmare-how-to-maintain-sanity-3al7
+
+# This script requires:
+#
+# * inkscape (best for SVG -> PNG)
+# * zopfli (best png opimizer: https://iter.ca/post/zopfli/)
+# * icoutils/icotool (for .ico favicon)
+
+set -e
+
+source="svg/logo/rudder-logo-notext.svg"
+target="webapp/images/rudder-favicon.ico"
+tmp=$(mktemp -d)
+
+ico_sizes=(16 32 48)
+
+echo "${source} (favicon)"
+
+# ICO for compatibility
+for size in "${ico_sizes[@]}"
+do
+    out="${tmp}/favicon-${size}.png"
+    echo "    generating (inkscape, ${size}px)"
+    inkscape --export-filename="${out}" -w "${size}" -h "${size}" "${source}"
+    echo "    optimizing (zopflipng)"
+    zopflipng -m -y "${out}" "${out}" >/dev/null
+done
+
+ico_s=$(IFS=, ; echo "${ico_sizes[*]}")
+echo "    generating (icotool ${ico_s}) -> ${target}"
+icotool --create --output "${target}" "${tmp}"/*.png
+rm -rf "${tmp}"
+
diff --git a/webapp/sources/rudder/rudder-web/src/main/gulpfile.mjs b/webapp/sources/rudder/rudder-web/src/main/gulpfile.mjs
index 3e113007db0..53476941f33 100644
--- a/webapp/sources/rudder/rudder-web/src/main/gulpfile.mjs
+++ b/webapp/sources/rudder/rudder-web/src/main/gulpfile.mjs
@@ -14,8 +14,13 @@ import * as dartSass from 'sass';
 import gulpSass from 'gulp-sass';
 const sass = gulpSass(dartSass);
 import sourcemaps from 'gulp-sourcemaps';
+import svgmin from 'gulp-svgmin';
 
 const paths = {
+    'svg': {
+        'src': 'svg/**/*.svg',
+        'dest': 'webapp/images',  
+    },
     'css': {
         'src': 'style/libs/**/*',
         'dest': 'webapp/style',
@@ -154,6 +159,12 @@ function css(cb) {
     cb();
 };
 
+function svg(cb) {
+    src(paths.svg.src)
+        .pipe(svgmin())
+        .pipe(dest(paths.svg.dest));
+    cb();
+}
 
 function vendor_css(cb) {
     src(paths.vendor_css.src)
@@ -183,6 +194,7 @@ function scss(cb) {
 task('elm', series(clean, elm));
 
 task('watch', series(clean, function() {
+    watch(paths.svg.watch, { ignoreInitial: false }, svg);
     watch(paths.elm.watch, { ignoreInitial: false }, elm);
     watch(paths.js.src, { ignoreInitial: false }, js);
     watch(paths.css.src, { ignoreInitial: false }, css);
@@ -191,4 +203,4 @@ task('watch', series(clean, function() {
     watch(paths.vendor_css.src, { ignoreInitial: false }, vendor_css);
 }));
 
-task('default', series(clean, parallel(elm, css, scss, js, vendor_css, vendor_js)));
\ No newline at end of file
+task('default', series(clean, parallel(svg, elm, css, scss, js, vendor_css, vendor_js)));
diff --git a/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder-datatable.js b/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder-datatable.js
index 0882b0dc238..f9dbbd632dc 100644
--- a/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder-datatable.js
+++ b/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder-datatable.js
@@ -276,7 +276,7 @@ function recentChangesText(id) {
 
 
   // Elem Content
-  graphElem.text(count).addClass("center")
+  graphElem.text(count).addClass("text-center")
   initBsTooltips();
 }
 
@@ -593,7 +593,7 @@ function createRuleComplianceTable(gridId, data, contextPath, refresh) {
         editLink.attr("href",contextPath + '/secure/configurationManager/ruleManagement/rule/'+oData.id);
         editLink.click(function(e) {e.stopPropagation();});
         editLink.append(editIcon);
-        editLink.addClass("reportIcon");
+        editLink.addClass("ps-1");
         $(nTd).append(editLink);
         $(nTd).prepend(createBadgeAgentPolicyMode('rule', oData.policyMode, oData.explanation));
       }
@@ -707,7 +707,7 @@ function createExpectedReportTable(gridId, data, contextPath, refresh) {
             editIcon.addClass("fa fa-pencil");
             editLink.click(function(e) {e.stopPropagation();});
             editLink.append(editIcon);
-            editLink.addClass("reportIcon");
+            editLink.addClass("ps-1");
             var policyMode = oData.policyMode ? oData.policyMode : "";
             $(nTd).prepend(createBadgeAgentPolicyMode('directive', policyMode, oData.explanation));
             $(nTd).append(editLink);
@@ -740,7 +740,7 @@ function createExpectedReportTable(gridId, data, contextPath, refresh) {
         editIcon.addClass("fa fa-pencil");
         editLink.click(function(e) {e.stopPropagation();});
         editLink.append(editIcon);
-        editLink.addClass("reportIcon");
+        editLink.addClass("ps-1");
         $(nTd).append(editLink);
         $(nTd).prepend(createBadgeAgentPolicyMode('rule', oData.policyMode, oData.explanation));
       }
@@ -805,7 +805,7 @@ function createDirectiveTable(isTopLevel, isNodeView, contextPath) {
           editIcon.addClass("fa fa-pencil");
           editLink.click(function(e) {e.stopPropagation();});
           editLink.append(editIcon);
-          editLink.addClass("reportIcon");
+          editLink.addClass("ps-1");
           $(nTd).append(editLink);
           var policyMode = oData.policyMode ? oData.policyMode : policyMode ;
           $(nTd).prepend(createBadgeAgentPolicyMode('directive', policyMode, oData.explanation));
@@ -877,7 +877,7 @@ function createNodeComplianceTable(gridId, data, contextPath, refresh) {
         editIcon.addClass("fa fa-search node-details");
         editLink.click(function(e) {e.stopPropagation();});
         editLink.append(editIcon);
-        editLink.addClass("reportIcon");
+        editLink.addClass("ps-1");
         $(nTd).append(editLink);
         $(nTd).prepend(createBadgeAgentPolicyMode('node', oData.policyMode, oData.explanation));
       }
diff --git a/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder.js b/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder.js
index 24620bd6d56..90bc13866b4 100644
--- a/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder.js
+++ b/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/rudder.js
@@ -633,7 +633,7 @@ function callRemoteRun(nodeId, refreshCompliance) {
     url: contextPath + "/secure/api/nodes/" + nodeId + "/applyPolicy" ,
     contentType: "application/json; charset=utf-8",
     success: function (response, status, jqXHR) {
-        $("#visibilityOutput").addClass("btn-default").html("Show output").append('&nbsp;<i class="fa fa-check fa-lg fa-check-custom"></i>');
+        $("#visibilityOutput").addClass("btn-default").html("Show output").append('&nbsp;<i class="fa fa-check fa-check-custom"></i>');
         $("#report").html('<pre>' + escapeHTML(response) + '</pre>');
         $("#report").addClass("border-success");
         $("#visibilityOutput").show();
@@ -659,7 +659,7 @@ function callRemoteRun(nodeId, refreshCompliance) {
         $iconButton.addClass("fa fa-play");
         $( "#triggerBtn" ).prop('disabled', null).blur();
         $textAction.html("Trigger agent");
-        $("#visibilityOutput").addClass("btn-default").html("Show error").append('&nbsp;<i class="fa fa-times fa-lg fa-times-custom"></i>');
+        $("#visibilityOutput").addClass("btn-default").html("Show error").append('&nbsp;<i class="fa fa-times fa-times-custom"></i>');
         $("#report").remove("pre").html('<div class="alert alert-danger error-trigger" role="alert">' + '<b>' +jqXHR.status + ' - ' + errorThrown +'</b>' +'<br>' + jqXHR.responseText  + '</div>');
         $("#report").addClass("border-fail");
         $("#visibilityOutput").show();
@@ -782,14 +782,14 @@ function setupMarkdown(initialValue, id) {
 }
 
 function togglePreview(target, id) {
-  $("#"+ id + "MarkdownPreviewContainer").toggleClass("visually-hidden");
+  $("#"+ id + "MarkdownPreviewContainer").toggleClass("d-none");
   $(target).toggleClass('fa-eye-slash fa-eye');
   $('#'+ id).toggleClass('col-xs-6 col-xs-12');
 }
 
 function toggleMarkdownEditor(id) {
-  $("#"+ id + "Container").toggleClass("visually-hidden");
-  $("#"+ id + "MarkdownContainer").toggleClass("visually-hidden");
+  $("#"+ id + "Container").toggleClass("d-none");
+  $("#"+ id + "MarkdownContainer").toggleClass("d-none");
 }
 
 function toggleOpacity(target) {
diff --git a/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/tree.js b/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/tree.js
index 2ed6ba26482..4b972bac161 100644
--- a/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/tree.js
+++ b/webapp/sources/rudder/rudder-web/src/main/javascript/rudder/tree.js
@@ -228,7 +228,7 @@ var buildRuleCategoryTree = function(id, initially_select , appContext) {
       },
       "plugins" : [  "types", "dnd" ]
   })
-  $(id).removeClass('nodisplay');
+  $(id).removeClass('d-none');
 }
 
 /*
@@ -266,7 +266,7 @@ var buildRuleCategoryTreeNoDnD = function(id, initially_select , appContext) {
       },
       "plugins" : [ "types" ]
   })
-  $(id).removeClass('nodisplay');
+  $(id).removeClass('d-none');
 }
 
 /*
diff --git a/webapp/sources/rudder/rudder-web/src/main/package-lock.json b/webapp/sources/rudder/rudder-web/src/main/package-lock.json
index e9d1f302d58..c815663dc8d 100644
--- a/webapp/sources/rudder/rudder-web/src/main/package-lock.json
+++ b/webapp/sources/rudder/rudder-web/src/main/package-lock.json
@@ -4,6 +4,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "main",
       "dependencies": {
         "bootstrap": "^5.3.2",
         "chart.js": "^3.7.1",
@@ -14,6 +15,7 @@
         "diff": "^5.1.0",
         "elm-review": "^2.11.1",
         "gaugeJS": "^1.3.7",
+        "gulp-svgmin": "^4.1.0",
         "jquery": "^3.7.0",
         "jquery-ui": "^1.13.2",
         "jquery-ui-timepicker-addon": "^1.6.3",
@@ -369,6 +371,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/@trysound/sax": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/@types/cacheable-request": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
@@ -470,7 +481,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
       "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-      "dev": true,
       "dependencies": {
         "ansi-wrap": "^0.1.0"
       },
@@ -530,7 +540,6 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
       "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -551,7 +560,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
       "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -560,7 +568,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -587,7 +594,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -744,6 +750,12 @@
         "node": ">= 6"
       }
     },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "license": "ISC"
+    },
     "node_modules/bootstrap": {
       "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
@@ -772,11 +784,12 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -1062,11 +1075,64 @@
         "urix": "^0.1.0"
       }
     },
+    "node_modules/css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "license": "MIT",
+      "dependencies": {
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
     "node_modules/cssfilter": {
       "version": "0.0.10",
       "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz",
       "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw=="
     },
+    "node_modules/csso": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "license": "MIT",
+      "dependencies": {
+        "css-tree": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/d": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.2.tgz",
@@ -1267,6 +1333,61 @@
         "node": ">=8"
       }
     },
+    "node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
     "node_modules/each-props": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/each-props/-/each-props-3.0.0.tgz",
@@ -1510,6 +1631,15 @@
         "once": "^1.4.0"
       }
     },
+    "node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "license": "BSD-2-Clause",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "node_modules/es5-ext": {
       "version": "0.10.64",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz",
@@ -1639,7 +1769,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
-      "dev": true,
       "dependencies": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
@@ -1718,9 +1847,10 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -1904,6 +2034,20 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -2354,6 +2498,17 @@
         "xtend": "~4.0.1"
       }
     },
+    "node_modules/gulp-svgmin": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-svgmin/-/gulp-svgmin-4.1.0.tgz",
+      "integrity": "sha512-WKpif+yu3+oIlp1e11CQi5F64YddP699l2mFmxpz8swv8/P8dhxVcMKdCPFWouArlVyn7Ma1eWCJHw5gx4NMtw==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash.clonedeep": "^4.5.0",
+        "plugin-error": "^1.0.1",
+        "svgo": "^2.7.0"
+      }
+    },
     "node_modules/gulp-terser": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.1.0.tgz",
@@ -2580,7 +2735,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
       "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-      "dev": true,
       "dependencies": {
         "is-plain-object": "^2.0.4"
       },
@@ -2592,7 +2746,6 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
       "dependencies": {
         "isobject": "^3.0.1"
       },
@@ -2648,6 +2801,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -2759,7 +2913,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2925,8 +3078,7 @@
     "node_modules/lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
-      "dev": true
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
     },
     "node_modules/lodash.get": {
       "version": "4.4.2",
@@ -2989,6 +3141,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/mdn-data": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "license": "CC0-1.0"
+    },
     "node_modules/memoizee": {
       "version": "0.4.15",
       "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
@@ -3141,6 +3299,18 @@
         "node": ">= 10.13.0"
       }
     },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -3379,8 +3549,7 @@
     "node_modules/picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -3397,7 +3566,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
       "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
-      "dev": true,
       "dependencies": {
         "ansi-colors": "^1.0.1",
         "arr-diff": "^4.0.0",
@@ -3896,7 +4064,6 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3962,6 +4129,13 @@
         "node": "*"
       }
     },
+    "node_modules/stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
+      "license": "MIT"
+    },
     "node_modules/stream-composer": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz",
@@ -4111,6 +4285,36 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/svgo": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
+      "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+      "license": "MIT",
+      "dependencies": {
+        "@trysound/sax": "0.2.0",
+        "commander": "^7.2.0",
+        "css-select": "^4.1.3",
+        "css-tree": "^1.1.3",
+        "csso": "^4.2.0",
+        "picocolors": "^1.0.0",
+        "stable": "^0.1.8"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/svgo/node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/table": {
       "version": "6.8.1",
       "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
@@ -4293,6 +4497,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
diff --git a/webapp/sources/rudder/rudder-web/src/main/package.json b/webapp/sources/rudder/rudder-web/src/main/package.json
index f85e31969a8..67594806219 100644
--- a/webapp/sources/rudder/rudder-web/src/main/package.json
+++ b/webapp/sources/rudder/rudder-web/src/main/package.json
@@ -9,6 +9,7 @@
     "diff": "^5.1.0",
     "elm-review": "^2.11.1",
     "gaugeJS": "^1.3.7",
+    "gulp-svgmin": "^4.1.0",
     "jquery": "^3.7.0",
     "jquery-ui": "^1.13.2",
     "jquery-ui-timepicker-addon": "^1.6.3",
diff --git a/webapp/sources/rudder/rudder-web/src/main/resources/configuration.properties.sample b/webapp/sources/rudder/rudder-web/src/main/resources/configuration.properties.sample
index a5bd6c7eacb..8f08e9b9652 100644
--- a/webapp/sources/rudder/rudder-web/src/main/resources/configuration.properties.sample
+++ b/webapp/sources/rudder/rudder-web/src/main/resources/configuration.properties.sample
@@ -243,7 +243,16 @@ inventories.watcher.period.garbage.old=5 minutes
 # trying to add them. This can be important if Rudder was down for
 # a long time and inventories accumulated, no need to keep the older.
 #
-inventories.watcher.max.age.before.deletion=3 days
+inventories.watcher.max.age.before.deletion=2 days
+
+#
+# To prevent data corruption from server sending inventories with unexpected date,
+# either in the past (for example because an old inventory was blocked in some pipe
+# somewhere), or in the future (for example because server's clock is incorrectly set),
+# Rudder refuse inventories out of following range:
+#
+inventories.reject.maxAgeBeforeNow=2 days
+inventories.reject.maxAgeAfterNow=12 hours
 
 #
 # You may want to limit the number of inventory files parsed and save in parallel.
@@ -262,6 +271,7 @@ inventory.parse.parallelization=2
 # In that case, node's processes will appear to be empty in node details.
 # Boolean, default to "false" (ie: processes are parsed and displayed)
 inventory.parse.ignore.processes=false
+
 #
 # In some case, <PROCESSES> cause performance problems in rudder web-app
 # and they are used so you can't ignore them. In that case, Rudder may need to
@@ -269,15 +279,6 @@ inventory.parse.ignore.processes=false
 # above which one dedicated request will be done just for processes.
 inventory.threshold.processes.isolatedWrite=1000
 
-#
-# You can keep exhaustive information about LDAP base modification
-# happening in relation to inventory processing. It is mostly used
-# for debug.
-# You can enable that log by setting the following logger in
-# /opt/rudder/etc/logback.xml file to "trace" level (default "off"):
-# <logger name="trace.ldif.in.file" level="trace" />
-#
-ldif.tracelog.rootdir=/var/rudder/inventories/debug
 
 #
 # Automatic inventories cleaning
diff --git a/webapp/sources/rudder/rudder-web/src/main/resources/load-page/rudder-loading.html b/webapp/sources/rudder/rudder-web/src/main/resources/load-page/rudder-loading.html
index 893e75caf35..fe47b37b87c 100644
--- a/webapp/sources/rudder/rudder-web/src/main/resources/load-page/rudder-loading.html
+++ b/webapp/sources/rudder/rudder-web/src/main/resources/load-page/rudder-loading.html
@@ -5,6 +5,7 @@
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
   <title>Rudder - Loading</title>
   <link type="image/x-icon" rel="icon" data-lift="with-cached-resource" href="../../webapp/images/rudder-favicon.ico">
+
   <style type="text/css">
     html, body {
        margin:0;
diff --git a/webapp/sources/rudder/rudder-web/src/main/resources/load-page/rudder-not-loaded.html b/webapp/sources/rudder/rudder-web/src/main/resources/load-page/rudder-not-loaded.html
index 11a59490fc3..a31cc1217a1 100644
--- a/webapp/sources/rudder/rudder-web/src/main/resources/load-page/rudder-not-loaded.html
+++ b/webapp/sources/rudder/rudder-web/src/main/resources/load-page/rudder-not-loaded.html
@@ -4,7 +4,8 @@
 <head>
   <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
   <title>Rudder - 404</title>
-  <link type="image/x-icon" rel="shortcut icon" data-lift="with-cached-resource" href="../../webapp/images/rudder-favicon.ico">
+  <link type="image/x-icon" rel="icon" data-lift="with-cached-resource" href="../../webapp/images/rudder-favicon.ico">
+
   <style type="text/css">
     html, body {
        margin:0;
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala
index c58cbfb4ccf..fae24dfde8a 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -521,14 +521,13 @@ class Boot extends Loggable {
     LiftRules.statelessDispatch.append(RudderConfig.restQuicksearch)
     LiftRules.statelessDispatch.append(RudderConfig.restCompletion)
     LiftRules.statelessDispatch.append(RudderConfig.sharedFileApi)
-    LiftRules.statelessDispatch.append(RudderConfig.eventLogApi)
     // REST API (all public/internal API)
     // we need to add "info" API here to have all used API (even plugins)
     val infoApi = {
       // all used api - add info as it is not yet declared
       val schemas   = RudderConfig.rudderApi.apis().map(_.schema) ++ InfoApiDef.endpoints
       val endpoints = schemas.flatMap(RudderConfig.apiDispatcher.withVersion(_, RudderConfig.ApiVersions))
-      new InfoApi(RudderConfig.restExtractorService, RudderConfig.ApiVersions, endpoints)
+      new InfoApi(RudderConfig.ApiVersions, endpoints)
     }
     RudderConfig.rudderApi.addModules(infoApi.getLiftEndpoints())
     LiftRules.statelessDispatch.append(RudderConfig.rudderApi.getLiftRestApi())
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala
index f17b7df4724..9fd76cff043 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala
@@ -61,6 +61,8 @@ import com.normation.rudder.api.*
 import com.normation.rudder.apidata.*
 import com.normation.rudder.batch.*
 import com.normation.rudder.campaigns.*
+import com.normation.rudder.config.StatelessUserPropertyService
+import com.normation.rudder.config.UserPropertyService
 import com.normation.rudder.configuration.*
 import com.normation.rudder.db.Doobie
 import com.normation.rudder.domain.*
@@ -130,6 +132,7 @@ import java.nio.file.attribute.PosixFilePermission
 import java.security.Security
 import java.util.concurrent.TimeUnit
 import net.liftweb.common.*
+import net.liftweb.http.S
 import org.apache.commons.io.FileUtils
 import org.bouncycastle.jce.provider.BouncyCastleProvider
 import org.joda.time.DateTimeZone
@@ -856,24 +859,53 @@ object RudderParsedProperties {
     )
   }
 
-  val LDIF_TRACELOG_ROOT_DIR: String = {
+  // don't parse some elements in inventories: processes
+  val INVENTORIES_IGNORE_PROCESSES: Boolean = {
     try {
-      config.getString("ldif.tracelog.rootdir")
+      config.getBoolean("inventory.parse.ignore.processes")
     } catch {
-      case ex: ConfigException => "/var/rudder/inventories/debug"
+      case ex: ConfigException => false
     }
   }
 
-  // don't parse some elements in inventories: processes
-  val INVENTORIES_IGNORE_PROCESSES:                   Boolean = {
+  val INVENTORIES_MAX_BEFORE_NOW: Duration = {
     try {
-      config.getBoolean("inventory.parse.ignore.processes")
+      Duration.fromScala(
+        scala.concurrent.duration.Duration.apply(
+          config.getString(
+            "inventories.reject.maxAgeBeforeNow"
+          )
+        )
+      )
     } catch {
-      case ex: ConfigException => false
+      case ex: Exception =>
+        ApplicationLogger.info(
+          s"Error when reading key: 'inventories.reject.maxAgeBeforeNow', defaulting to 2 days: ${ex.getMessage}"
+        )
+        2.days
     }
   }
+
+  val INVENTORIES_MAX_AFTER_NOW: Duration = {
+    try {
+      Duration.fromScala(
+        scala.concurrent.duration.Duration.apply(
+          config.getString(
+            "inventories.reject.maxAgeAfterNow"
+          )
+        )
+      )
+    } catch {
+      case ex: Exception =>
+        ApplicationLogger.info(
+          s"Error when reading key: 'inventories.reject.maxAgeAfterNow', defaulting to 12h: ${ex.getMessage}"
+        )
+        12.hours
+    }
+  }
+
   // the limit above which processes need an individual LDAP write request
-  val INVENTORIES_THRESHOLD_PROCESSES_ISOLATED_WRITE: Int     = {
+  val INVENTORIES_THRESHOLD_PROCESSES_ISOLATED_WRITE: Int = {
     try {
       config.getInt("inventory.threshold.processes.isolatedWrite")
     } catch {
@@ -1223,7 +1255,6 @@ object RudderConfig extends Loggable {
   val nodeDit:                             NodeDit                                    = rci.nodeDit
   val nodeFactRepository:                  NodeFactRepository                         = rci.nodeFactRepository
   val nodeGrid:                            NodeGrid                                   = rci.nodeGrid
-  val nodeInfoService:                     NodeInfoService                            = rci.nodeInfoService
   val pendingNodeCheckGroup:               CheckPendingNodeInDynGroups                = rci.pendingNodeCheckGroup
   val pendingNodesDit:                     InventoryDit                               = rci.pendingNodesDit
   val personIdentService:                  PersonIdentService                         = rci.personIdentService
@@ -1280,7 +1311,6 @@ object RudderConfig extends Loggable {
   val woApiAccountRepository:              WoApiAccountRepository                     = rci.woApiAccountRepository
   val woDirectiveRepository:               WoDirectiveRepository                      = rci.woDirectiveRepository
   val woNodeGroupRepository:               WoNodeGroupRepository                      = rci.woNodeGroupRepository
-  val woNodeRepository:                    WoNodeRepository                           = rci.woNodeRepository
   val woRuleCategoryRepository:            WoRuleCategoryRepository                   = rci.woRuleCategoryRepository
   val woRuleRepository:                    WoRuleRepository                           = rci.woRuleRepository
   val workflowEventLogService:             WorkflowEventLogService                    = rci.workflowEventLogService
@@ -1334,7 +1364,6 @@ case class RudderServiceApi(
     rudderDit:                           RudderDit,
     roRuleRepository:                    RoRuleRepository,
     woRuleRepository:                    WoRuleRepository,
-    woNodeRepository:                    WoNodeRepository,
     roNodeGroupRepository:               RoNodeGroupRepository,
     woNodeGroupRepository:               WoNodeGroupRepository,
     techniqueRepository:                 TechniqueRepository,
@@ -1370,7 +1399,6 @@ case class RudderServiceApi(
     checkTechniqueLibrary:               CheckTechniqueLibrary,
     automaticReportLogger:               AutomaticReportLogger,
     removeNodeService:                   RemoveNodeService,
-    nodeInfoService:                     NodeInfoService,
     reportDisplayer:                     ReportDisplayer,
     dependencyAndDeletionService:        DependencyAndDeletionService,
     itemArchiveManager:                  ItemArchiveManager,
@@ -1663,7 +1691,7 @@ object RudderConfigInit {
 
     lazy val yamlTechniqueSerializer = new YamlTechniqueSerializer(resourceFileService)
 
-    lazy val linkUtil           = new LinkUtil(roRuleRepository, roNodeGroupRepository, roDirectiveRepository, nodeFactInfoService)
+    lazy val linkUtil           = new LinkUtil(roRuleRepository, roNodeGroupRepository, roDirectiveRepository, nodeFactRepository)
     // REST API
     lazy val restApiAccounts    = new RestApiAccounts(
       roApiAccountRepository,
@@ -1692,26 +1720,6 @@ object RudderConfigInit {
     )
     lazy val restCompletion  = new RestCompletion(new RestCompletionService(roDirectiveRepository, roRuleRepository))
 
-    lazy val ruleApiService2 = {
-      new RuleApiService2(
-        roRuleRepository,
-        woRuleRepository,
-        uuidGen,
-        asyncDeploymentAgent,
-        workflowLevelService,
-        restExtractorService,
-        restDataSerializer
-      )
-    }
-
-    lazy val ruleApiService6  = {
-      new RuleApiService6(
-        roRuleCategoryRepository,
-        roRuleRepository,
-        woRuleCategoryRepository,
-        restDataSerializer
-      )
-    }
     lazy val ruleApiService13 = {
       new RuleApiService14(
         roRuleRepository,
@@ -1730,20 +1738,6 @@ object RudderConfigInit {
       )
     }
 
-    lazy val directiveApiService2 = {
-      new DirectiveApiService2(
-        roDirectiveRepository,
-        woDirectiveRepository,
-        uuidGen,
-        asyncDeploymentAgent,
-        workflowLevelService,
-        restExtractorService,
-        directiveEditorService,
-        restDataSerializer,
-        techniqueRepositoryImpl
-      )
-    }
-
     lazy val directiveApiService14 = {
       new DirectiveApiService14(
         roDirectiveRepository,
@@ -1758,13 +1752,6 @@ object RudderConfigInit {
       )
     }
 
-    lazy val techniqueApiService6 = {
-      new TechniqueAPIService6(
-        roDirectiveRepository,
-        restDataSerializer
-      )
-    }
-
     lazy val techniqueApiService14 = {
       new TechniqueAPIService14(
         roDirectiveRepository,
@@ -1776,27 +1763,6 @@ object RudderConfigInit {
       )
     }
 
-    lazy val groupApiService2 = {
-      new GroupApiService2(
-        roNodeGroupRepository,
-        woNodeGroupRepository,
-        uuidGen,
-        asyncDeploymentAgent,
-        workflowLevelService,
-        restExtractorService,
-        queryProcessor,
-        restDataSerializer
-      )
-    }
-
-    lazy val groupApiService6 = {
-      new GroupApiService6(
-        roNodeGroupRepository,
-        woNodeGroupRepository,
-        restDataSerializer
-      )
-    }
-
     lazy val groupApiService14 = {
       new GroupApiService14(
         nodeFactRepository,
@@ -1825,7 +1791,7 @@ object RudderConfigInit {
       acceptedNodesDit,
       newNodeManagerImpl,
       removeNodeServiceImpl,
-      restExtractorService,
+      zioJsonExtractor,
       reportingService,
       queryProcessor,
       inventoryQueryChecker,
@@ -1834,20 +1800,9 @@ object RudderConfigInit {
       scoreService
     )
 
-    lazy val parameterApiService2  = {
-      new ParameterApiService2(
-        roLDAPParameterRepository,
-        woLDAPParameterRepository,
-        uuidGen,
-        workflowLevelService,
-        restExtractorService,
-        restDataSerializer
-      )
-    }
     lazy val parameterApiService14 = {
       new ParameterApiService14(
         roLDAPParameterRepository,
-        woLDAPParameterRepository,
         uuidGen,
         workflowLevelService
       )
@@ -1952,7 +1907,8 @@ object RudderConfigInit {
       new DefaultInventoryParser(
         fusionReportParser,
         Seq(
-          new PreInventoryParserCheckConsistency
+          new PreInventoryParserCheckConsistency,
+          new PreInventoryParserCheckInventoryAge(INVENTORIES_MAX_BEFORE_NOW, INVENTORIES_MAX_AFTER_NOW)
         )
       )
     }
@@ -2171,13 +2127,10 @@ object RudderConfigInit {
      * - 5.2.5: 16
      */
     lazy val ApiVersions: List[ApiVersion] = {
-      ApiVersion(14, deprecated = true) ::  // rudder 7.0
-      ApiVersion(15, deprecated = true) ::  // rudder 7.1 - system update on node details
-      ApiVersion(16, deprecated = true) ::  // rudder 7.2 - create node api, import/export archive, hooks & campaigns internal API
-      ApiVersion(17, deprecated = true) ::  // rudder 7.3 - directive compliance, campaign API is public
-      ApiVersion(18, deprecated = false) :: // rudder 8.0 - allowed network
-      ApiVersion(19, deprecated = false) :: // rudder 8.1 - (score), tenants
+      ApiVersion(18, deprecated = true) ::  // rudder 8.0 - allowed network
+      ApiVersion(19, deprecated = true) ::  // rudder 8.1 - (score), tenants
       ApiVersion(20, deprecated = false) :: // rudder 8.2 - zio-json
+      ApiVersion(21, deprecated = false) :: // rudder 8.3 - zio-json
       Nil
     }
 
@@ -2188,36 +2141,27 @@ object RudderConfigInit {
     lazy val rudderApi           = {
       import com.normation.rudder.rest.lift.*
 
-      val nodeInheritedProperties  = new NodeApiInheritedProperties(propertiesRepository)
-      val groupInheritedProperties = new GroupApiInheritedProperties(propertiesRepository)
+      val nodeInheritedProperties = new NodeApiInheritedProperties(propertiesRepository)
 
       val campaignApi = new lift.CampaignApi(
         campaignRepo,
         campaignSerializer,
         campaignEventRepo,
         mainCampaignService,
-        restExtractorService,
         stringUuidGenerator
       )
       val modules     = List(
         new ComplianceApi(restExtractorService, complianceAPIService, roDirectiveRepository),
         new GroupsApi(
-          roLdapNodeGroupRepository,
           propertiesService,
-          restExtractorService,
           zioJsonExtractor,
           stringUuidGenerator,
-          groupApiService2,
-          groupApiService6,
-          groupApiService14,
-          groupInheritedProperties
+          userPropertyService,
+          groupApiService14
         ),
         new DirectiveApi(
-          roDirectiveRepository,
-          restExtractorService,
           zioJsonExtractor,
           stringUuidGenerator,
-          directiveApiService2,
           directiveApiService14
         ),
         new NodeApi(
@@ -2230,32 +2174,29 @@ object RudderConfigInit {
           uuidGen,
           DeleteMode.Erase // only supported mode for Rudder 8.0
         ),
-        new ParameterApi(restExtractorService, zioJsonExtractor, parameterApiService2, parameterApiService14),
+        new ParameterApi(zioJsonExtractor, parameterApiService14),
         new SettingsApi(
           restExtractorService,
           configService,
           asyncDeploymentAgent,
           stringUuidGenerator,
           policyServerManagementService,
-          nodeFactInfoService
+          nodeFactRepository
         ),
         new TechniqueApi(
           restExtractorService,
-          techniqueApiService6,
           techniqueApiService14,
           ncfTechniqueWriter,
           ncfTechniqueReader,
           techniqueRepository,
           techniqueSerializer,
           stringUuidGenerator,
+          userPropertyService,
           resourceFileService,
           RUDDER_GIT_ROOT_CONFIG_REPO
         ),
         new RuleApi(
-          restExtractorService,
           zioJsonExtractor,
-          ruleApiService2,
-          ruleApiService6,
           ruleApiService13,
           stringUuidGenerator
         ),
@@ -2276,7 +2217,6 @@ object RudderConfigInit {
             passwordEncoderDispatcher,
             UserFileProcessing.getUserResourceFile()
           ),
-          roleApiMapping,
           tenantService,
           () => authenticationProviders.getProviderProperties().view.mapValues(_.providerRoleExtension).toMap,
           () => authenticationProviders.getConfiguredProviders().map(_.name).toSet
@@ -2289,7 +2229,8 @@ object RudderConfigInit {
         campaignApi,
         new HookApi(hookApiService),
         archiveApi,
-        new ScoreApiImpl(restExtractorService, scoreService)
+        new ScoreApiImpl(restExtractorService, scoreService),
+        eventLogApi
         // info api must be resolved latter, because else it misses plugin apis !
       )
 
@@ -2306,7 +2247,13 @@ object RudderConfigInit {
     // Internal APIs
     lazy val sharedFileApi     =
       new SharedFilesAPI(restExtractorService, userService, RUDDER_DIR_SHARED_FILES_FOLDER, RUDDER_GIT_ROOT_CONFIG_REPO)
-    lazy val eventLogApi       = new EventLogAPI(eventLogRepository, restExtractorService, eventLogDetailsGenerator, personIdentService)
+    lazy val eventLogApi       = {
+      new EventLogAPI(
+        new EventLogService(eventLogRepository, eventLogDetailsGenerator, personIdentService),
+        eventLogDetailsGenerator,
+        eventType => S ? ("rudder.log.eventType.names." + eventType.serialize)
+      )
+    }
     lazy val asyncWorkflowInfo = new AsyncWorkflowInfo
     lazy val configService: ReadConfigService with UpdateConfigService = {
       new GenericConfigService(
@@ -2408,7 +2355,7 @@ object RudderConfigInit {
     lazy val uuidGen                   = stringUuidGenerator
     lazy val systemVariableSpecService = new SystemVariableSpecServiceImpl()
     lazy val ldapEntityMapper: LDAPEntityMapper =
-      new LDAPEntityMapper(rudderDitImpl, nodeDitImpl, acceptedNodesDitImpl, queryParser, inventoryMapper)
+      new LDAPEntityMapper(rudderDitImpl, nodeDitImpl, queryParser, inventoryMapper)
 
     ///// items serializer - service that transforms items to XML /////
     lazy val ruleSerialisation:                    RuleSerialisation                    = new RuleSerialisationImpl(
@@ -2462,8 +2409,7 @@ object RudderConfigInit {
       Constants.NODE_PROMISES_PARENT_DIR_BASE,
       Constants.NODE_PROMISES_PARENT_DIR,
       RUDDER_DIR_BACKUP,
-      Constants.CFENGINE_COMMUNITY_PROMISES_PATH,
-      Constants.CFENGINE_NOVA_PROMISES_PATH
+      Constants.CFENGINE_COMMUNITY_PROMISES_PATH
     )
 
     /*
@@ -2530,7 +2476,7 @@ object RudderConfigInit {
       configService.rudder_ui_changeMessage_mandatory _,
       configService.rudder_ui_changeMessage_explanation _
     )
-    lazy val userPropertyService     = userPropertyServiceImpl
+    lazy val userPropertyService: UserPropertyService = userPropertyServiceImpl
 
     ////////////////////////////////////
     //  non success services
@@ -2702,13 +2648,9 @@ object RudderConfigInit {
     lazy val eventListDisplayerImpl   = new EventListDisplayer(logRepository)
     lazy val eventLogDetailsGenerator = new EventLogDetailsGenerator(
       eventLogDetailsServiceImpl,
-      logRepository,
       roLdapNodeGroupRepository,
-      roLdapDirectiveRepository,
-      nodeFactInfoService,
       roLDAPRuleCategoryRepository,
       modificationService,
-      personIdentServiceImpl,
       linkUtil,
       diffDisplayer
     )
@@ -2857,8 +2799,6 @@ object RudderConfigInit {
     )
     lazy val woRuleRepository = woLdapRuleRepository
 
-    lazy val woFactNodeRepository: WoNodeRepository = new WoFactNodeRepositoryProxy(nodeFactRepository)
-
     lazy val roLdapNodeGroupRepository = new RoLDAPNodeGroupRepository(
       rudderDitImpl,
       roLdap,
@@ -3247,7 +3187,6 @@ object RudderConfigInit {
     )
     lazy val eventLogDeploymentServiceImpl = new EventLogDeploymentService(logRepository, eventLogDetailsServiceImpl)
 
-    lazy val nodeFactInfoService = new NodeInfoServiceProxy(nodeFactRepository)
     lazy val dependencyAndDeletionService: DependencyAndDeletionService = new DependencyAndDeletionServiceImpl(
       new FindDependenciesImpl(roLdap, rudderDitImpl, ldapEntityMapper),
       roLdapDirectiveRepository,
@@ -3381,7 +3320,7 @@ object RudderConfigInit {
       new MigrateChangeValidationEnforceSchema(doobie),
       new DeleteArchiveTables(doobie),
       new MigrateNodeAcceptationInventories(
-        nodeFactInfoService,
+        nodeFactRepository,
         doobie,
         inventoryHistoryLogRepository,
         inventoryHistoryJdbcRepository,
@@ -3409,13 +3348,6 @@ object RudderConfigInit {
 
       new CheckRudderGlobalParameter(roLDAPParameterRepository, woLDAPParameterRepository, uuidGen),
       new CheckInitXmlExport(itemArchiveManagerImpl, personIdentServiceImpl, uuidGen),
-      new MigrateNodeAcceptationInventories(
-        nodeFactInfoService,
-        doobie,
-        inventoryHistoryLogRepository,
-        inventoryHistoryJdbcRepository,
-        KEEP_DELETED_NODE_FACT_DURATION
-      ),
       new CheckNcfTechniqueUpdate(
         ncfTechniqueWriter,
         roLDAPApiAccountRepository.systemAPIAccount,
@@ -3493,7 +3425,6 @@ object RudderConfigInit {
                   input.constraint.mayBeEmpty,
                   () => configService.rudder_featureSwitch_directiveScriptEngine().toBox
                 )
-              case AixDerivedPasswordVType    => new DerivedPasswordField(id, HashAlgoConstraint.DerivedPasswordType.AIX)
               case LinuxDerivedPasswordVType  => new DerivedPasswordField(id, HashAlgoConstraint.DerivedPasswordType.Linux)
               case _                          => default(id)
             }
@@ -3709,7 +3640,6 @@ object RudderConfigInit {
       rudderDit,
       roLdapRuleRepository,
       woRuleRepository,
-      woFactNodeRepository,
       roLdapNodeGroupRepository,
       woLdapNodeGroupRepository,
       techniqueRepositoryImpl,
@@ -3745,7 +3675,6 @@ object RudderConfigInit {
       techniqueLibraryUpdater,
       autoReportLogger,
       removeNodeServiceImpl,
-      nodeFactInfoService,
       reportDisplayerImpl,
       dependencyAndDeletionService,
       itemArchiveManagerImpl,
@@ -3758,7 +3687,7 @@ object RudderConfigInit {
       ditQueryDataImpl,
       reportsRepository,
       eventLogDeploymentServiceImpl,
-      new SrvGrid(roAgentRunsRepository, configService, roLdapRuleRepository, nodeFactInfoService, scoreService),
+      new SrvGrid(roAgentRunsRepository, configService, scoreService),
       findExpectedRepo,
       roLDAPApiAccountRepository,
       woLDAPApiAccountRepository,
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/UserSessionInvalidationFilter.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/UserSessionInvalidationFilter.scala
index efe38b40273..176cc57f806 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/UserSessionInvalidationFilter.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/UserSessionInvalidationFilter.scala
@@ -68,8 +68,7 @@ class UserSessionInvalidationFilter(userRepository: UserRepository, userDetailLi
   private val userCache = {
     Ref
       .make(Map.empty[String, Int])
-      .map(ref => {
-
+      .map { ref =>
         userDetailListProvider.registerCallback(
           RudderAuthorizationFileReloadCallback(
             "user-session-invalidation",
@@ -80,7 +79,7 @@ class UserSessionInvalidationFilter(userRepository: UserRepository, userDetailLi
         )
 
         ref
-      })
+      }
       .runNow
   }
 
@@ -94,45 +93,49 @@ class UserSessionInvalidationFilter(userRepository: UserRepository, userDetailLi
         val userDetails = auth.getPrincipal
         userDetails match { // we should only do session invalidation in specific cases : status is disabled/deleted, user is unknown
           case user: RudderUserDetail =>
-            val username   = user.getUsername
-            val cachedUser = userCache.get.map(_.get(username)).runNow
+            val username = user.getUsername
             implicit val userDetail: RudderUserDetail = user
-
-            (cachedUser match {
-              case checkUser(reason) =>
-                val endSessionReason = s"Session invalidated because ${reason}"
-                IOResult.attempt {
-                  session.invalidate()
-                  response.sendRedirect(request.getContextPath)
-                }
-                  .foldZIO(
-                    {
-                      case SystemError(_, _: IllegalStateException) =>
+            (userCache.get
+              .map(_.get(username))
+              .flatMap {
+                case checkUser(reason) =>
+                  val endSessionReason = s"Session invalidated because ${reason}"
+                  IOResult.attempt {
+                    session.invalidate()
+                    response.sendRedirect(request.getContextPath)
+                  }
+                    .foldZIO(
+                      {
+                        case SystemError(_, _: IllegalStateException) =>
+                          ApplicationLoggerPure.info(
+                            s"User session for user '${username}' is already invalidated because : ${reason}"
+                          )
+                        case err                                      =>
+                          err
+                            .copy(msg = {
+                              s"User session for user '${username}' could not be invalidated for reason : ${reason}. " +
+                              s"Please contact Rudder developers with the following explanation : ${err.fullMsg}"
+                            })
+                            .fail
+                      },
+                      _ => {
+                        userRepository.logCloseSession(
+                          user.getUsername,
+                          DateTime.now,
+                          endSessionReason
+                        ) *>
                         ApplicationLoggerPure.info(
-                          s"User session for user '${username}' is already invalidated because : ${reason}"
+                          s"User session for user '${username}' is invalidated because : ${reason}"
                         )
-                      case err                                      =>
-                        err
-                          .copy(msg = {
-                            s"User session for user '${username}' could not be invalidated for reason : ${reason}. " +
-                            s"Please contact Rudder developers with the following explanation : ${err.fullMsg}"
-                          })
-                          .fail
-                    },
-                    _ => {
-                      userRepository.logCloseSession(
-                        user.getUsername,
-                        DateTime.now,
-                        endSessionReason
-                      ) *>
-                      ApplicationLoggerPure.info(
-                        s"User session for user '${username}' is invalidated because : ${reason}"
-                      )
-                    }
-                  )
-              case _                 =>
-                IOResult.attempt(filterChain.doFilter(request, response))
-            }).runNow
+                      }
+                    )
+                case _                 =>
+                  // here, we absolutely need nonBlocking, else the with a blocking IO, we yield a new thread and
+                  // at least in ZIO 2.1.12, the thread local context is lost.
+                  IOResult.nonBlocking(filterChain.doFilter(request, response))
+
+              })
+              .runNow
           case _ => ()
         }
       } else {
@@ -168,8 +171,8 @@ class UserSessionInvalidationFilter(userRepository: UserRepository, userDetailLi
   }
 
   /**
-    * New user that is logging in from an external provider (other than file) needs 
-    * to be added or updated in the cache independently from the cache refresh workflow :
+    * New user that is logging in from an external provider (other than file) needs
+    * to be added or updated in the cache independently of the cache refresh workflow :
     * the user roles are not known yet and need to be updated.
     */
   def updateUser(user: RudderUserDetail): UIO[Unit] = {
@@ -240,7 +243,7 @@ private[liftweb] object UserSessionInvalidationFilter {
     if (status.isInvalid) {
       HASH_USER_INVALID_STATUS
     } else {
-      // an user with empty roles is a safe fallback regarding security
+      // a user with empty roles is a safe fallback regarding security
       simpleHash(username, "", Set.empty)
     }
   }
@@ -248,7 +251,7 @@ private[liftweb] object UserSessionInvalidationFilter {
   /**
    * User status have to be updated from the database.
    * This also adds new users to the Ref, since their password is known.
-   * Externally provided users may be updated independently in the cache since 
+   * Externally provided users may be updated independently in the cache since
    * their password and roles are to be resolved at a specific time.
    */
   def updateUsers(
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateNodeAcceptationInventories.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateNodeAcceptationInventories.scala
index 848da45d35f..f8fd5d57b91 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateNodeAcceptationInventories.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/checks/migration/MigrateNodeAcceptationInventories.scala
@@ -47,7 +47,8 @@ import com.normation.inventory.domain.NodeId
 import com.normation.rudder.db.Doobie
 import com.normation.rudder.domain.logger.MigrationLoggerPure
 import com.normation.rudder.facts.nodes.NodeFact
-import com.normation.rudder.services.nodes.NodeInfoService
+import com.normation.rudder.facts.nodes.NodeFactRepository
+import com.normation.rudder.facts.nodes.QueryContext
 import com.normation.rudder.services.nodes.history.HistoryLogRepository
 import com.normation.rudder.services.nodes.history.impl.FactLog
 import com.normation.rudder.services.nodes.history.impl.FactLogData
@@ -63,7 +64,7 @@ import zio.interop.catz.*
 /*
  * Before Rudder 8.0, we used to save the state of node when accepted in an LDIF file under
  *   /var/rudder/inventories/historical/${nodeid}/${iso-date-time-of-acceptation}
- * Since 8.0, we store them in the nodefacts tables, which is create in the process.
+ * Since 8.0, we store them in the nodefacts tables, which is created in the process.
  * Ths migration is convergent and asynchronous:
  * - it does not block boot
  * - it can be interrupted and restarted afterward
@@ -76,7 +77,7 @@ import zio.interop.catz.*
  * - delete the directory
  */
 class MigrateNodeAcceptationInventories(
-    nodeInfoService:   NodeInfoService,
+    nodeFactRepo:      NodeFactRepository,
     doobie:            Doobie,
     fileLogRepository: InventoryHistoryLogRepository,
     jdbcLogRepository: HistoryLogRepository[NodeId, DateTime, FactLogData, FactLog] with InventoryHistoryDelete,
@@ -156,7 +157,7 @@ class MigrateNodeAcceptationInventories(
             case None    => ZIO.unit
             case Some(l) =>
               for {
-                opt <- nodeInfoService.getNodeInfo(nodeId)
+                opt <- nodeFactRepo.get(nodeId)(QueryContext.systemQC)
                 _   <- ZIO.when(opt.isDefined || l.datetime.plus(MAX_KEEP_REFUSED.toMillis).isAfter(now)) {
                          saveInDB(nodeId, l.datetime, l.data, !opt.isDefined)
                        }
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AgentScheduleEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AgentScheduleEditForm.scala
index eece4f26a02..298ebd55797 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AgentScheduleEditForm.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/AgentScheduleEditForm.scala
@@ -39,6 +39,8 @@ package com.normation.rudder.web.components
 
 import com.normation.rudder.reports.AgentRunInterval
 import com.normation.rudder.web.ChooseTemplate
+import io.scalaland.chimney.*
+import io.scalaland.chimney.syntax.*
 import net.liftweb.common.*
 import net.liftweb.http.DispatchSnippet
 import net.liftweb.http.S
@@ -47,6 +49,7 @@ import net.liftweb.http.js.JE.*
 import net.liftweb.http.js.JsCmds.*
 import net.liftweb.util.Helpers.*
 import scala.xml.NodeSeq
+import zio.json.*
 
 /**
  * Component to display and configure the Agent Schedule
@@ -127,13 +130,19 @@ class AgentScheduleEditForm(
     }
   }
 
+  implicit class ToElmInitAgentRunInterval(x: AgentRunInterval) {
+    def jsonWithSplay: String = {
+      x.transformInto[ElmInitAgentRunInterval].toJson
+    }
+  }
+
   def cfagentScheduleConfiguration: NodeSeq = {
 
     val transform = (for {
-      schedule  <- getConfigureCallback().map(_.json)
+      schedule  <- getConfigureCallback().map(_.jsonWithSplay)
       globalRun <- getGlobalConfiguration() match {
                      case None    => Full("null")
-                     case Some(g) => g.map(_.json)
+                     case Some(g) => g.map(_.jsonWithSplay)
                    }
     } yield {
       val callback = AnonFunc("schedule", SHtml.ajaxCall(JsVar("schedule"), submit))
@@ -164,3 +173,24 @@ class AgentScheduleEditForm(
     transform(agentScheduleTemplate);
   }
 }
+
+// this one is only needed for the elm init in cfagentScheduleConfiguration above
+@jsonExplicitNull
+final case class ElmInitAgentRunInterval(
+    overrides:   Option[Boolean], // true, false, null because used in Elm flag with Elm automatic translation to Maybe
+    interval:    Int,
+    startHour:   Int,
+    startMinute: Int,
+    splayHour:   Int,
+    splayMinute: Int
+)
+object ElmInitAgentRunInterval {
+  implicit val encoderJsonAgentRunInterval: JsonEncoder[ElmInitAgentRunInterval]                   = DeriveJsonEncoder.gen
+  implicit val transformAgentRunInterval:   Transformer[AgentRunInterval, ElmInitAgentRunInterval] = {
+    Transformer
+      .define[AgentRunInterval, ElmInitAgentRunInterval]
+      .withFieldComputed(_.splayHour, _.splaytime / 60)
+      .withFieldComputed(_.splayMinute, _.splaytime % 60)
+      .buildTransformer
+  }
+}
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala
index 99b10a96849..979167b3735 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala
@@ -189,7 +189,7 @@ class DirectiveEditForm(
         }).getOrElse(NodeSeq.Empty)
       })
     case None       =>
-      ("#deprecation-warning [class+]" #> "visually-hidden")
+      ("#deprecation-warning [class+]" #> "d-none")
   }
 
   def showDirectiveForm(): NodeSeq = {
@@ -637,7 +637,7 @@ class DirectiveEditForm(
     ) {
       override def setFilter             = notNull _ :: trim _ :: Nil
       override def className             = "checkbox-group policymode-group"
-      override def labelClassName        = "visually-hidden"
+      override def labelClassName        = "d-none"
       override def subContainerClassName = "col-sm-12"
     }
   }
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala
index 7b072e07b93..b5c4255ce68 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala
@@ -262,7 +262,7 @@ class NodeGroupCategoryForm(
     override def labelClassName        = ""
     override def subContainerClassName = ""
     override def validations: List[String => List[FieldError]] = Nil
-    override def errorClassName = "field_errors paddscala"
+    override def errorClassName = "text-danger mt-1"
   }
 
   /**
@@ -310,7 +310,7 @@ class NodeGroupCategoryForm(
 
   private def onSuccess: JsCmd = {
 
-    notifications ::= <span class="greenscala">Category was correctly updated</span>
+    notifications ::= <span class="text-success">Category was correctly updated</span>
     updateFormClientSide
   }
 
@@ -369,7 +369,7 @@ class NodeGroupCategoryForm(
     } else {
       val html = {
         <div id="notifications" class="notify">
-          <ul class="field_errors">{notifications.map(n => <li>{n}</li>)}</ul>
+          <ul class="text-danger">{notifications.map(n => <li>{n}</li>)}</ul>
         </div>
       }
       html
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala
index aa838d7c776..f939781df7b 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala
@@ -49,6 +49,7 @@ import com.normation.rudder.domain.policies.*
 import com.normation.rudder.domain.queries.*
 import com.normation.rudder.domain.reports.ComplianceLevelSerialisation
 import com.normation.rudder.domain.workflows.ChangeRequestId
+import com.normation.rudder.facts.nodes.CoreNodeFact
 import com.normation.rudder.facts.nodes.QueryContext
 import com.normation.rudder.repository.FullNodeGroupCategory
 import com.normation.rudder.services.workflows.DGModAction
@@ -121,8 +122,8 @@ class NodeGroupForm(
   private val nodeGroupForm         = new LocalSnippet[NodeGroupForm]
   private val searchNodeComponent   = new LocalSnippet[SearchNodeComponent]
 
-  private var query:   Option[Query]      = nodeGroup.toOption.flatMap(_.query)
-  private var srvList: Box[Seq[NodeInfo]] = getNodeList(nodeGroup)
+  private var query:   Option[Query]          = nodeGroup.toOption.flatMap(_.query)
+  private var srvList: Box[Seq[CoreNodeFact]] = getNodeList(nodeGroup)
 
   private def setSearchNodeComponent: Unit = {
     searchNodeComponent.set(
@@ -140,7 +141,7 @@ class NodeGroupForm(
     )
   }
 
-  private def getNodeList(target: Either[NonGroupRuleTarget, NodeGroup]): Box[Seq[NodeInfo]] = {
+  private def getNodeList(target: Either[NonGroupRuleTarget, NodeGroup]): Box[Seq[CoreNodeFact]] = {
 
     for {
       nodes <- nodeFactRepo.getAll()(CurrentUser.queryContext).toBox
@@ -151,7 +152,7 @@ class NodeGroupForm(
                    RuleTarget.getNodeIds(Set(target), allNodes, Map())
                }
     } yield {
-      nodes.filterKeys(id => setIds.contains(id)).map(_._2.toNodeInfo).toSeq
+      nodes.filterKeys(id => setIds.contains(id)).map(_._2).toSeq
     }
   }
 
@@ -526,7 +527,7 @@ class NodeGroupForm(
       override def labelClassName        = ""
       override def subContainerClassName = ""
       override def containerClassName    = "pe-2"
-      override def errorClassName        = "field_errors paddscala"
+      override def errorClassName        = "text-danger mt-1"
       override def inputAttributes: Seq[(String, String)] = Seq(("rows", "15"))
       override def labelExtensions: NodeSeq               = {
         <i class="fa fa-check text-success cursorPointer half-opacity"     onmouseenter="toggleOpacity(this)" title="Valid description" onmouseout="toggleOpacity(this)" onclick="toggleMarkdownEditor('longDescriptionField')"></i> ++ Text(
@@ -628,7 +629,7 @@ class NodeGroupForm(
 
           isDynamic = groupStatic.get match { case "dynamic" => true; case _ => false },
           query = query,
-          serverList = srvList.getOrElse(Set.empty[NodeInfo]).map(_.id).toSet
+          serverList = srvList.getOrElse(Set.empty[CoreNodeFact]).map(_.id).toSet
         )
 
         /*
@@ -900,7 +901,7 @@ class NodeGroupForm(
     } else {
       val html = {
         <div id="errorNotification" class="notify">
-          <ul class="field_errors">{notifications.map(n => <li>{n}</li>)}</ul>
+          <ul class="text-danger">{notifications.map(n => <li>{n}</li>)}</ul>
         </div>
       }
       html
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala
index fdc3ea242a9..c309fc339f5 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/RuleGrid.scala
@@ -278,7 +278,7 @@ class RuleGrid(
         logger.error(e)
 
         <div id={htmlId_rulesGridZone}>
-          <div id={htmlId_modalReportsPopup} class="nodisplay">
+          <div id={htmlId_modalReportsPopup} class="d-none">
             <div id={htmlId_reportsPopup} ></div>
           </div>
           <span class="error">{e}</span>
@@ -304,7 +304,7 @@ class RuleGrid(
           """
         }
         <div id={htmlId_rulesGridZone}>
-          <div id={htmlId_modalReportsPopup} class="nodisplay">
+          <div id={htmlId_modalReportsPopup} class="d-none">
             <div id={htmlId_reportsPopup} ></div>
           </div>
           <table id={htmlId_rulesGridId} class="display" cellspacing="0"> </table>
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala
index b7c3b8798a0..00ad8f9a68a 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala
@@ -44,13 +44,14 @@ import com.normation.inventory.domain.LinuxType
 import com.normation.inventory.domain.OsType
 import com.normation.inventory.ldap.core.LDAPConstants.*
 import com.normation.rudder.domain.RudderLDAPConstants.A_NODE_PROPERTY
-import com.normation.rudder.domain.nodes.NodeInfo
 import com.normation.rudder.domain.nodes.NodeState
 import com.normation.rudder.domain.queries.*
-import com.normation.rudder.domain.queries.And
 import com.normation.rudder.domain.queries.CriterionComposition
+import com.normation.rudder.domain.queries.CriterionComposition.And
+import com.normation.rudder.domain.queries.CriterionComposition.Or
 import com.normation.rudder.domain.queries.CriterionLine
-import com.normation.rudder.domain.queries.Or
+import com.normation.rudder.domain.queries.QueryReturnType.*
+import com.normation.rudder.facts.nodes.CoreNodeFact
 import com.normation.rudder.facts.nodes.QueryContext
 import com.normation.rudder.users.CurrentUser
 import com.normation.rudder.web.ChooseTemplate
@@ -82,7 +83,7 @@ class SearchNodeComponent(
     htmlId: String, // unused ...
 
     _query:           Option[Query],
-    _srvList:         Box[Seq[NodeInfo]],
+    _srvList:         Box[Seq[CoreNodeFact]],
     onUpdateCallback: () => JsCmd = { () => Noop }, // on grid refresh
 
     onClickCallback: Option[(String, Boolean) => JsCmd] = None, // this callback is used when we click on an element in the grid
@@ -103,7 +104,7 @@ class SearchNodeComponent(
 
   private val queryProcessor = RudderConfig.acceptedNodeQueryProcessor
 
-  private val nodeInfoService = RudderConfig.nodeInfoService
+  private val nodeFactRepo = RudderConfig.nodeFactRepository
 
   // The portlet for the server detail
   private def searchNodes: NodeSeq = ChooseTemplate(
@@ -136,7 +137,7 @@ class SearchNodeComponent(
    * Page/component which includes SearchNodeComponent can use it.
    * @return
    */
-  def getSrvList(): Box[Seq[NodeInfo]] = srvList
+  def getSrvList(): Box[Seq[CoreNodeFact]] = srvList
 
   /**
    * External exposition of the current state of query.
@@ -209,7 +210,11 @@ class SearchNodeComponent(
         // ********* EXECUTE QUERY ***********
         srvList = (for {
           nodeIds   <- queryProcessor.process(newQuery)
-          nodeInfos <- nodeInfoService.getNodeInfosSeq(nodeIds).toBox
+          nodeInfos <-
+            nodeFactRepo
+              .getAll()(CurrentUser.queryContext)
+              .map(_.collect { case (id, f) if nodeIds.contains(id) => f }.toSeq)
+              .toBox
         } yield {
           nodeInfos
         })
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala
index 0743a4d91d1..06be908a504 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueCategoryEditForm.scala
@@ -120,7 +120,7 @@ class TechniqueCategoryEditForm(
         // update UI
         JsRaw("hideBsModal('removeCategoryActionDialog');") & // JsRaw ok, const
         onSuccessCallback() &                                 // Replace(htmlId_activeTechniquesTree, userLibrary) &
-        SetHtml(htmlId_form, <span class="greenscala">Category successfully deleted</span>) &
+        SetHtml(htmlId_form, <span class="text-success">Category successfully deleted</span>) &
         successPopup
 
       case e: EmptyBox =>
@@ -157,8 +157,8 @@ class TechniqueCategoryEditForm(
         & "field-errors" #> (errors match {
           case Nil => NodeSeq.Empty
           case l   =>
-            <span><ul class="field_errors paddscala">{
-              l.map(e => <li class="text-danger lopaddscala">{e.msg}</li>)
+            <span><ul class="text-danger mt-1">{
+              l.map(e => <li class="text-danger mt-1">{e.msg}</li>)
             }</ul></span><hr class="spacer"/>
         })
     )(
@@ -249,7 +249,7 @@ class TechniqueCategoryEditForm(
           }
         } else {
           <button id="deleteCategoryButton" disabled="disabled"  class="btn btn-danger">Delete</button>
-              <br/><span class="catdelete">Only non root and empty category can be deleted</span>
+              <br/><span class="ms-1">Only non root and empty category can be deleted</span>
         }
       }
       & "update-notifications" #> {
@@ -258,7 +258,7 @@ class TechniqueCategoryEditForm(
 
         if (categoryNotifications.isEmpty) NodeSeq.Empty
         else {
-          val notifications = <div class="notify"><ul class="field_errors">{
+          val notifications = <div class="notify"><ul class="text-danger">{
             categoryNotifications.map(n => <li>{n}</li>)
           }</ul></div>
           categoryNotifications = Nil
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueEditForm.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueEditForm.scala
index 41280faeb4a..5da0ab9527b 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueEditForm.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueEditForm.scala
@@ -218,7 +218,7 @@ class TechniqueEditForm(
             (
               "#techniqueName" #> t.name &
               "#techniqueDescription *" #> t.description &
-              "#techniqueDocumentation [class]" #> (if (t.longDescription.isEmpty) "visually-hidden" else "") &
+              "#techniqueDocumentation [class]" #> (if (t.longDescription.isEmpty) "d-none" else "") &
               "#techniqueLongDescription" #> Script(
                 OnLoad(
                   JsRaw(s"""generateMarkdown(${Str(t.longDescription).toJsCmd}, "#techniqueLongDescription")""")
@@ -260,29 +260,29 @@ class TechniqueEditForm(
   }
 
   private val crReasons = {
-    import com.normation.rudder.web.services.ReasonBehavior.*
-    (userPropertyService.reasonsFieldBehavior: @unchecked) match {
+    import com.normation.rudder.config.ReasonBehavior.*
+    userPropertyService.reasonsFieldBehavior match {
       case Disabled  => None
-      case Mandatory => Some(buildReasonField(true, "subContainerReasonField"))
-      case Optionnal => Some(buildReasonField(false, "subContainerReasonField"))
+      case Mandatory => Some(buildReasonField(true, "px-1"))
+      case Optional  => Some(buildReasonField(false, "px-1"))
     }
   }
 
   private val crReasonsRemovePopup = {
-    import com.normation.rudder.web.services.ReasonBehavior.*
-    (userPropertyService.reasonsFieldBehavior: @unchecked) match {
+    import com.normation.rudder.config.ReasonBehavior.*
+    userPropertyService.reasonsFieldBehavior match {
       case Disabled  => None
-      case Mandatory => Some(buildReasonField(true, "subContainerReasonField"))
-      case Optionnal => Some(buildReasonField(false, "subContainerReasonField"))
+      case Mandatory => Some(buildReasonField(true, "px-1"))
+      case Optional  => Some(buildReasonField(false, "px-1"))
     }
   }
 
   private val crReasonsDisablePopup = {
-    import com.normation.rudder.web.services.ReasonBehavior.*
-    (userPropertyService.reasonsFieldBehavior: @unchecked) match {
+    import com.normation.rudder.config.ReasonBehavior.*
+    userPropertyService.reasonsFieldBehavior match {
       case Disabled  => None
-      case Mandatory => Some(buildReasonField(true, "subContainerReasonField"))
-      case Optionnal => Some(buildReasonField(false, "subContainerReasonField"))
+      case Mandatory => Some(buildReasonField(true, "px-1"))
+      case Optional  => Some(buildReasonField(false, "px-1"))
     }
   }
 
@@ -457,7 +457,7 @@ class TechniqueEditForm(
             </ul>
         case None          => // display the add button if a user lib category is defined
           userCategoryLibrary match {
-            case None           => <span class="greenscala">Click on a category in the user library</span>
+            case None           => <span class="text-success">Click on a category in the user library</span>
             case Some(category) => {
               /*
                * Actually add the Technique to category:
@@ -591,7 +591,7 @@ class TechniqueEditForm(
       NodeSeq.Empty
     } else {
       val html = <div id="notifications">
-        <ul class="field_errors">{notifications.map(n => <li>{n}</li>)}</ul></div>
+        <ul class="text-danger">{notifications.map(n => <li>{n}</li>)}</ul></div>
       html
     }
   }
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCategoryOrGroupPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCategoryOrGroupPopup.scala
index 67876162b7d..d95048cc3c4 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCategoryOrGroupPopup.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCategoryOrGroupPopup.scala
@@ -313,11 +313,11 @@ class CreateCategoryOrGroupPopup(
   }
 
   private val piReasons = {
-    import com.normation.rudder.web.services.ReasonBehavior.*
-    (userPropertyService.reasonsFieldBehavior: @unchecked) match {
+    import com.normation.rudder.config.ReasonBehavior.*
+    userPropertyService.reasonsFieldBehavior match {
       case Disabled  => None
-      case Mandatory => Some(buildReasonField(true, "subContainerReasonField"))
-      case Optionnal => Some(buildReasonField(false, "subContainerReasonField"))
+      case Mandatory => Some(buildReasonField(true, "px-1"))
+      case Optional  => Some(buildReasonField(false, "px-1"))
     }
   }
 
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneDirectivePopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneDirectivePopup.scala
index b2b25f9429d..74ca8fb4ded 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneDirectivePopup.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneDirectivePopup.scala
@@ -125,11 +125,11 @@ class CreateCloneDirectivePopup(
   ///////////// fields for category settings ///////////////////
 
   private val reasons = {
-    import com.normation.rudder.web.services.ReasonBehavior.*
-    (userPropertyService.reasonsFieldBehavior: @unchecked) match {
+    import com.normation.rudder.config.ReasonBehavior.*
+    userPropertyService.reasonsFieldBehavior match {
       case Disabled  => None
-      case Mandatory => Some(buildReasonField(true, "subContainerReasonField"))
-      case Optionnal => Some(buildReasonField(false, "subContainerReasonField"))
+      case Mandatory => Some(buildReasonField(true, "px-1"))
+      case Optional  => Some(buildReasonField(false, "px-1"))
     }
   }
 
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneGroupPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneGroupPopup.scala
index ede353ef102..b84ed29ee3c 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneGroupPopup.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCloneGroupPopup.scala
@@ -208,11 +208,11 @@ class CreateCloneGroupPopup(
   ///////////// fields for category settings ///////////////////
 
   private val groupReasons = {
-    import com.normation.rudder.web.services.ReasonBehavior.*
-    (userPropertyService.reasonsFieldBehavior: @unchecked) match {
+    import com.normation.rudder.config.ReasonBehavior.*
+    userPropertyService.reasonsFieldBehavior match {
       case Disabled  => None
-      case Mandatory => Some(buildReasonField(true, "subContainerReasonField"))
-      case Optionnal => Some(buildReasonField(false, "subContainerReasonField"))
+      case Mandatory => Some(buildReasonField(true, "px-1"))
+      case Optional  => Some(buildReasonField(false, "px-1"))
     }
   }
 
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala
index 5678d64ee11..ba15e4a1ece 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateOrUpdateGlobalParameterPopup.scala
@@ -330,11 +330,11 @@ class CreateOrUpdateGlobalParameterPopup(
   val parameterOverridable = true
 
   private val paramReasons = {
-    import com.normation.rudder.web.services.ReasonBehavior.*
-    (userPropertyService.reasonsFieldBehavior: @unchecked) match {
+    import com.normation.rudder.config.ReasonBehavior.*
+    userPropertyService.reasonsFieldBehavior match {
       case Disabled  => None
-      case Mandatory => Some(buildReasonField(true, "subContainerReasonField"))
-      case Optionnal => Some(buildReasonField(false, "subContainerReasonField"))
+      case Mandatory => Some(buildReasonField(true, "px-1"))
+      case Optional  => Some(buildReasonField(false, "px-1"))
     }
   }
 
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala
index 3c9d1ad486b..ed9d002df2e 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateRulePopup.scala
@@ -133,11 +133,11 @@ class CreateOrCloneRulePopup(
   ///////////// fields for category settings ///////////////////
 
   private val reason = {
-    import com.normation.rudder.web.services.ReasonBehavior.*
-    (userPropertyService.reasonsFieldBehavior: @unchecked) match {
+    import com.normation.rudder.config.ReasonBehavior.*
+    userPropertyService.reasonsFieldBehavior match {
       case Disabled  => None
-      case Mandatory => Some(buildReasonField(true, "subContainerReasonField"))
-      case Optionnal => Some(buildReasonField(false, "subContainerReasonField"))
+      case Mandatory => Some(buildReasonField(true, "px-1"))
+      case Optional  => Some(buildReasonField(false, "px-1"))
     }
   }
 
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/GiveReasonPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/GiveReasonPopup.scala
index defe12ab6f2..75d2f972d56 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/GiveReasonPopup.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/GiveReasonPopup.scala
@@ -41,6 +41,7 @@ import bootstrap.liftweb.RudderConfig
 import com.normation.box.*
 import com.normation.cfclerk.domain.TechniqueName
 import com.normation.eventlog.ModificationId
+import com.normation.rudder.config.ReasonBehavior.*
 import com.normation.rudder.domain.policies.ActiveTechniqueCategoryId
 import com.normation.rudder.domain.policies.ActiveTechniqueId
 import com.normation.rudder.domain.policies.PolicyTypes
@@ -48,7 +49,6 @@ import com.normation.rudder.users.CurrentUser
 import com.normation.rudder.web.ChooseTemplate
 import com.normation.rudder.web.model.FormTracker
 import com.normation.rudder.web.model.WBTextAreaField
-import com.normation.rudder.web.services.ReasonBehavior.*
 import net.liftweb.common.*
 import net.liftweb.http.DispatchSnippet
 import net.liftweb.http.SHtml
@@ -104,10 +104,10 @@ class GiveReasonPopup(
 
 ///////////// fields for category settings ///////////////////
   private val crReasons = {
-    (userPropertyService.reasonsFieldBehavior: @unchecked) match {
+    userPropertyService.reasonsFieldBehavior match {
       case Disabled  => None
-      case Mandatory => Some(buildReasonField(true, "subContainerReasonField"))
-      case Optionnal => Some(buildReasonField(false, "subContainerReasonField"))
+      case Mandatory => Some(buildReasonField(true, "px-1"))
+      case Optional  => Some(buildReasonField(false, "px-1"))
     }
   }
 
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala
index ba7ee3dd125..d93ece03f5b 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala
@@ -258,11 +258,11 @@ class ModificationValidationPopup(
 
   // must be here because used in val popupWarningMessages
   private val crReasons = {
-    import com.normation.rudder.web.services.ReasonBehavior.*
-    (userPropertyService.reasonsFieldBehavior: @unchecked) match {
+    import com.normation.rudder.config.ReasonBehavior.*
+    userPropertyService.reasonsFieldBehavior match {
       case Disabled  => None
-      case Mandatory => Some(buildReasonField(true, "subContainerReasonField"))
-      case Optionnal => Some(buildReasonField(false, "subContainerReasonField"))
+      case Mandatory => Some(buildReasonField(true, "px-1"))
+      case Optional  => Some(buildReasonField(false, "px-1"))
     }
   }
 
@@ -412,7 +412,7 @@ class ModificationValidationPopup(
 
   private val changeRequestDescription = new WBTextAreaField("Description", "") {
     override def setFilter      = notNull _ :: trim _ :: Nil
-    override def inputField     = super.inputField % ("style" -> "height:7em") % ("tabindex" -> "2") % ("class" -> "nodisplay")
+    override def inputField     = super.inputField % ("style" -> "height:7em") % ("tabindex" -> "2") % ("class" -> "d-none")
     override def errorClassName = "col-xl-12 errors-container"
     override def validations: List[String => List[FieldError]] = Nil
 
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleModificationValidationPopup.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleModificationValidationPopup.scala
index e02c676ef4f..1e36db75f0d 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleModificationValidationPopup.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/components/popup/RuleModificationValidationPopup.scala
@@ -168,11 +168,11 @@ class RuleModificationValidationPopup(
   ///////////// fields for category settings ///////////////////
 
   private val crReasons = {
-    import com.normation.rudder.web.services.ReasonBehavior.*
-    (userPropertyService.reasonsFieldBehavior: @unchecked) match {
+    import com.normation.rudder.config.ReasonBehavior.*
+    userPropertyService.reasonsFieldBehavior match {
       case Disabled  => None
-      case Mandatory => Some(buildReasonField(true, "subContainerReasonField"))
-      case Optionnal => Some(buildReasonField(false, "subContainerReasonField"))
+      case Mandatory => Some(buildReasonField(true, "px-1"))
+      case Optional  => Some(buildReasonField(false, "px-1"))
     }
   }
 
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala
index ab2d57db180..a380d17599e 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/model/DirectiveFieldEditors.scala
@@ -796,16 +796,16 @@ class PasswordField(
     import com.normation.cfclerk.domain.HashAlgoConstraint.*
 
     def name: String = a match {
-      case PLAIN                         => "Plain text"
-      case PreHashed                     => "Pre-hashed"
-      case MD5                           => "MD5 (non salted)"
-      case SHA1                          => "SHA1 (non salted)"
-      case SHA256                        => "SHA256 (non salted)"
-      case SHA512                        => "SHA512 (non salted)"
-      case LinuxShadowMD5 | AixMD5       => "MD5-crypt"
-      case LinuxShadowSHA256 | AixSHA256 => "SHA256-crypt"
-      case LinuxShadowSHA512 | AixSHA512 => "SHA512-crypt"
-      case UnixCryptDES                  => "DES-crypt"
+      case PLAIN             => "Plain text"
+      case PreHashed         => "Pre-hashed"
+      case MD5               => "MD5 (non salted)"
+      case SHA1              => "SHA1 (non salted)"
+      case SHA256            => "SHA256 (non salted)"
+      case SHA512            => "SHA512 (non salted)"
+      case LinuxShadowMD5    => "MD5-crypt"
+      case LinuxShadowSHA256 => "SHA256-crypt"
+      case LinuxShadowSHA512 => "SHA512-crypt"
+      case UnixCryptDES      => "DES-crypt"
     }
   }
 
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala
index 252455ce277..26b3353c0f5 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala
@@ -468,7 +468,7 @@ object DisplayDirectiveTree extends Loggable {
             else { "" }}</span>
               ${agentCompat.directiveText}
               ${disableMessage}
-              <span class="visually-hidden"> ${activeTechnique.techniqueName} </span>
+              <span class="d-none"> ${activeTechnique.techniqueName} </span>
             </div>
 
           """
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala
index 4fd112862b0..d283aea65d4 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala
@@ -711,12 +711,10 @@ object DisplayNode extends Loggable {
 
     val agent     = nodeFact.rudderAgent
     val tokenKind = agent.securityToken match {
-      case _: PublicKey   => "Public key"
       case _: Certificate => "Certificate"
     }
     <div class="security-info" id={"security-" + nodeFact.id.value}>{
       agent.securityToken match {
-        case _: PublicKey   => NodeSeq.Empty
         case c: Certificate =>
           c.cert.either.runNow match {
             case Left(e)     => <span title={e.fullMsg}>Error while reading certificate information</span>
@@ -741,7 +739,7 @@ object DisplayNode extends Loggable {
       if (CurrentUser.checkRights(AuthorizationType.Node.Write) && nodeFact.rudderSettings.keyStatus == CertifiedKey) {
         SHtml.ajaxButton(
           "Reset status to be able to accept a different key",
-          () => resetKeyStatus(nodeFact, agent.securityToken)
+          () => resetKeyStatus(nodeFact)
         ) % ("class", "btn btn-default btn-sm")
       } else NodeSeq.Empty
     }
@@ -755,39 +753,42 @@ object DisplayNode extends Loggable {
   /*
    * Reset key status for given node and redisplay it's security <div>
    */
-  private def resetKeyStatus(nodeFact: NodeFact, st: SecurityToken)(implicit qc: QueryContext): JsCmd = {
-
-    RudderConfig.woNodeRepository
-      .updateNodeKeyInfo(
-        nodeFact.id,
-        None,
-        Some(UndefinedKey),
-        ModificationId(RudderConfig.stringUuidGenerator.newUuid),
-        CurrentUser.actor,
-        Some("Trusted key status reset to accept new key (first use)")
-      )
-      .map { _ =>
-        val js: JsCmd = {
-          SetHtml(
-            s"security-${nodeFact.id.value}",
-            displaySecurityInfo(nodeFact.modify(_.rudderSettings.keyStatus).setTo(UndefinedKey))
-          ) &
-          JsRaw(s"""createSuccessNotification("Key status for node '${StringEscapeUtils.escapeEcmaScript(
-              nodeFact.id.value
-            )}' correctly changed.")""") // JsRaw ok, escaped
-        }
-        js
-      }
-      .catchAll { err =>
-        val js: JsCmd = JsRaw(
-          s"""createErrorNotification("${s"An error happened when trying to change key status of node '${StringEscapeUtils
-                .escapeEcmaScript(nodeFact.fqdn)}' [${StringEscapeUtils.escapeEcmaScript(nodeFact.id.value)}]. " +
-            "Please contact your server admin to resolve the problem. " +
-            s"Error was: '${err.fullMsg}'"}")"""
-        ) // JsRaw ok, escaped
-        js.succeed
+  private def resetKeyStatus(nodeFact: NodeFact)(implicit qc: QueryContext): JsCmd = {
+    implicit val cc: ChangeContext = ChangeContext(
+      ModificationId(RudderConfig.stringUuidGenerator.newUuid),
+      CurrentUser.actor,
+      DateTime.now(),
+      Some("Trusted key status reset to accept new key (first use)"),
+      None,
+      CurrentUser.nodePerms
+    )
+
+    (for {
+      node   <- RudderConfig.nodeFactRepository
+                  .get(nodeFact.id)(cc.toQuery)
+                  .notOptional(s"Cannot update node with id ${nodeFact.id.value}: there is no node with that id")
+      newNode = node.modify(_.rudderSettings.keyStatus).setTo(UndefinedKey)
+      _      <- RudderConfig.nodeFactRepository.save(newNode)
+    } yield {
+      val js: JsCmd = {
+        SetHtml(
+          s"security-${nodeFact.id.value}",
+          displaySecurityInfo(nodeFact.modify(_.rudderSettings.keyStatus).setTo(UndefinedKey))
+        ) &
+        JsRaw(s"""createSuccessNotification("Key status for node '${StringEscapeUtils.escapeEcmaScript(
+            nodeFact.id.value
+          )}' correctly changed.")""") // JsRaw ok, escaped
       }
-      .runNow
+      js
+    }).catchAll { err =>
+      val js: JsCmd = JsRaw(
+        s"""createErrorNotification("${s"An error happened when trying to change key status of node '${StringEscapeUtils
+              .escapeEcmaScript(nodeFact.fqdn)}' [${StringEscapeUtils.escapeEcmaScript(nodeFact.id.value)}]. " +
+          "Please contact your server admin to resolve the problem. " +
+          s"Error was: '${err.fullMsg}'"}")"""
+      ) // JsRaw ok, escaped
+      js.succeed
+    }.runNow
 
   }
 
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNodeGroupTree.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNodeGroupTree.scala
index 433c9a318f7..1ba84853495 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNodeGroupTree.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNodeGroupTree.scala
@@ -198,8 +198,8 @@ object DisplayNodeGroupTree extends Loggable {
           val tooltipContent = s"<h4>${targetInfo.name}</h4>\n<div class='tooltip-content'>${targetInfo.description}</div>"
           <span class="treeGroupName" data-bs-toggle="tooltip" title={tooltipContent}>
             {targetInfo.name}
-            {if (targetInfo.isSystem) <small class="greyscala"> - System</small>}
-            <small class="greyscala">{
+            {if (targetInfo.isSystem) <small class="text-secondary"> - System</small>}
+            <small class="text-secondary">{
             targetInfo.target match {
               case g: FullGroupTarget => s" - ${if (g.nodeGroup.isDynamic) "Dynamic" else "Static"}"
               case _ => ""
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/ReportDisplayer.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/ReportDisplayer.scala
index c7e4d1d5acc..ad04187b3df 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/ReportDisplayer.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/ReportDisplayer.scala
@@ -414,10 +414,7 @@ class ReportDisplayer(
                        * other kind of agent (windows in particular).
                        */
                       def triggerAgent(node: CoreNodeFact): NodeSeq = if (tableId == "reportsGrid") {
-                        if (
-                          node.rudderAgent.agentType == AgentType.CfeCommunity ||
-                          node.rudderAgent.agentType == AgentType.CfeEnterprise
-                        ) {
+                        if (node.rudderAgent.agentType == AgentType.CfeCommunity) {
                           <div id="triggerAgent">
             <button id="triggerBtn" class="btn btn-primary btn-trigger"  onclick={
                             s"callRemoteRun('${node.id.value}', ${refreshReportDetail(node, tableId, getReports, addOverriden, defaultRunInterval).toJsCmd});"
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/SrvGrid.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/SrvGrid.scala
index 46fd1185491..c727b6b77a8 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/SrvGrid.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/SrvGrid.scala
@@ -46,11 +46,10 @@ import com.normation.rudder.domain.logger.TimingDebugLoggerPure
 import com.normation.rudder.domain.nodes.NodeInfo
 import com.normation.rudder.domain.policies.GlobalPolicyMode
 import com.normation.rudder.domain.policies.PolicyModeOverrides.*
+import com.normation.rudder.facts.nodes.CoreNodeFact
 import com.normation.rudder.reports.execution.AgentRunWithNodeConfig
 import com.normation.rudder.reports.execution.RoReportsExecutionRepository
-import com.normation.rudder.repository.RoRuleRepository
 import com.normation.rudder.score.ScoreService
-import com.normation.rudder.services.nodes.NodeInfoService
 import com.normation.utils.DateFormaterService
 import com.normation.utils.Utils.isEmpty
 import com.normation.zio.*
@@ -88,8 +87,6 @@ object SrvGrid {
 class SrvGrid(
     roAgentRunsRepository: RoReportsExecutionRepository,
     configService:         ReadConfigService,
-    roRuleRepository:      RoRuleRepository,
-    nodeInfoService:       NodeInfoService,
     scoreService:          ScoreService
 ) extends Loggable {
 
@@ -165,7 +162,7 @@ class SrvGrid(
   }
 
   def refreshData(
-      refreshNodes: () => Option[Seq[NodeInfo]],
+      refreshNodes: () => Option[Seq[CoreNodeFact]],
       callback:     Option[(String, Boolean) => JsCmd],
       tableId:      String
   ): AnonFunc = {
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/CommonLayout.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/CommonLayout.scala
index 020f22bd857..c008d0c4402 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/CommonLayout.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/CommonLayout.scala
@@ -45,7 +45,7 @@ class CommonLayout extends DispatchSnippet with DefaultExtendableSnippet[CommonL
   val toggleMenuElement: Elem = {
     <a onclick="$('body').toggleClass('sidebar-collapse')" class="sidebar-toggle p-3" role="button">
       <i class="fa fa-bars"></i>
-      <span class="visually-hidden">Toggle navigation</span>
+      <span class="d-none">Toggle navigation</span>
     </a>
   }
 }
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Login.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Login.scala
index 2dcbbb6e0d2..71499aa4325 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Login.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/Login.scala
@@ -13,7 +13,7 @@ class Login extends DispatchSnippet with DefaultExtendableSnippet[Login] {
       if (userListProvider.authConfig.users.isEmpty) {
         <div>
           <div class="logo-container">
-            <img src="/images/logo-rudder.svg" data-lift="with-cached-resource" alt="Rudder"/>
+            <img src="/images/logo/rudder-logo-rect-black.svg" data-lift="with-cached-resource" alt="Rudder"/>
           </div>
           <div class="plugin-info"></div>
           <form id="login-form">
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala
index 86ab29e90b7..2f0e33d7d4d 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/EditPolicyServerAllowedNetwork.scala
@@ -66,7 +66,7 @@ class EditPolicyServerAllowedNetwork extends DispatchSnippet with Loggable {
   private val eventLogService      = RudderConfig.eventLogRepository
   private val asyncDeploymentAgent = RudderConfig.asyncDeploymentAgent
   private val uuidGen              = RudderConfig.stringUuidGenerator
-  private val nodeInfoService      = RudderConfig.nodeInfoService
+  private val nodeFactRepo         = RudderConfig.nodeFactRepository
   private var addNetworkField      = ""
   /*
    * We are forced to use that class to deals with multiple request
@@ -82,7 +82,10 @@ class EditPolicyServerAllowedNetwork extends DispatchSnippet with Loggable {
     }
   }
 
-  private val policyServers = nodeInfoService.getAllSystemNodeIds().toBox
+  private val policyServers = nodeFactRepo
+    .getAll()(CurrentUser.queryContext)
+    .map(_.collect { case (id, f) if (f.rudderSettings.kind.isPolicyServer) => id }.toSeq)
+    .toBox
 
   // we need to store that out of the form, so that the changes are persisted at redraw
   private val allowedNetworksMap = scala.collection.mutable.Map[NodeId, Buffer[VH]]()
@@ -121,9 +124,9 @@ class EditPolicyServerAllowedNetwork extends DispatchSnippet with Loggable {
   def renderForm(policyServerId: NodeId): IdMemoizeTransform = SHtml.idMemoize { outerXml =>
     val allowedNetworksFormId = "allowedNetworksForm" + policyServerId.value
 
-    val policyServerName = nodeInfoService.getNodeInfo(policyServerId).either.runNow match {
+    val policyServerName = nodeFactRepo.get(policyServerId)(CurrentUser.queryContext).either.runNow match {
       case Right(Some(nodeInfo)) =>
-        <span>{nodeInfo.hostname}</span>
+        <span>{nodeInfo.fqdn}</span>
       case Left(err)             =>
         val e = s"Could not get details for Policy Server ID ${policyServerId.value}: ${err.fullMsg}"
         logger.error(e)
@@ -225,7 +228,7 @@ class EditPolicyServerAllowedNetwork extends DispatchSnippet with Loggable {
               (
                 ".deleteNetwork" #> SHtml.ajaxButton(<span class="fa fa-minus"></span>, () => delete(i)) &
                 "#errorNetworkField" #> <div><span class={
-                  "lift:Msg?errorClass=bs-text-danger;id=errornetwork_" + i
+                  "lift:Msg?errorClass=text-danger;id=errornetwork_" + i
                 }>[error]</span></div> &
                 ".networkField [name]" #> id andThen
                 ".networkField" #> SHtml.text(
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/TechniqueLibraryManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/TechniqueLibraryManagement.scala
index 4a6c5263b22..96f5d49d950 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/TechniqueLibraryManagement.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/administration/TechniqueLibraryManagement.scala
@@ -42,6 +42,7 @@ import com.normation.box.*
 import com.normation.cfclerk.domain.*
 import com.normation.eventlog.ModificationId
 import com.normation.rudder.AuthorizationType
+import com.normation.rudder.config.ReasonBehavior.*
 import com.normation.rudder.domain.eventlog.RudderEventActor
 import com.normation.rudder.domain.policies.*
 import com.normation.rudder.users.CurrentUser
@@ -50,7 +51,6 @@ import com.normation.rudder.web.components.popup.CreateActiveTechniqueCategoryPo
 import com.normation.rudder.web.components.popup.GiveReasonPopup
 import com.normation.rudder.web.model.JsTreeNode
 import com.normation.rudder.web.services.AgentCompat
-import com.normation.rudder.web.services.ReasonBehavior.*
 import net.liftweb.common.*
 import net.liftweb.common.Box.box2Option
 import net.liftweb.common.Box.option2Box
@@ -356,10 +356,9 @@ class TechniqueLibraryManagement extends DispatchSnippet with Loggable {
         updateCurrentTechniqueDetails(Some(technique), None)
         showTechniqueDetails()
       case _               =>
-        <div id={htmlId_bottomPanel}>
-          <div  class="text-center">
+        <div id={htmlId_bottomPanel} class="portlet pt-3 pb-4">
           Click on a technique or a category from user library to
-          display its details.</div>
+          display its details.
         </div>
     }
   }
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala
index 2f4b9fd91f7..6b392ea0a19 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala
@@ -295,7 +295,7 @@ class DirectiveManagement extends DispatchSnippet with Loggable {
 
             "*" #> {
               <div id="techniqueDetails">
-              <div class="deca">
+              <div class="p-2">
               <p class="error">{m}</p>
               </div>
               </div>
@@ -339,7 +339,7 @@ class DirectiveManagement extends DispatchSnippet with Loggable {
               else <span class="badge-disabled"></span>
             }</span> &
             "#techniqueID *" #> technique.id.name.value &
-            "#techniqueDocumentation [class]" #> (if (technique.longDescription.isEmpty) "visually-hidden" else "") &
+            "#techniqueDocumentation [class]" #> (if (technique.longDescription.isEmpty) "d-none" else "") &
             "#techniqueLongDescription *" #> Script(
               JsRaw(
                 s"""generateMarkdown(${Str(technique.longDescription).toJsCmd}, "#techniqueLongDescription");"""
@@ -587,7 +587,7 @@ class DirectiveManagement extends DispatchSnippet with Loggable {
         val fail      = eb ?~! "Could not get global policy mode while creating new directive"
         logger.error(fail.messageChain)
         val errorHtml = {
-          <div class="deca">
+          <div class="p-2">
               <p class="error">{fail.messageChain}</p>
               </div>
         }
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/ParameterManagement.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/ParameterManagement.scala
index 717f0a3534d..eb0a6976bce 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/ParameterManagement.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/ParameterManagement.scala
@@ -93,7 +93,7 @@ class ParameterManagement extends DispatchSnippet with Loggable {
         ".parameterLine [class]" #> Text("curspoint") &
         ".name *" #> <b>{param.name}</b> &
         ".value *" #> <pre class="json-beautify">{param.valueAsString}</pre> &
-        ".description *" #> <span><ul class="evlogviewpad"><li><b>Description:</b> {Text(param.description)}</li></ul></span> &
+        ".description *" #> <span><ul class="ms-2"><li><b>Description:</b> {Text(param.description)}</li></ul></span> &
         ".description [id]" #> ("description-" + lineHtmlId) &
         ".change *" #> <div>{
           if (param.provider.isEmpty || param.provider == Some(PropertyProvider.defaultPropertyProvider)) {
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/PendingHistoryGrid.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/PendingHistoryGrid.scala
index 5dd0117377a..06f445d0176 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/PendingHistoryGrid.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/PendingHistoryGrid.scala
@@ -253,7 +253,7 @@ object PendingHistoryGrid extends Loggable {
     effectiveEvents.sortWith((ev1, ev2) => ev1.creationDate.isBefore(ev2.creationDate)).headOption match {
       case Some(deleted) =>
         <div style="padding: 10px 15px 0">
-          <i class="fa fa-exclamation-triangle warnicon" aria-hidden="true"></i>
+          <i class="fa fa-exclamation-triangle me-1" aria-hidden="true"></i>
           <h3> {
           s"This node was deleted on ${DateFormaterService.getDisplayDate(deleted.creationDate)} by ${deleted.principal.name}"
         }</h3>
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/SearchNodes.scala b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/SearchNodes.scala
index 2376392dfdd..57c4cc1e315 100644
--- a/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/SearchNodes.scala
+++ b/webapp/sources/rudder/rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/SearchNodes.scala
@@ -43,9 +43,9 @@ import com.normation.inventory.domain.NodeId
 import com.normation.rudder.domain.nodes.NodeGroup
 import com.normation.rudder.domain.nodes.NodeGroupId
 import com.normation.rudder.domain.nodes.NodeGroupUid
-import com.normation.rudder.domain.nodes.NodeInfo
 import com.normation.rudder.domain.policies.NonGroupRuleTarget
 import com.normation.rudder.domain.queries.Query
+import com.normation.rudder.facts.nodes.CoreNodeFact
 import com.normation.rudder.facts.nodes.QueryContext
 import com.normation.rudder.users.CurrentUser
 import com.normation.rudder.web.components.SearchNodeComponent
@@ -62,6 +62,7 @@ import net.liftweb.http.js.JsCmds.*
 import scala.xml.Elem
 import scala.xml.NodeSeq
 import scala.xml.NodeSeq.seqToNodeSeq
+import zio.json.*
 
 /**
  *
@@ -97,7 +98,7 @@ class SearchNodes extends StatefulSnippet with Loggable {
 
   val searchNodeComponent = new LocalSnippet[SearchNodeComponent] // init will be done in parseHash
 
-  var srvList: Box[Seq[NodeInfo]] = Empty
+  var srvList: Box[Seq[CoreNodeFact]] = Empty
 
   var dispatch: DispatchIt = {
     case "showQuery"   =>
@@ -125,7 +126,7 @@ class SearchNodes extends StatefulSnippet with Loggable {
     </head>
   }
 
-  private def setCreationPopup(query: Option[Query], serverList: Box[Seq[NodeInfo]]): Unit = {
+  private def setCreationPopup(query: Option[Query], serverList: Box[Seq[CoreNodeFact]]): Unit = {
     creationPopup.set(
       Full(
         new CreateCategoryOrGroupPopup(
@@ -138,7 +139,7 @@ class SearchNodes extends StatefulSnippet with Loggable {
               properties = Nil,
               query = query,
               isDynamic = true,
-              serverList = serverList.openOr(Seq[NodeInfo]()).map(_.id).toSet,
+              serverList = serverList.openOr(Seq[CoreNodeFact]()).map(_.id).toSet,
               _isEnabled = true,
               isSystem = false
             )
@@ -246,7 +247,7 @@ class SearchNodes extends StatefulSnippet with Loggable {
   private def updateQueryHash(button: Boolean, query: Option[Query]): JsCmd = {
     query match {
       case Some(q) =>
-        JsRaw(s"updateHashString('query', ${q.toJSONString})") // JsRaw ok, escaped
+        JsRaw(s"updateHashString('query', ${q.toJson})") // JsRaw ok, escaped
       case None    => Noop
     }
   }
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/_rudder-variables.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/_rudder-variables.scss
index 7c345f07a61..63def915cdd 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/_rudder-variables.scss
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/_rudder-variables.scss
@@ -53,8 +53,13 @@ $rudder-txt-light     : #36474E;
 $rudder-txt-link      : #1295C2;
 
 // --- BACKGROUNDS
-$rudder-bg-gray : #F8F9FC;
+$rudder-bg-light-gray : #F8F9FC;
+$rudder-bg-gray       : #EEF1F9;
+$rudder-bg-dark-gray  : #E1E5EB;
 
 // --- BORDERS
 $rudder-border-color-default : #D6DEEF;
 $rudder-border-color-danger  : #AC2925;
+
+// --- BOX-SHADOWS
+$rudder-box-shadow-color: #DCE3EF;
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-bootstrap.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-bootstrap.scss
index e941f9532d0..ccb9eeb01eb 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-bootstrap.scss
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-bootstrap.scss
@@ -88,7 +88,7 @@ $modal-md: 600px;
   }
   &.btn-danger,
   &.btn-default {
-    background-color: $rudder-bg-gray;
+    background-color: $rudder-bg-light-gray;
     border: 1px solid $rudder-border-color-default;
     color: $rudder-txt-primary;
     .fa{
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-database.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-database.scss
new file mode 100644
index 00000000000..9fbe84e06bb
--- /dev/null
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-database.scss
@@ -0,0 +1,113 @@
+/*
+*************************************************************************************
+* Copyright 2024 Normation SAS
+*************************************************************************************
+*
+* This file is part of Rudder.
+*
+* Rudder is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* In accordance with the terms of section 7 (7. Additional Terms.) of
+* the GNU General Public License version 3, the copyright holders add
+* the following Additional permissions:
+* Notwithstanding to the terms of section 5 (5. Conveying Modified Source
+* Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
+* Public License version 3, when you create a Related Module, this
+* Related Module is not considered as a part of the work and may be
+* distributed under the license agreement of your choice.
+* A "Related Module" means a set of sources files including their
+* documentation that, without modification of the Source Code, enables
+* supplementary functions or services in addition to those offered by
+* the Software.
+*
+* Rudder is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
+
+*
+*************************************************************************************
+*/
+// Modules
+@use 'rudder-variables' as *;
+
+.rudder-template > .one-col{
+  flex: 1;
+}
+.template-main{
+  flex-basis : initial !important;
+  flex: auto !important;
+}
+
+#reportFromDate, #deleteReports {
+  margin-left: 7px;
+  padding: 6px 12px;
+  border: 1px solid #dcdcdc;
+  border-radius: 4px;
+}
+#modeSelector{
+  margin: 15px 8px 0 0;
+  display: inline-block;
+}
+#modeSelector > li{
+  margin-bottom:0;
+  display:inline-block;
+}
+#modeSelector > li input{
+  display:none;
+}
+#modeSelector > li > label {
+  margin-bottom: 0;
+}
+#modeSelector > li > label span{
+  margin-bottom: 0;
+  padding: 6px 12px;
+  border-radius: 4px;
+  overflow: hidden;
+  border: 1px solid #dcdcdc;
+  background-color: #F8F9FC;
+  margin:0;
+  transition-duration:.2s;
+  opacity:.7;
+  cursor:pointer;
+}
+#modeSelector > li > label span:hover{
+  opacity:1;
+}
+#modeSelector > li:first-child > label span{
+  border-top-right-radius:0;
+  border-bottom-right-radius:0;
+  border-right-color:transparent;
+}
+#modeSelector > li:last-child > label span{
+  border-top-left-radius:0;
+  border-bottom-left-radius:0;
+  border-left-color:transparent;
+}
+#modeSelector > li > label input:checked + span{
+  opacity:1;
+  cursor:default;
+  color:#fff;
+}
+#modeSelector > li:last-child > label input:checked + span{
+  background-color: #DA291C;
+  border-color: #DA291C;
+}
+#modeSelector > li:first-child > label input:checked + span{
+  background-color: #3694d1;
+  border: 1px solid #2173a9;
+}
+
+.database-info-table {
+  width: auto;
+}
+
+.database-info-table td {
+  border: none !important;
+}
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-datatable.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-datatable.css
index 304afdba521..98726b91950 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-datatable.css
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-datatable.css
@@ -326,6 +326,10 @@ td.listclose:after {
   float: left;
   width: 100%;
 }
+table .innerDetails li{
+  word-break: break-all;
+  white-space: pre-wrap;
+}
 .dataTable > tbody > tr > td.details ul {
   margin-bottom: 0;
 }
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-directives.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-directives.scss
index fb9f2901442..bbbb59bb096 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-directives.scss
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-directives.scss
@@ -95,6 +95,40 @@
 #technicalDetails td{
   line-height: 1.2em;
 }
+.directiveTechnicalInfo{
+  padding-top: 12px;
+}
+.directiveInfo{
+   margin-left:10px;
+}
+.inlineml{
+  display:inline;
+  margin-left:3px;
+}
+.inlinenotop{
+  display:inline;
+  padding-top:0px;
+}
+.cpiefsave{
+  float:right;
+}
+
+.wbBaseField * {
+  vertical-align: middle;
+}
+
+.wbBaseField {
+  vertical-align: middle;
+  margin-top: 7px;
+}
+
+.wbBaseFieldLabel {
+  margin-top: 5px;
+}
+
+.wbBaseFieldLabel .tw-bs .ruddericon {
+    top: -2px;
+}
 #technicalDetails > .directiveTechnicalInfo:first-child{
   margin-top:0;
 }
@@ -301,6 +335,25 @@
   display: none !important;
 }
 
+table.directiveGroupDef, table.directiveVarDef, table.directiveSectionDef {
+  width:100%;
+  padding-left: 15px;
+}
+
+.directiveTitle {
+  font-weight:bold;
+}
+
+tr.parametersDescription {
+  background-color: #F8F9FC !important;
+  height: 30px;
+  border-top: 1px solid #d6deef !important;
+}
+
+.parametersDescriptionDetails {
+  padding:15px;
+}
+
 /* === OVERRIDE TEMPLATE === */
 .main-header.no-header,
 .main-header.no-header + .main-navbar{
@@ -325,10 +378,150 @@
   height: 31px;
 }
 
-
 /* === TECHNIQUE === */
 #versionTable > thead > tr > th:last-child,
 #versionTable > tbody > tr > td:last-child{
   display: table-cell !important;
 }
+.deprecatedTechniqueIcon {
+  margin-left : 3px;
+}
+
+
+/* === FOLDABLE SECTIONS === */
+.section-title {
+  font-size: 22px;
+  cursor: default;
+  background: none;
+  border-bottom: 2px solid #d6deef;
+  padding: 0 0 5px 0;
+  margin-bottom: 10px;
+  color: #041922;
+}
+.foldableSection div.section-title{
+  font-size: 20px;
+  border-bottom: 2px solid #d6deef;
+}
+.foldableSection.foldedSection div.section-title{
+  border-bottom-color: transparent;
+}
+.foldedSection .section-title,
+.foldableSection div.section-title,
+.unfoldedSection .section-title,
+#querySearchSection{
+  cursor: pointer;
+}
+
+.foldableSection .section-title .btn{
+  padding: 2px 10px;
+  margin-left: 10px;
+  position: relative;
+}
+.foldableSection .section-title .btn .fa{
+  margin-left: 4px;
+}
+
+div.unfoldedSection div.section-title:before,div.foldedSection div.section-title:before,
+#querySearchSection:before{
+  content: "\f0da";
+  display: inline-block;
+  position: relative;
+  top: 2px;
+  margin-right: 10px;
+  font: normal normal normal 14px/1 inherit;
+  font-family: "Font Awesome 5 Free";
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  opacity: .6;
+  transition-duration: .2s;
+  font-weight: 900;
+}
+
+.foldableSection .foldableSection > .section-title{
+  border-bottom: none;
+  color: #041922DD;
+  margin-bottom: 8px;
+  transition-duration: .2s;
+  cursor: pointer;
+}
+.foldableSection .foldableSection > .section-title:before{
+  opacity: 0.4;
+}
+
+.sectionFieldset.foldableSection{
+  position:relative;
+  transition-duration: .2s;
+  padding-left: 10px;
+}
+.sectionFieldset.foldableSection:before{
+  content:"";
+  position: absolute;
+  top: 30px;
+  bottom: 0;
+  left: 12.5px;
+  width: 2px;
+  background-color: #d6deef;
+  transition: background-color .2s;
+}
+.sectionFieldset.foldableSection.unfoldedSection:hover:before{
+  background-color: #13beb7;
+}
+.sectionFieldset.foldableSection.foldedSection:hover:before{
+  background-color: #aaa;
+}
+
+
+.sectionFieldset.foldableSection table.directiveSectionDef{
+  margin-left: 15px;
+  width: calc(100% - 15px);
+}
+table.directiveGroupDef{
+  border-left: 2px solid #d6deef;
+  transition: border-left-color .2s;
+}
+table.directiveGroupDef:hover{
+  border-left-color: #13beb7;
+}
+
+div.unfoldedSection div.section-title:before,
+#querySearchSection.unfoldedSectionQuery:before{
+  -webkit-transform:rotate(90deg);
+  -ms-transform:rotate(90deg);
+  -moz-transform:rotate(90deg);
+  -o-transform:rotate(90deg);
+  transform:rotate(90deg);
+}
+
+div.foldedSection div.section-title:before {
+  -webkit-transform:rotate(0deg);
+  -ms-transform:rotate(0deg);
+  -moz-transform:rotate(0deg);
+  -o-transform:rotate(0deg);
+  transform:rotate(0deg);
+}
+
+.foldedSection table, .foldedSection div {
+  display:none;
+}
+
+.foldedSection div.section-title {
+  display:block;
+}
+
+table.directiveSectionDef {
+  margin-bottom: 16px;
+}
+
+td.directiveVarValue  {
+  width:70%;
+  margin-right:2px;
+}
+.textareaField {
+  height: 300px;
+}
 
+.groupDiv {
+   margin-top: 5px;
+   margin-bottom: 10px;
+}
\ No newline at end of file
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-eventlogs.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-eventlogs.scss
new file mode 100644
index 00000000000..bc7db084b7d
--- /dev/null
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-eventlogs.scss
@@ -0,0 +1,107 @@
+/*
+*************************************************************************************
+* Copyright 2024 Normation SAS
+*************************************************************************************
+*
+* This file is part of Rudder.
+*
+* Rudder is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* In accordance with the terms of section 7 (7. Additional Terms.) of
+* the GNU General Public License version 3, the copyright holders add
+* the following Additional permissions:
+* Notwithstanding to the terms of section 5 (5. Conveying Modified Source
+* Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
+* Public License version 3, when you create a Related Module, this
+* Related Module is not considered as a part of the work and may be
+* distributed under the license agreement of your choice.
+* A "Related Module" means a set of sources files including their
+* documentation that, without modification of the Source Code, enables
+* supplementary functions or services in addition to those offered by
+* the Software.
+*
+* Rudder is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
+
+*
+*************************************************************************************
+*/
+
+// Modules
+@use 'rudder-variables' as *;
+
+
+.rudder-template > .one-col{
+  flex: 1;
+}
+.template-main{
+  flex-basis : initial !important;
+  flex: auto !important;
+}
+pre.technical-details{
+  white-space: pre-wrap;
+  border: 1px solid #D6DEEF;
+  border-radius: 4px;
+  background-color: #F8F9FC;
+  padding: 4px;
+}
+#filterLogs {
+  margin-top: 10px;
+  color: #738195;
+}
+.btn.showParameters{
+  margin-bottom: 10px;
+  min-width: 195px;
+}
+.dataTables_filter label input{
+  margin-left: 8px;
+}
+#filterLogs button{
+  width: auto;
+  outline:none;
+}
+#filterLogs .form-control.input-xs{
+  display:inline;
+  height: 25px;
+  margin: 0 5px;
+  width: 140px !important;
+}
+#filterLogs .form-control.input-xs:focus {
+  border-color: #c1c1c1;
+  outline: 0;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(208, 208, 208, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgb(208, 208, 208);
+}
+.rollbackFieldSet {
+  min-width : 520px;
+  text-align : center;
+}
+.evlogviewpad {
+  padding:5px;
+}
+.evlogviewpad li{
+  list-style-type: disc;
+}
+.evloglmargin{
+  margin: 7px 0;
+}
+li.eventLogUpdatePolicy {
+  list-style-position: inside;
+  list-style-type: none;
+}
+table.eventLogUpdatePolicy {
+  width: 50%;
+  margin-top: 0px;
+  margin-left: 0px;
+}
+.diffOldValue {
+  text-decoration:line-through;
+}
\ No newline at end of file
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-groups.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-groups.scss
index c7cd81a9b75..1aa42c3868c 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-groups.scss
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-groups.scss
@@ -191,6 +191,7 @@ label.radio-inline:hover > span {
 }
 .align-radio-generate-input span{
   vertical-align: initial;
+  display:inline-block;
 }
 
 .toggle-cond{
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-hooks.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-hooks.scss
index 6cc9c36ed6c..bd325b441ce 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-hooks.scss
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-hooks.scss
@@ -83,7 +83,7 @@
 
   & > li{
     padding: 8px;
-    background-color: $rudder-bg-gray;
+    background-color: $rudder-bg-light-gray;
     border-radius: 5px;
     margin-bottom: 6px;
     font-size: 14px;
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-jstree.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-jstree.scss
new file mode 100644
index 00000000000..85b8f65f642
--- /dev/null
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-jstree.scss
@@ -0,0 +1,131 @@
+/*
+*************************************************************************************
+* Copyright 2024 Normation SAS
+*************************************************************************************
+*
+* This file is part of Rudder.
+*
+* Rudder is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* In accordance with the terms of section 7 (7. Additional Terms.) of
+* the GNU General Public License version 3, the copyright holders add
+* the following Additional permissions:
+* Notwithstanding to the terms of section 5 (5. Conveying Modified Source
+* Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
+* Public License version 3, when you create a Related Module, this
+* Related Module is not considered as a part of the work and may be
+* distributed under the license agreement of your choice.
+* A "Related Module" means a set of sources files including their
+* documentation that, without modification of the Source Code, enables
+* supplementary functions or services in addition to those offered by
+* the Software.
+*
+* Rudder is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
+
+*
+*************************************************************************************
+*/
+// Modules
+@use 'rudder-variables' as *;
+
+#categoryTree.jstree-rudder a {
+  vertical-align: middle;
+}
+
+.treeActiveTechniqueName,
+.treeActiveTechniqueCategoryName,
+.treeRuleCategoryName,
+ i.jstree-icon.jstree-themeicon.fa.fa-file-text.jstree-themeicon-custom {
+  color: #555
+}
+
+ins.jstree-icon {
+  float: left;
+}
+
+a > .jstree-icon{
+  background-position: 0!important;
+}
+
+.jstree-default {
+  .jstree-node {
+    min-height: 20px;
+    line-height: 20px;
+    margin-left: 20px;
+    min-width: 20px;
+  }
+
+  .jstree-anchor {
+    line-height: 20px;
+    height: 20px;
+
+    & > .jstree-themeicon {
+      margin-right: 0px;
+    }
+  }
+
+  .jstree-icon {
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+
+    &:empty {
+      width: 20px;
+      height: 20px;
+      line-height: 20px;
+    }
+  }
+
+  .jstree-wholerow {
+    height: 20px;
+  }
+}
+
+.jstree{
+  a.jstree-anchor,
+  a.jstree-anchor:hover,
+  a.jstree-anchor:focus,
+  a.jstree-anchor:active {
+    white-space: normal !important;
+    height: auto;
+    padding: 1px 2px;
+    text-decoration: none;
+  }
+  a.jstree-anchor .categoryAction,
+  a.jstree-anchor .treeActions  {
+    opacity: 0.2;
+    cursor: pointer !important;
+    font-size: 20px !important;
+  }
+  a.jstree-anchor:hover .categoryAction,
+  a.jstree-anchor:hover .treeActions  {
+    opacity: .7;
+  }
+  a.jstree-anchor:hover .categoryAction,
+  a.jstree-anchor .treeActions:hover {
+    opacity: 1 !important;
+  }
+
+  .fa.jstree-icon {
+    color : #999
+  }
+  .fa.fa-gear, .fa.fa-folder {
+    position: relative;
+    top: 1px;
+  }
+}
+
+.treeActions-container {
+  display: inline-block;
+  position: relative;
+  top: 1px;
+}
\ No newline at end of file
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-main.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-main.scss
index 8858f92bf8c..fe89cd1001e 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-main.scss
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-main.scss
@@ -49,6 +49,15 @@ a{
 ul {
   padding-left: 0;
 }
+
+/* === UTILS === */
+.cursorPointer {
+  cursor:pointer !important;
+}
+
+.text-warning-rudder {
+  color : $rudder-warning
+}
 /*=== FONT AWESOME 5 MISSING ICONS FIX ===*/
 .fa{
   font-weight: bold;
@@ -390,6 +399,10 @@ pre.json-beautify code.elmsh {
   vertical-align: middle;
   display: inline-block;
 }
+
+.searchNodes tr > td:first-child {
+  padding-left: 0;
+}
 /* --- ACCEPT NEW NODES --- */
 .action-btns{
   float: left;
@@ -426,7 +439,7 @@ pre.json-beautify code.elmsh {
   color:#555;
 }
 .text-warning-rudder{
-  color: #EF9600;
+  color: $rudder-warning;
 }
 .text-danger-rudder{
   color: #C50000;
@@ -493,7 +506,7 @@ pre.json-beautify code.elmsh {
   content: "DISABLED";
 }
 .badge-expired {
-  background-color: #ef9600;
+  background-color: $rudder-warning;
 }
 .badge-expired:before {
   content: "EXPIRED";
@@ -867,18 +880,18 @@ pre.json-beautify code.elmsh {
 }
 /* --- WARNING --- */
 .callout-fade.callout-warning{
-  border-left-color: #EF9600;
+  border-left-color: $rudder-warning;
   background-color: #fefcf7;
 }
 .callout-fade.callout-warning h4,.callout-fade.callout-warning b{
-  color: #EF9600;
+  color: $rudder-warning;
 }
 .callout-fade.callout-warning div.marker{
-  background-color: #EF9600;
+  background-color: $rudder-warning;
 }
 .callout-fade.callout-warning .actions .btn-action{
   color: #fff;
-  background-color: #EF9600;
+  background-color: $rudder-warning;
   border-color: #ca6a00;
 }
 .callout-fade.callout-warning .actions .btn-action:hover{
@@ -957,7 +970,7 @@ pre.json-beautify code.elmsh {
 }
 /* WARNING */
 .group-button.group-warning button.btn{
-  background-color: #EF9600;
+  background-color: $rudder-warning;
 }
 /*
 *-----------------------------------------
@@ -983,10 +996,10 @@ pre.json-beautify code.elmsh {
   background-color: #1b809e;
 }
 .small-box.bg-fade-3 .icon {
-  color:#EF9600;
+  color:$rudder-warning;
 }
 .small-box.bg-fade-3 .small-box-footer {
-  background-color: #EF9600;
+  background-color: $rudder-warning;
 }
   .small-box.bg-fade-4 .icon {
   color:#c50000  ;
@@ -1405,7 +1418,7 @@ form.rudder-form .policymode-group .btn-group .btn.enforce.active{
   background-color: #13BEB7;
 }
 .message.message-warning{
-  background-color: #EF9600;
+  background-color: $rudder-warning;
 }
 .rudder-form .validation-form-message .message.success{
   opacity: 1;
@@ -1426,7 +1439,7 @@ form.rudder-form .policymode-group .btn-group .btn.enforce.active{
   border-left: 14px solid #13BEB7;
 }
 .rudder-form .validation-form-message .message.message-warning.success:after {
-  border-left: 14px solid #EF9600 ;
+  border-left: 14px solid $rudder-warning ;
 }
 
 /* RADIO BUTTONS + CHECKBOX */
@@ -1460,7 +1473,7 @@ form.rudder-form .policymode-group .btn-group .btn.enforce.active{
 }
 .bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-primary, .bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-primary {
   color: #fff;
-  background: #EF9600;
+  background: $rudder-warning;
 }
 .label-switch{
   margin-left: 8px;
@@ -1673,7 +1686,7 @@ hr.separation{
 #submitAllowedNetwork{
   margin-top:10px;
 }
-#allowNetworkFields .bs-text-danger{
+#allowNetworkFields .text-danger{
   height: 30px;
   padding: 5px 10px;
   line-height: 1.5;
@@ -1697,6 +1710,9 @@ hr.separation{
   width:100%;
   margin-bottom:15px;
 }
+input.deleteNetwork * {
+  padding: 0 !important;
+}
 .delete input.deleteNetwork.btn {
   width:20px;
   padding:0;
@@ -1902,6 +1918,10 @@ ul > li.rudder-form > .input-group.disabled *{
   margin: 0;
   cursor: pointer;
 }
+.radioTextLabel {
+  margin-right:6px;
+  margin-left:3px;
+}
 .wbBaseField.form-group .switch label.radio-inline input + .radioTextLabel{
   display: inline-block;
   min-width: 75px;
@@ -2072,7 +2092,7 @@ h3.box-title {
 
 /* DEPRECATION */
 .deprecation-icon {
-  color: #EF9600;
+  color: $rudder-warning;
   top: -5px;
   left: -3px;
   position: relative;
@@ -2154,7 +2174,7 @@ span.techversion {
 .fa.warnicon{
   margin-left:8px;
   font-size:32px;
-  color:#EF9600;
+  color:$rudder-warning;
 }
 #confirmDeletion .fa.warnicon{
   font-size: 22px;
@@ -2173,6 +2193,36 @@ table a > i.fa-pencil:hover{
 }
 /* RULES TABLE */
 
+/* CHART.JS */
+#chartjs-tooltip {
+  opacity: 1;
+  position: fixed !important;
+  background: rgba(0, 0, 0, .7);
+  color: white;
+  border-radius: 3px;
+  -webkit-transition: all .1s ease;
+  transition: all .1s ease;
+  pointer-events: none;
+  -webkit-transform: translate(-50%, 10px);
+  transform: translate(-50%, 10px);
+  z-index: 500;
+  max-width: unset;
+  padding: 10px !important;
+
+  ul {
+    margin-bottom: 0;
+  }
+  h4 {
+    font-size: 16px;
+    white-space: pre;
+    margin-top: 0;
+  }
+}
+.chartjs-tooltip-key {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+}
 
 /* DATEPICKERS */
 #ui-datepicker-div{
@@ -2181,16 +2231,17 @@ table a > i.fa-pencil:hover{
   border: 1px solid #ccc;
 }
 .ui-datepicker {
-    width: 17em;
-    padding: .2em .2em 0;
-    display: none
-}
+  width: 17em;
+  padding: .2em .2em 0;
+  display: none;
 
-.ui-datepicker .ui-datepicker-header {
+  .ui-datepicker-header {
     position: relative;
     padding: .2em 0;
+  }
 }
 
+
 .ui-datepicker .ui-datepicker-prev,
 .ui-datepicker .ui-datepicker-next {
     position: absolute;
@@ -2834,7 +2885,46 @@ $node-logo-size: 50px;
     background-image: url(../../images/os/freebsd-logo.svg);
   }
 }
+/* OLD COLUMN SYSTEM */
+.twoCol {
+  float:left;
+  width:67%;
+}
+.threeCol {
+  float:left;
+  width:30%;
+  margin-right: 4px;
+}
+.largeCol {
+  float:left;
+  margin-right: 2px;
+  width:60%;
+}
+
+/* LOADER */
+.ajaxloader{
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  text-align:center;
+  padding:10px;
+  margin-left: -40px;
+  margin-top: -40px;
+  z-index:9999;
+  display:none;
+}
 
+.svg-loading{
+  height:25px;
+  width:25px;
+  padding: 0 !important;
+}
+
+.svg-loader{
+  height:40px;
+  width:40px;
+  padding: 0 !important;
+}
 /* KEYFRAMES */
 @-webkit-keyframes text-radio-on {
   0%   {color: #646464;}
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-menu.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-menu.scss
index 1a4a829da0c..a8663f8ef1a 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-menu.scss
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-menu.scss
@@ -35,6 +35,8 @@
 *************************************************************************************
 */
 
+@use 'rudder-variables' as *;
+
 @import "../../node_modules/bootstrap/scss/functions";
 @import "../../node_modules/bootstrap/scss/variables";
 @import "../../node_modules/bootstrap/scss/mixins";
@@ -101,7 +103,7 @@ $navbar-hover-color : #F4F4F4;
   height: 50px;
   border-radius: 0;
   background-color: #fff;
-  box-shadow: 4px 4px 10px #dce3efb0;
+  box-shadow: 4px 4px 10px $rudder-box-shadow-color;
 }
 
 .modal-open {
@@ -175,7 +177,6 @@ header.main-header .logo-mini img{
   height: 100%;
 }
 header.main-header .logo-lg img{
-  width: 100%;
   max-height: 40px;
   vertical-align: middle;
 }
@@ -1093,6 +1094,10 @@ header.main-header .logo-lg img{
   right: calc(.8em + 8px);
   text-align: center;
 }
+#generation-status .fa {
+  top: 0;
+  font-size : 11px;
+}
 .navbar .navbar-nav li.notifications-menu > a .fa-heartbeat{
   font-size: 18px;
 }
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-node.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-node.scss
index 061c6712901..bc1366debbd 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-node.scss
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-node.scss
@@ -63,6 +63,31 @@
   font-size: 24px !important;
 }
 
+/* === NODE SEARCH === */
+.compositionCheckbox input {
+  margin-left : 5px;
+  vertical-align: middle;
+  margin-bottom: 2px;
+}
+.composition input {
+  vertical-align: middle;
+}
+form select.selectComparator {
+   width: 150px;
+}
+form select.selectField {
+   width: 220px;
+}
+.content-wrapper input.queryInputValue, .content-wrapper select.queryInputValue {
+  width:280px;
+}
+/* ========= */
+
+#node-compliance-intro {
+  padding: 10px 15px;
+  margin: 10px 0;
+}
+
 #nodeHeaderInfo {
   display: flex;
   gap: 8px;
@@ -80,9 +105,6 @@
   flex: 70;
   padding: 0 15px 0 0;
 }
-.details .tabs > .ui-tabs-panel {
-  padding: 10px 15px;
-}
 
 #nodeGroups {
   flex: 30;
@@ -101,7 +123,7 @@
   padding: 15px 15px 10px !important;
   margin: 0;
   font-size: 1.3rem;
-  background-color: $rudder-bg-gray;
+  background-color: $rudder-bg-light-gray;
   border-bottom: 1px solid $rudder-border-color-default;
 }
 
@@ -256,7 +278,7 @@ pre.display-keys{
   border-top-left-radius: 0;
   border: 1px solid $rudder-border-color-default;
   border-radius: 0px 4px 4px 4px;
-  background-color: $rudder-bg-gray;
+  background-color: $rudder-bg-light-gray;
   display: inline-block;
 }
 pre.display-keys > label:first-child{
@@ -278,7 +300,6 @@ pre.display-keys > label{
   width: 100%;
   padding-bottom: 40px;
 }
-
 /* INVENTORY TAB */
 .sInventory .tab-pane > .alert:first-child{
   margin-top: 0;
@@ -297,7 +318,7 @@ pre.display-keys > label{
   & > .nav-item {
     & > button {
       transition-duration: .2s;
-      background-color: $rudder-bg-gray;
+      background-color: $rudder-bg-light-gray;
       border: 1px solid $rudder-border-color-default;
       padding: 6px 10px;
       color: $rudder-txt-secondary;
@@ -417,3 +438,87 @@ pre.display-keys > label{
 .errorSaving > .fa{
   margin-right:8px;
 }
+
+/* --- */
+
+div.serverDetail {
+  font-weight:bold;
+  text-align:center;
+}
+#serverDetails{
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  overflow: hidden;
+}
+.query-search-message, #querySearchSection, #query-search-content, #querySearchInfo{
+  display:none !important;
+}
+.rudder-template .one-col .template-main .main-details{
+  padding-bottom: 0;
+}
+#logsDetails{
+  margin-bottom: 50px;
+}
+
+.reportLine {
+  background: url("../../images/tableau/fdTaboHead.jpg") repeat-x scroll left top transparent;
+  color: #FFFFFF;
+  float: left;
+  margin-top: 4px;
+  padding: 5px;
+}
+@media screen and (min-width: 993px) {
+  #reportsGrid tr>th:last-child,#reportsGrid tr>td:last-child,
+  #nodeReportsGrid tr>th:last-child,#nodeReportsGrid tr>td:last-child{
+    width:350px!important;
+    white-space:nowrap;
+  }
+}
+@media screen and (max-width: 992px) {
+  #reportsGrid tr>th:last-child,#reportsGrid tr>td:last-child,
+  #nodeReportsGrid tr>th:last-child,#nodeReportsGrid tr>td:last-child{
+    width:300px !important;
+    white-space:nowrap;
+  }
+}
+@media screen and (max-width: 768px) {
+  #reportsGrid tr>th:last-child,#reportsGrid tr>td:last-child,
+  #nodeReportsGrid tr>th:last-child,#nodeReportsGrid tr>td:last-child{
+    width:50% !important;
+    white-space:nowrap;
+  }
+}
+#reportsGrid tr>th:last-child,#reportsGrid tr>td:last-child,
+#nodeReportsGrid tr>th:last-child,#nodeReportsGrid tr>td:last-child{
+  width:auto !important;
+  white-space: normal;
+}
+
+.border-fail {
+  border-left-width: 5px;
+  border-left-style: solid;
+  border-left-color: #c9302c;
+  border-radius: 5px;
+}
+.border-success {
+  border-left-width: 5px;
+  border-left-style: solid;
+  border-left-color: #13BEB7;
+  border-radius: 5px;
+}
+
+.btn-state {
+  width:128px;
+  height:40px;
+}
+.btn-trigger {
+  min-width:150px;
+  height:40px;
+}
+.fa-times-custom {
+  color: #c9302c;
+}
+.fa-check-custom {
+  color: #13BEB7;
+}
\ No newline at end of file
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-plugins.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-plugins.css
index a633f84692e..c088fff6af3 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-plugins.css
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-plugins.css
@@ -95,4 +95,19 @@
 
 .rudder-package-doc {
   margin-top: 25px;
+}
+
+.pluginpadd{
+  padding: 0 10px;
+}
+
+.badge-plugin-version{
+  margin-left:15px;
+  display: inline-block;
+  background-color: #FFEAD1;
+  color: #EF9600;
+  padding: 5px;
+  border-radius: 3px;
+  font-size:12px;
+  font-weight:bold;
 }
\ No newline at end of file
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-rules.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-rules.css
index 302aa4983d0..77111724788 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-rules.css
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-rules.css
@@ -85,7 +85,10 @@ label.rule-info + div{
   font-weight:normal;
   font-size:12px;
 }
-
+#grid_rules_grid_zone {
+  width: 100%;
+  table-layout: fixed;
+}
 .recentChange_refresh{
   float: right;
   position: absolute;
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-technique-editor.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-technique-editor.scss
similarity index 91%
rename from webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-technique-editor.css
rename to webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-technique-editor.scss
index 4070f73f8ca..23626512516 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-technique-editor.css
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-technique-editor.scss
@@ -1,6 +1,6 @@
 /*
 *************************************************************************************
-* Copyright 2020 Normation SAS
+* Copyright 2024 Normation SAS
 *************************************************************************************
 *
 * This file is part of Rudder.
@@ -35,6 +35,9 @@
 *************************************************************************************
 */
 
+// --- MODULES
+@use 'rudder-variables' as *;
+
 /* =====  GENERAL  ===== */
 .btn.btn-dsc.active{
   color: #fff !important;
@@ -152,12 +155,7 @@
 body > .container-fluid {
 	padding: 0 !important;
 }
-.col-techniques,
-.col-methods {
-  transition-duration: .15s;
-  transition-timing-function: ease;
-  overflow: hidden;
-}
+
 .label-checkbox{
   color: #041922;
   cursor: pointer;
@@ -198,98 +196,6 @@ body > .ng-toast {
 }
 
 /* ===== TECHNIQUES & METHODS ===== */
-.show-methods .col-techniques,
-.show-techniques .col-methods{
-  -ms-flex: 0 0 50px;
-  flex: 0 0 50px;
-  background-color: #dedada;
-  cursor: pointer;
-}
-.show-methods .col-techniques::before,
-.show-techniques .col-methods::before{
-  content: "";
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  opacity: 0;
-  transition-property: opacity;
-  transition-duration: .2s;
-  z-index: -1;
-  box-shadow: 2px 0px 8px 0px #00000010;
-}
-.show-methods .col-techniques:hover::before,
-.show-techniques .col-methods:hover::before{
-  opacity: 1;
-}
-.show-methods .col-techniques::after,
-.show-techniques .col-methods::after{
-  content: "\f0c9";
-  display: inline-block;
-  font: normal normal normal 14px/1 inherit;
-  font-family: "Font Awesome 5 Free";
-  font-size: inherit;
-  text-rendering: auto;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  line-height: 1;
-  font-weight: 900;
-  display: block;
-  position: absolute;
-  top: 15px;
-  right: 16.25px;
-  opacity: .5;
-  font-size: 20px;
-  transition-duration: .2s;
-  transition-property: opacity;
-  font-weight: 900;
-}
-.show-techniques .col-techniques:hover::after,
-.show-methods .col-methods:hover::after{
-  opacity: .8;
-}
-.col-techniques > .row,
-.col-methods > .row,
-.methods .method {
-  margin: 0;
-  transition-duration: .4s;
-  transition-property: transform, opacity;
-  transition-timing-function: ease;
-}
-.col-methods .filters-container{
-  flex-direction: column;
-  padding: 10px;
-}
-
-.col-methods .filters-container .input-group > .input-group-text:first-child{
-  border-top-left-radius : 4px;
-  border-bottom-left-radius : 4px;
-  background-color: #ededed;
-  border-color: #D6DEEF;
-}
-.col-methods .filters-container .input-group > .input-group-text + .form-control {
-  display: flex;
-  align-items: center;
-}
-
-.show-methods .col-techniques > div,
-.show-techniques .col-methods > div{
-  opacity: 0;
-}
-.col-techniques .input-group,
-.col-methods .input-group{
-  padding-top: 10px;
-  padding-bottom: 10px;
-  width: 100%;
-}
-.show-techniques .col-methods .input-group .btn{
-  margin-left: 15px;
-}
-.show-methods .col-techniques > div{
-  transform: translateX(-50px);
-  pointer-events: none;
-}
 .dndPlaceholder{
   margin: 10px 0;
   padding: 15px;
@@ -299,9 +205,6 @@ body > .ng-toast {
   background-color: #F8F9FC;
 }
 /* ===== TECHNIQUES ===== */
-.col-techniques{
-  box-shadow: 2px 0px 8px 0px #00000024;
-}
 .col-techniques label.btn{
   margin-bottom: 0;
 }
@@ -967,7 +870,7 @@ button.btn.clipboard:hover {
   padding-top: 10px;
 }
 
-.show-techniques .col-methods > div{
+.show-left .col-methods > div{
   transform: translateX(50px);
 }
 
@@ -1102,7 +1005,7 @@ ul li.hide-method {
   word-break: keep-all;
 }
 .method .cursorMove {
-  background-color: #e1e5eb;
+  background-color: $rudder-bg-dark-gray;
   padding: 0 10px;
   color: #04192299;
   display: flex;
@@ -1162,7 +1065,7 @@ ul li.hide-method {
   background-color: #d1a9dd;
 }
 
-.method .method-info .method-condition:not(.visually-hidden) ~ div:before,
+.method .method-info .method-condition:not(.d-none) ~ div:before,
 .card-method.active > .method > .method-info.condition > .block-name-container:before,
 .card-method.active > .method > .method-info.condition > .method-details:before,
 .card-method:not(.active) > .method > .method-info.condition .method-condition:before,
@@ -1181,8 +1084,8 @@ ul li.hide-method {
 .card-method.showMethodCall .method .method-info .method-condition{
   padding-left: 10px;
 }
-.method .method-info .method-condition:not(.visually-hidden),
-.method .method-info .method-condition.visually-hidden ~ .method-name{
+.method .method-info .method-condition:not(.d-none),
+.method .method-info .method-condition.d-none ~ .method-name{
   padding-top: 25px;
 }
 .method .method-info.closed .method-param{
@@ -1627,7 +1530,7 @@ ul li.hide-method {
 .gm-labels .gm-label.gm-label-name,
 .gm-labels .gm-label.gm-label-default{
   color: #041922;
-  background-color:#e1e5eb;
+  background-color: $rudder-bg-dark-gray;
 }
 
 
@@ -1645,13 +1548,13 @@ ul li.hide-method {
   background-color:#da291c;
   color: #ffffff;
 }
-.method-info .method-condition:not(.visually-hidden) + .method-name .gm-label-name{
+.method-info .method-condition:not(.d-none) + .method-name .gm-label-name{
   top: -26px;
 }
-.method-info:not(.closed) .method-condition:not(.visually-hidden) + .method-name .gm-label-name{
+.method-info:not(.closed) .method-condition:not(.d-none) + .method-name .gm-label-name{
   top: -40px;
 }
-.method-info.closed .method-condition.visually-hidden + .method-name .gm-label-name{
+.method-info.closed .method-condition.d-none + .method-name .gm-label-name{
   top: -2px;
 }
 .reporting-checkbox {
@@ -1707,3 +1610,7 @@ textarea.yaml-editor {
   width: 100%;
   margin-top: 10px;
 }
+
+pre.command-output{
+  white-space: break-spaces;
+}
\ No newline at end of file
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-template.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-template.scss
index 6566d350451..c5889911e0b 100644
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-template.scss
+++ b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-template.scss
@@ -35,7 +35,6 @@
 */
 
 // --- MODULES
-
 @use 'rudder-variables' as *;
 
 /* === RESET === */
@@ -107,7 +106,7 @@ ul {
 }
 .main-details .well{
   padding: 6px 12px;
-  background-color: $rudder-bg-gray;
+  background-color: $rudder-bg-light-gray;
   border: 1px solid #d6deef;
   box-shadow: none !important;
 }
@@ -154,9 +153,9 @@ ul {
   justify-content: space-between;
 }
 .rudder-template .header-title .title-icon{
-  opacity: .4;
   font-size: 0.8em;
   margin-right: 8px;
+  color: $rudder-txt-secondary;
 }
 .rudder-template .header-title h1{
   padding: 0;
@@ -191,7 +190,7 @@ ul {
     }
 
     &:hover{
-      background-color: $rudder-bg-gray;
+      background-color: $rudder-bg-light-gray;
 
       .ion-clipboard{
         opacity: 1;
@@ -252,7 +251,7 @@ ul {
 .header-buttons .dropdown-menu > li > a:hover,
 .gm-labels .dropdown-menu > li > a:hover {
   color: #041922;
-  background-color: $rudder-bg-gray;
+  background-color: $rudder-bg-light-gray;
 }
 .header-buttons .dropdown-menu > li > a.action-success,
 .gm-labels .dropdown-menu > li > a.action-success {
@@ -331,7 +330,7 @@ ul {
 
 .header-buttons .dropdown-menu.dropdown-message {
   padding: 10px;
-  background-color: $rudder-bg-gray;
+  background-color: $rudder-bg-light-gray;
   border: 1px solid $rudder-border-color-default;
   width: 450px;
   font-size: 14px;
@@ -393,12 +392,12 @@ ul {
 .badge-resources > .nb-resources.del:before {
   content: "-";
 }
-.col-techniques .badge-resources{
+.sidebar-left .badge-resources{
   margin-left: 4px;
   position: relative;
   top: -2px;
 }
-.col-techniques .badge-resources > span {
+.sidebar-left .badge-resources > span {
   font-size: 10px;
   padding: 4px;
   min-width: 22px;
@@ -419,18 +418,126 @@ ul {
   background-color: #fff;
   position: relative;
   z-index: 1;
-  box-shadow: 8px 0px 10px -10px #00000050;
+  box-shadow: -8px 0px 10px 10px $rudder-box-shadow-color;
 }
 .rudder-template .template-sidebar.sidebar-right{
-  box-shadow: 8px 0px 10px 10px #00000050;
+  box-shadow: 8px 0px 10px 10px $rudder-box-shadow-color;
 }
 #headerBar ~ .content-wrapper .rudder-template .template-sidebar{
   height: calc(100VH - 80px);
 }
 .rudder-template .template-sidebar .sidebar-header{
-  padding: 15px 15px 0 15px;
+  padding: 15px;
   border-bottom: 2px solid #d6deef;
 }
+
+/* ============================== */
+.template-sidebar {
+  transition-duration: .15s;
+  transition-timing-function: ease;
+  overflow: hidden;
+}
+
+.show-right .sidebar-left,
+.show-left .sidebar-right,
+.hide-right .sidebar-right{
+  -ms-flex: 0 0 50px;
+  flex: 0 0 50px;
+  background-color: $rudder-bg-dark-gray;
+  cursor: pointer;
+}
+.show-right .sidebar-left::before,
+.show-left .sidebar-right::before,
+.hide-right .sidebar-right::before{
+  content: "";
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  opacity: 0;
+  transition-property: opacity;
+  transition-duration: .2s;
+  z-index: -1;
+  box-shadow: 2px 0px 8px 0px #00000010;
+}
+.show-right .sidebar-left:hover::before,
+.show-left .sidebar-right:hover::before,
+.hide-right .sidebar-right:hover::before{
+  opacity: 1;
+}
+.show-right .sidebar-left::after,
+.show-left .sidebar-right::after,
+.hide-right .sidebar-right::after{
+  content: "\f0c9";
+  display: inline-block;
+  font: normal normal normal 14px/1 inherit;
+  font-family: "Font Awesome 5 Free";
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  line-height: 1;
+  font-weight: 900;
+  display: block;
+  position: absolute;
+  top: 15px;
+  right: 16.25px;
+  opacity: .5;
+  font-size: 20px;
+  transition-duration: .2s;
+  transition-property: opacity;
+  font-weight: 900;
+}
+.show-left .sidebar-left:hover::after,
+.show-right .sidebar-right:hover::after{
+  opacity: .8;
+}
+.sidebar-left > .row,
+.sidebar-right > .row,
+.methods .method {
+  margin: 0;
+  transition-duration: .4s;
+  transition-property: transform, opacity;
+  transition-timing-function: ease;
+}
+.sidebar-right .filters-container{
+  flex-direction: column;
+  padding: 10px;
+}
+
+.sidebar-right .filters-container .input-group > .input-group-text:first-child{
+  border-top-left-radius : 4px;
+  border-bottom-left-radius : 4px;
+  background-color: #ededed;
+  border-color: #D6DEEF;
+}
+.sidebar-right .filters-container .input-group > .input-group-text + .form-control {
+  display: flex;
+  align-items: center;
+}
+
+.show-right .sidebar-left > div,
+.show-left .sidebar-right > div,
+.hide-right .sidebar-right > div{
+  opacity: 0;
+}
+.sidebar-left .input-group,
+.sidebar-right .input-group{
+  padding-bottom: 10px;
+  width: 100%;
+}
+.show-left .sidebar-right .input-group .btn,
+.hide-right .sidebar-right .input-group .btn{
+  margin-left: 15px;
+}
+.show-right .sidebar-left > div{
+  transform: translateX(-50px);
+  pointer-events: none;
+}
+
+/* ============================== */
+
 .rudder-template .header-filter{
   margin: 10px 0;
   display: flex;
@@ -461,7 +568,7 @@ ul {
   margin: 0 -15px;
   padding: 15px;
   border-top: 1px solid #d6deef;
-  background-color: $rudder-bg-gray;
+  background-color: $rudder-bg-light-gray;
   position: relative;
   display: flex;
 }
@@ -481,7 +588,7 @@ ul {
   transform: rotate(45deg);
   top: -6px;
   right: 24px;
-  background-color: $rudder-bg-gray;
+  background-color: $rudder-bg-light-gray;
 }
 .rudder-template .sidebar-navbar + .filters-container:before,
 .rudder-template .filters-container.hidden:before{
@@ -815,7 +922,7 @@ ul {
 }
 .rudder-template .dataTable > tbody > tr:nth-child(even),
 .filemanager-container .dataTable > tbody > tr:nth-child(even){
-  background-color: $rudder-bg-gray;
+  background-color: $rudder-bg-light-gray;
 }
 .rudder-template .dataTable > tbody > tr:nth-child(even):hover,
 .filemanager-container .dataTable > tbody > tr:nth-child(even):hover{
@@ -1011,7 +1118,7 @@ ul {
   cursor: default;
 }
 .tree-container .tree-heading {
-  background-color: $rudder-bg-gray;
+  background-color: $rudder-bg-light-gray;
   color: #738195;
   margin: 0 calc(var(--bs-gutter-x)*-0.5);
   padding: 15px;
@@ -1044,7 +1151,7 @@ ul {
   margin: 15px -15px 0 -15px;
   width: calc(100% + 30px);
   padding: 15px;
-  background-color: $rudder-bg-gray;
+  background-color: $rudder-bg-light-gray;
   border-top: 2px solid #d6deef;
   justify-content: space-between;
 }
@@ -1101,7 +1208,7 @@ ul {
       cursor: ns-resize;
       border-top: 1px $rudder-border-color-default solid;
       text-align: center;
-      background-color: $rudder-bg-gray;
+      background-color: $rudder-bg-light-gray;
 
       &:active {
         cursor: ns-resize;
@@ -1169,7 +1276,7 @@ ul {
   background-color: #fff;
 }
 .rudder-template .template-main .main-table > .table-container.skeleton-loading .dataTable > tbody > tr:nth-child(even):hover {
-  background-color: $rudder-bg-gray;
+  background-color: $rudder-bg-light-gray;
 }
 .rudder-template ul.skeleton-loading li > i,
 .rudder-template ul.skeleton-loading li > span,
@@ -1333,7 +1440,7 @@ $nbRows: 20;
   align-items: baseline;
 }
 .rudder-template .toggle-checkbox:checked + .callout-fade ul li:nth-child(even){
-  background-color: $rudder-bg-gray;
+  background-color: $rudder-bg-light-gray;
 }
 .rudder-template .toggle-checkbox:checked + .callout-fade ul li:hover{
   background-color: #e2f2ff !important;
@@ -1555,7 +1662,7 @@ ul.applied-list > li {
   box-shadow: 0px 5px 4px -3px rgba(0,0,0,.1);
 }
 ul.applied-list > li.is-disabled{
-  background-color: $rudder-bg-gray;
+  background-color: $rudder-bg-light-gray;
 }
 
 ul.applied-list > li > .border{
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder.css
deleted file mode 100644
index 060377e3f2e..00000000000
--- a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder.css
+++ /dev/null
@@ -1,1295 +0,0 @@
-/*
-*************************************************************************************
-* Copyright 2011 Normation SAS
-*************************************************************************************
-*
-* This file is part of Rudder.
-*
-* Rudder is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* In accordance with the terms of section 7 (7. Additional Terms.) of
-* the GNU General Public License version 3, the copyright holders add
-* the following Additional permissions:
-* Notwithstanding to the terms of section 5 (5. Conveying Modified Source
-* Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
-* Public License version 3, when you create a Related Module, this
-* Related Module is not considered as a part of the work and may be
-* distributed under the license agreement of your choice.
-* A "Related Module" means a set of sources files including their
-* documentation that, without modification of the Source Code, enables
-* supplementary functions or services in addition to those offered by
-* the Software.
-*
-* Rudder is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
-
-*
-*************************************************************************************
-*/
-
-@-moz-document url-prefix() {
-  fieldset { display: table-cell; }
-}
-
-html {
-  height:100%;
-}
-
-.details {
-  margin: 0px;
-  padding: 0px;
-}
-
-#chartjs-tooltip {
-  opacity: 1;
-  position: fixed !important;
-  background: rgba(0, 0, 0, .7);
-  color: white;
-  border-radius: 3px;
-  -webkit-transition: all .1s ease;
-  transition: all .1s ease;
-  pointer-events: none;
-  -webkit-transform: translate(-50%, 10px);
-  transform: translate(-50%, 10px);
-  z-index: 500;
-  max-width: unset;
-  padding: 10px !important;
-}
-#chartjs-tooltip ul {
-  margin-bottom: 0;
-}
-#chartjs-tooltip h4 {
-  font-size: 16px;
-  white-space: pre;
-  margin-top: 0;
-}
-.chartjs-tooltip-key {
-  display: inline-block;
-  width: 10px;
-  height: 10px;
-}
-
-
-.overflow_auto {
-  overflow: auto;
-}
-/**********************************
- *            FORM                *
- **********************************/
-
-.directiveTechnicalInfo{
-  padding-top: 12px;
-}
-
-.portlet-header .ui-icon {
-   float: right;
-   cursor: pointer;
-}
-
-div.intro {
-   margin: 5px 0px 15px 0px;
-   padding: 0px;
-   width: 100%;
-   font-size: 14px;
-   line-height: 1.5em;
-   color: #414141;
-   background-color: #FFF9E1;
-   z-index: 1;
-}
-
-div.intro div {
-  padding: 5px 5px 5px 15px;
-  font-size: 1.1em;
-}
-div.intro p:last-child{
-  margin-bottom:0px;
-}
-div.intro div ul {
-   padding: 0 0 0 20px;
-}
-
-.directiveInfo{
-   margin-left:10px;
-}
-
-.compositionCheckbox input {
-  margin-left : 5px;
-  vertical-align: middle;
-  margin-bottom: 2px;
-}
-
-.composition input {
-  vertical-align: middle;
-}
-
-
-button.ui-state-default {
-   width: 130px;
-}
-
-form select.selectComparator {
-   width: 150px;
-}
-
-form select.selectField {
-   width: 220px;
-}
-
-.content-wrapper input.queryInputValue, .content-wrapper select.queryInputValue {
-  width:280px;
-}
-
-input.deleteNetwork * {
-  padding: 0 !important;
-}
-#lift__noticesContainer___notice ul {
-  padding: 10px 20px;
-}
-
-@media screen and (min-width: 993px) {
-  #reportsGrid tr>th:last-child,#reportsGrid tr>td:last-child,
-  #nodeReportsGrid tr>th:last-child,#nodeReportsGrid tr>td:last-child{
-    width:350px!important;
-    white-space:nowrap;
-  }
-}
-@media screen and (max-width: 992px) {
-  #reportsGrid tr>th:last-child,#reportsGrid tr>td:last-child,
-  #nodeReportsGrid tr>th:last-child,#nodeReportsGrid tr>td:last-child{
-    width:300px !important;
-    white-space:nowrap;
-  }
-}
-@media screen and (max-width: 768px) {
-  #reportsGrid tr>th:last-child,#reportsGrid tr>td:last-child,
-  #nodeReportsGrid tr>th:last-child,#nodeReportsGrid tr>td:last-child{
-    width:50% !important;
-    white-space:nowrap;
-  }
-}
-#reportsGrid tr>th:last-child,#reportsGrid tr>td:last-child,
-#nodeReportsGrid tr>th:last-child,#nodeReportsGrid tr>td:last-child{
-  width:auto !important;
-  white-space: normal;
-}
-
-#grid_rules_grid_zone {
-  width: 100%;
-  table-layout: fixed;
-}
-
-.paginate_disabled_previous, .paginate_enabled_previous, .paginate_disabled_next, .paginate_enabled_next {
-  height: 19px;
-  width: 19px;
-  margin-left: 3px;
-  float: right;
-
-}
-
-.reportIcon {
-  padding-left: 6px !important;
-}
-
-/********************
-* Directive display
-********************/
-.inlineml{
-  display:inline;
-  margin-left:3px;
-}
-.inlinenotop{
-  display:inline;
-  padding-top:0px;
-}
-.cpiefsave{
-  float:right;
-}
-
-.wbBaseField * {
-  vertical-align: middle;
-}
-
-.wbBaseField {
-  vertical-align: middle;
-  margin-top: 7px;
-}
-
-.wbBaseFieldLabel {
-  margin-top: 5px;
-}
-
-.wbBaseFieldLabel .tw-bs .ruddericon {
-    top: -2px;
-}
-
-/**********************************
- *define the group/section table
- **********************************/
-#querySearchSection{
-  font-size: 14px;
-}
-fieldset.sectionFieldset {
-  padding: 1px 10px 1px 10px;
-}
-
-fieldset.groupFieldset {
-  padding: 1px 10px 1px 10px;
-}
-
-.section-title {
-  font-size: 22px;
-  cursor: default;
-  background: none;
-  border-bottom: 2px solid #d6deef;
-  padding: 0 0 5px 0;
-  margin-bottom: 10px;
-  color: #041922;
-}
-.foldableSection div.section-title{
-  font-size: 20px;
-  border-bottom: 2px solid #d6deef;
-}
-.foldableSection.foldedSection div.section-title{
-  border-bottom-color: transparent;
-}
-.foldedSection .section-title,
-.foldableSection div.section-title,
-.unfoldedSection .section-title,
-#querySearchSection{
-  cursor: pointer;
-}
-
-.foldableSection .section-title .btn{
-  padding: 2px 10px;
-  margin-left: 10px;
-  position: relative;
-}
-.foldableSection .section-title .btn .fa{
-  margin-left: 4px;
-}
-
-div.unfoldedSection div.section-title:before,div.foldedSection div.section-title:before,
-#querySearchSection:before{
-  content: "\f0da";
-  display: inline-block;
-  position: relative;
-  top: 2px;
-  margin-right: 10px;
-  font: normal normal normal 14px/1 inherit;
-  font-family: "Font Awesome 5 Free";
-  font-size: inherit;
-  text-rendering: auto;
-  -webkit-font-smoothing: antialiased;
-  opacity: .6;
-  transition-duration: .2s;
-  font-weight: 900;
-}
-
-.foldableSection .foldableSection > .section-title{
-  border-bottom: none;
-  color: #041922DD;
-  margin-bottom: 8px;
-  transition-duration: .2s;
-  cursor: pointer;
-}
-.foldableSection .foldableSection > .section-title:before{
-  opacity: 0.4;
-}
-
-.sectionFieldset.foldableSection{
-  position:relative;
-  transition-duration: .2s;
-  padding-left: 10px;
-}
-.sectionFieldset.foldableSection:before{
-  content:"";
-  position: absolute;
-  top: 30px;
-  bottom: 0;
-  left: 12.5px;
-  width: 2px;
-  background-color: #d6deef;
-  transition: background-color .2s;
-}
-.sectionFieldset.foldableSection.unfoldedSection:hover:before{
-  background-color: #13beb7;
-}
-.sectionFieldset.foldableSection.foldedSection:hover:before{
-  background-color: #aaa;
-}
-
-
-.sectionFieldset.foldableSection table.directiveSectionDef{
-  margin-left: 15px;
-  width: calc(100% - 15px);
-}
-table.directiveGroupDef{
-  border-left: 2px solid #d6deef;
-  transition: border-left-color .2s;
-}
-table.directiveGroupDef:hover{
-  border-left-color: #13beb7;
-}
-
-div.unfoldedSection div.section-title:before,
-#querySearchSection.unfoldedSectionQuery:before{
-  -webkit-transform:rotate(90deg);
-  -ms-transform:rotate(90deg);
-  -moz-transform:rotate(90deg);
-  -o-transform:rotate(90deg);
-  transform:rotate(90deg);
-}
-
-div.foldedSection div.section-title:before {
-  -webkit-transform:rotate(0deg);
-  -ms-transform:rotate(0deg);
-  -moz-transform:rotate(0deg);
-  -o-transform:rotate(0deg);
-  transform:rotate(0deg);
-}
-
-.foldedSection table, .foldedSection div {
-  display:none;
-}
-
-.foldedSection div.section-title {
-  display:block;
-}
-
-table.directiveSectionDef {
-  margin-bottom: 16px;
-}
-
-/**********************************
- *add / remove group
- **********************************/
-
-.lopaddscala{
-  padding:0px
-}
-
-td.directiveVarValue  {
-  width:70%;
-  margin-right:2px;
-}
-
-.textareaField {
-  height: 300px;
-}
-
-
-/*********************************
-* Search servers
-*********************************/
-.paddscala{
-  padding: 0px 0px 0px 15px;
-}
-.catdelete{
-  font-size:0.9em;
-  margin-left: 5px;
-}
-.margins{
-  margin: 15px 0px 8px 0px;
-}
-.spacerscala{
-  float:right;
-}
-.paginatescala{
-  float:left;
-  margin-top: 4px;
-}
-.notify{
-  text-align:center;
-}
-
-.composition span {
-  display: inline-block;
-}
-
-/**************************************
-structure
-**************************************/
-.subContainerReasonField {
-  padding: 0 4px 0 4px;
-}
-
-div#navigation {
-   float: left;
-   background-color: #1e1e1e;
-   border-top-right-radius: 10px;
-   border-bottom-right-radius: 10px;
-}
-
-#documentation {
-  float: right;
-  font-size: 14px;
-  font-weight: bold;
-  padding-right: 20px;
-}
-
-#documentation a {
-  color: #999;
-}
-
-.automaticCleanDetail {
-  padding : 5px 5px 0;
-} 
-
-#opener {
-   border: none;
-   background: none;
-   text-decoration: underline;
-   color: #999;
-   cursor: pointer;
-}
-#opener:hover {
-   text-decoration: none;
-}
-
-/**************************************
-Home portlet
-**************************************/
-
-.column {
-   width: 50%;
-   float: left;
-}
-
-p img {
-   float: none !important;
-   margin: 0px !important;
-}
-
-.evlogviewpad {
-   margin-left: 15px;
-}
-
-*html .portlet ul {
-   padding: 20px 0 15px 0;
-}
-.portlet li {
-   list-style-type: none;
-}
-table .innerDetails li{
-  word-break: break-all;
-  white-space: pre-wrap;
-}
-.portlet-header {
-   padding: 5px 0 5px 15px;
-   font-size: 1.4em;
-   font-weight: bold;
-   cursor: default;
-   background: none;
-}
-
-.portlet-header .ui-icon {
-   float: right;
-   cursor: pointer;
-}
-.portlet-content {
-   background-color: #fff;
-}
-.ui-sortable-placeholder {
-   border: 1px dotted black;
-   visibility: visible !important;
-   height: 50px !important;
-}
-.ui-sortable-placeholder * {
-   visibility: hidden;
-   visibility: hidden;
-}
-
-/********************
-* Popup
-********************/
-#actions_zone{
-  margin:10px 10px 0px 5px;
-}
-
-.curspoint{
-  cursor:pointer;
-}
-
-
-#ui-dialog-title-addPopup{
-  height: 25px;
-  width:90%;
-}
-
-.ui-dialog-title, .ui-dialog-titlebar-close {
-  height: 25px;
-}
-
-/*****************************************
-* Popup creation groupe/category
-******************************************/
-.createGroup {
-  height: 400px;
-}
-
-/*************************
-*  plugins         *
-**************************/
-
-.pluginpadd{
-  padding: 0 10px;
-}
-
-.badge-plugin-version{
-  margin-left:15px;
-  display: inline-block;
-  background-color: #FFEAD1;
-  color: #EF9600;
-  padding: 5px;
-  border-radius: 3px;
-  font-size:12px;
-  font-weight:bold;
-}
-/*************************
-*   Misc
-**************************/
-.tooltip {
-  color: #999;
-  padding-top: 0px;
-}
-
-.spacing-title {
-  padding-top:0;
-  margin-bottom:5px;
-  margin-top:5px;
-}
-
-#tooltip {
-  position: absolute;
-  z-index: 3000;
-  border: 1px solid #666;
-  background-color: #eee;
-  padding: 5px;
-  opacity: 0.85;
-  padding: 4px;
-}
-#tooltip h3, #tooltip div {
-  margin: 0;
-}
-
-/* tooltip styling.  */
-
-.tooltipContent {
-  display:none;
-
-}
-
-.red {
-color: #FF0000 !important;
-}
-
-td.complianceTd, td.parametersTd {
-  text-align: center !important;
-}
-
-/* others */
-.deca{
-  padding: 10px;
-}
-
-.inline{
-  display:inline;
-}
-
-.err{
-  padding-left: 50px;
-}
-.green{
-  color:green;
-  margin:5px;
-  font-style:italic;
-  font-size: 0.9em;
-}
-.warnicon{
-  float:left;
-  margin-right:9px;
-}
-.icon{
-  float:left;
-  margin-right:20px;
-}
-.greenscala{
-  color:green
-}
-
-.greyscala{
-  color: #999;
-}
-.content-wrapper .checkbox {
-    float: right;
-    margin: 0 30px 0 10px;
-    height: 20px;
-    position: static;
-    display: block;
-    margin-top: 0;
-    margin-bottom: 0;
-}
-.content-wrapper .checkbox input[type="checkbox"]{
-  position:relative;
-  top:2px;
-  margin-left:2px;
-}
-.nodisplay{
-  display:none;
-}
-.ajaxloader{
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  text-align:center;
-  padding:10px;
-  margin-left: -40px;
-  margin-top: -40px;
-  z-index:9999;
-  display:none;
-}
-
-.svg-loading{
-  height:25px;
-  width:25px;
-  padding: 0 !important;
-}
-
-.border-fail {
-  border-left-width: 5px;
-  border-left-style: solid;
-  border-left-color: #c9302c;
-  border-radius: 5px;
-}
-
-.border-success {
-  border-left-width: 5px;
-  border-left-style: solid;
-  border-left-color: #13BEB7;
-  border-radius: 5px;
-}
-
-.btn-state {
-  width:128px;
-  height:40px;
-}
-
-.btn-trigger {
-  min-width:150px;
-  height:40px;
-}
-
-.fa-times-custom {
-  color: #c9302c;
-}
-
-.fa-check-custom {
-  color: #13BEB7;
-}
-
-.svg-loader{
-  height:40px;
-  width:40px;
-  padding: 0 !important;
-}
-
-.right {
-   float: right;
-   margin: 0 0 5px 5px;
-}
-.center {
-   text-align: center;
-}
-hr.spacer {
-   visibility: hidden;
-   clear: both;
-}
-
-.float-inherit{
-  float: inherit !important;
-}
-.twoCol {
-  float:left;
-  width:67%;
-}
-
-.rudderBaseFieldClassName {
-  width:99%;
-}
-
-.rudderBaseFieldSelectClassName {
-  width:101%;
-}
-
-.threeCol {
-  float:left;
-  width:30%;
-  margin-right: 4px;
-}
-
-.largeCol {
-  float:left;
-  margin-right: 2px;
-  width:60%;
-}
-
-.align-radio span {
-  display:inline-block;
-  margin-right:5px;
-}
-
-.align-radio-generate-input span {
-  display:inline-block;
-}
-
-.radioTextLabel {
-  margin-right:6px;
-  margin-left:3px;
-}
-
-.groupDiv {
-   margin-top: 5px;
-   margin-bottom: 10px;
-}
-
-legend {
-  padding-left: 5px;
-  padding-right: 5px;
-}
-
-/************************************
-Portlet content for object details
-(for example, details about a Directive
-template, a Directive, etc)
-************************************/
-
-.object-details {
-  padding:10px;
-}
-
-.object-details fieldset {
-  padding-left: 2px;
-  padding-right: 20px;
-}
-
-/************************************
-Descriptions
-************************************/
-.warn div {
-  /*display:inline-block;*/
-  vertical-align: middle;
-}
-
-div.serverDetail {
-  font-weight:bold;
-  text-align:center;
-}
-
-div.tabInform {
-  padding: 5px 0 10px 0;
-  font-size: 14px;
-}
-
-.reportLine {
-  background: url("../../images/tableau/fdTaboHead.jpg") repeat-x scroll left top transparent;
-  color: #FFFFFF;
-  float: left;
-  margin-top: 4px;
-  padding: 5px;
-}
-
-.filter {
-  float : right;
-  margin-right : 14px;
-}
-/***********************************
- *Directive display
-************************************/
-
-.directiveTitle {
-  font-weight:bold;
-}
-
-tr.parametersDescription {
-  background-color: #F8F9FC !important;
-  height: 30px;
-  border-top: 1px solid #d6deef !important;
-}
-
-.parametersDescriptionDetails {
-  padding:15px;
-}
-/***********************************
- *Reports display
-************************************/
-.evlogviewpad {
-  padding:5px;
-}
-
-.evlogviewpad li{
-  list-style-type: disc;
-}
-.evloglmargin{
-  margin: 7px 0;
-}
-
-.reportsNode {
-  margin : 10px;
-  padding : 5px;
-}
-
-.field_errors, .error, .errors {
-  color: #c00800;
-}
-
-.field_errors {
-  margin-top:4px;
-}
-
-.field_errors li {
-  list-style-position:inside;
-}
-
-li.eventLogUpdatePolicy {
-  list-style-position: inside;
-  list-style-type: none;
-}
-table.eventLogUpdatePolicy {
-  width: 50%;
-  margin-top: 0px;
-  margin-left: 0px;
-}
-
-table.fixedlayout{
-  table-layout:fixed;
-  word-wrap:break-word
-}
-
-.diffOldValue {
-  text-decoration:line-through;
-}
-
-/***********************************
- * Quick search
-************************************/
-
-.quickSearch {
-  text-align: center;
-  margin-top: 5px;
-}
-
-/***********************************
- * Trees
-************************************/
-
-#categoryTree.jstree-rudder a {
-  vertical-align: middle;
-}
-
-.treeActiveTechniqueName , .treeActiveTechniqueCategoryName, .treeRuleCategoryName {
-  color: #555
-}
-
-i.jstree-icon.jstree-themeicon.fa.fa-file-text.jstree-themeicon-custom {
-  color: #555;
-}
-
-ins.jstree-icon {
-  float: left;
-}
-
-.jstree-default.jstree-focused {
-  background: none repeat scroll 0 0 #FFFFFF !important;
-}
-
-a>.jstree-icon{
-  background-position: 0!important;
-}
-
-del {
-  text-decoration: none;
-  background: #FFD6D6;
-}
-
-ins {
-  text-decoration: none;
-  background: #D6FFD6;
-}
-
-#allowedNetworksForm {
-  margin-top: -7px;
-}
-
-.database-info-table {
-  width: auto;
-}
-
-.database-info-table td {
-  border: none !important;
-}
-
-/* REPORTS DATABASE */
-#reportFromDate, #deleteReports {
-  margin-left: 7px;
-  padding: 6px 12px;
-  border: 1px solid #dcdcdc;
-  border-radius: 4px;
-}
-#modeSelector{
-  margin: 15px 8px 0 0;
-  display: inline-block;
-}
-#modeSelector > li{
-  margin-bottom:0;
-  display:inline-block;
-}
-#modeSelector > li input{
-  display:none;
-}
-#modeSelector > li > label {
-  margin-bottom: 0;
-}
-#modeSelector > li > label span{
-  margin-bottom: 0;
-  padding: 6px 12px;
-  border-radius: 4px;
-  overflow: hidden;
-  border: 1px solid #dcdcdc;
-  background-color: #F8F9FC;
-  margin:0;
-  transition-duration:.2s;
-  opacity:.7;
-  cursor:pointer;
-}
-#modeSelector > li > label span:hover{
-  opacity:1;
-}
-#modeSelector > li:first-child > label span{
-  border-top-right-radius:0;
-  border-bottom-right-radius:0;
-  border-right-color:transparent;
-}
-#modeSelector > li:last-child > label span{
-  border-top-left-radius:0;
-  border-bottom-left-radius:0;
-  border-left-color:transparent;
-}
-#modeSelector > li > label input:checked + span{
-  opacity:1;
-  cursor:default;
-  color:#fff;
-}
-#modeSelector > li:last-child > label input:checked + span{
-  background-color: #DA291C;
-  border-color: #DA291C;
-}
-#modeSelector > li:first-child > label input:checked + span{
-  background-color: #3694d1;
-  border: 1px solid #2173a9;
-}
-/* --------------- */
-fieldset {
-  border: 1px solid #B4B3A8;
-}
-
-.note {
-  color: #555555;
-  margin: 5px 0px 0px 0px;
-}
-/**
- * Rollback
- */
-
-.rollbackFieldSet {
-  min-width : 520px;
-  text-align : center;
-}
-/**
- * Pending change request
- */
-img.targetRemove {
-  margin : 0 0 -3px 5px;
-  float  : none;
-  cursor : pointer
-}
-
-img.targetIcon {
-  margin : 0 0 -3px 0;
-  float  : none;
-}
-
-.targetDisplay {
-  display          : block;
-  float            : left;
-  padding          : 5px;
-  margin           : 0 0px 5px 5px;
-  background-color : rgba(255, 255, 255, 0.8);
-}
-
-.targetContainer {
-  border      : 1px solid #B4B3A8;
-  padding-top : 5px
-}
-
-.targetHeader {
-  font-size   : 1.3em;
-  font-weight : bold;
-}
-
-img.treeAction {
-  margin : 0 5px 0 0;
-  cursor : pointer
-}
-
-img.treeAction.noRight {
-  margin-right : 0;
-}
-
-.treeActions {
-  padding-top  : 1px;
-  padding-left : 5px
-}
-
-li.included a {
-  background-color: #DDFFDD !important;
-  border: 1px solid #a3d6a3 !important;
-  padding: 0 2px;
-}
-
-li.excluded a{
-  background-color: #FFDDDD !important;
-  border: 1px solid #e7acac !important;
-  padding: 0 2px ;
-}
-
-.title-link {
- font-size : 12px;
-}
-
-.searchNodes tr > td:first-child {
-  padding-left: 0;
-}
-.deprecatedTechniqueIcon {
-  margin-left : 3px;
-}
-table.directiveGroupDef, table.directiveVarDef, table.directiveSectionDef {
-  width:100%;
-  padding-left: 15px;
-}
-
-#cfagentSchedule h4 {
-  margin-bottom: 10px;
-  margin-top: 10px;
-  font-size: 14px;
-  font-weight: 500;
-  line-height: 1.1;
-}
-
-#cfagentSchedule #scheduleMessage {
-  margin:10px 0 0 15px;
-}
-
-.animate-hide {
-  -webkit-transition: all linear .2s;
-  transition: all linear .2s;
-  opacity: 1;
-}
-
-.animate-hide.ng-hide {
-  opacity: 0;
-}
-
-.animate-hide.ng-hide-add, .animate-hide.ng-hide-remove {
-  /* this needs to be here to make it visible during the animation
-     since the .ng-hide class is already on the element rendering
-     it as hidden. */
-  display:block!important;
-}
-
-.c3-tooltip td.name {
-    padding-right: 3px;
-}
-
-.ui-button-disabled  {
-    opacity: 0.5;
-}
-
-#selectedPeriod{
-  font-size:14px;
-}
-body.cursorPointer{
-  cursor:pointer;
-}
-path.c3-bar.c3-shape.c3-bar-highlighted{
-  stroke: rgb(63, 185, 243) !important;
-  fill: rgb(63, 185, 243) !important;
-}
-button.recentChangeGraph{
-  position: relative;
-  top: -8px;
-  right: -10px;
-}
-button.buttonMargin {
-  margin: 0 10px;
-}
-
-.c3-legend-item-hidden {
-  opacity : 1;
-}
-
-#generation-status .fa {
-  top: 0;
-  font-size : 11px;
-}
-
-[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
-  display: none !important;
-}
-
-.bs-text-danger{
-  color:#DA291C;
-}
-
-#node-compliance-intro {
-  padding: 10px 15px;
-  margin: 10px 0;
-}
-
-.jstree-default .jstree-node {
-  min-height: 20px;
-  line-height: 20px;
-  margin-left: 20px;
-  min-width: 20px;
-}
-.jstree-default .jstree-anchor {
-  line-height: 20px;
-  height: 20px;
-}
-.jstree-default .jstree-icon {
-  width: 20px;
-  height: 20px;
-  line-height: 20px;
-}
-.jstree-default .jstree-icon:empty {
-  width: 20px;
-  height: 20px;
-  line-height: 20px;
-}
-.jstree-default.jstree-rtl .jstree-node {
-  margin-right: 20px;
-}
-.jstree-default .jstree-wholerow {
-  height: 20px;
-}
-
-.jstree-anchor > .jstree-themeicon {
-  margin-right: 0px;
-}
-
-.jstree a.jstree-anchor, .jstree a.jstree-anchor:hover , .jstree a.jstree-anchor:focus, .jstree a.jstree-anchor:active {
-  white-space: normal !important;
-  height: auto;
-  padding: 1px 2px;
-  text-decoration: none;
-}
-
-.jstree a.jstree-anchor .categoryAction, .jstree a.jstree-anchor .treeActions  {
-  opacity: 0.2;
-  cursor: pointer !important;
-  font-size: 20px !important;
-}
-
-.jstree a.jstree-anchor:hover .categoryAction, .jstree a.jstree-anchor:hover .treeActions  {
-  opacity: .7;
-}
-
-.jstree a.jstree-anchor:hover .categoryAction, .jstree a.jstree-anchor .treeActions:hover {
-  opacity: 1 !important;
-}
-
-.treeActions-container {
-  display: inline-block;
-  position: relative;
-  top: 1px;
-}
-
-.jstree .fa.jstree-icon {
-  color : #999
-}
-.jstree .fa.fa-gear, .jstree .fa.fa-folder {
-  position: relative;
-  top: 1px;
-}
-.jstree.content-wrapper {
-	font-size : 12px;
-}
-
-.text-warning-rudder {
-    color : #EF9600
-}
-
-#bottomPanel {
-  background-color: #fff;
-  padding: 15px;
-  border: 1px solid #dcdcdc;
-  border-top: none;
-}
-
-.ui-widget-shadow {
-  box-shadow: 0 5px 10px rgba(0,0,0,.2);
-}
-
-
-#filterLogs button{
-  width: auto;
-  outline:none;
-}
-#filterLogs .form-control.input-xs{
-  display:inline;
-  height: 25px;
-  margin: 0 5px;
-  width: 140px !important;
-}
-#filterLogs .form-control.input-xs:focus {
-  border-color: #c1c1c1;
-  outline: 0;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgba(208, 208, 208, 0.6);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px rgb(208, 208, 208);
-}
-#changesChartContainer {
-  height: 40vh;
-}
-.c3-tooltip tr td{
-  padding: 0 5px;
-}
-
-.ui-tabs-panel h4 {
-  font-size: inherit;
-  font-weight: bold;
-  margin-bottom:0px;
-}
-.ui-tabs-panel h3 {
-  margin-top:0px;
-  font-weight: bold;
-}
-
-.content-wrapper .ui-tabs-panel .jstree {
-  margin-top:0;
-  font-size: 12px;
-}
-
-.cursorPointer {
-  cursor:pointer;
-}
-
-pre.command-output{
-  white-space: break-spaces;
-}
diff --git a/webapp/sources/rudder/rudder-web/src/main/svg/README.md b/webapp/sources/rudder/rudder-web/src/main/svg/README.md
new file mode 100644
index 00000000000..bd9d4faac50
--- /dev/null
+++ b/webapp/sources/rudder/rudder-web/src/main/svg/README.md
@@ -0,0 +1,9 @@
+# SVG image sources
+
+This folder contains the sources for all Rudder's SVG images, including the logo.
+The files are usually created and modified using [Inkscape](https://inkscape.org/).
+
+The Gulp build task will produce optimized versions of the files (using [SVGO](https://svgo.dev/))
+into the `webapp` folder, which is packaged.
+All non-SVG images (PNG, etc.) should be placed directly into the `webapp` folder
+sources.
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/ajax-loader-white.svg b/webapp/sources/rudder/rudder-web/src/main/svg/ajax-loader-white.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/ajax-loader-white.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/ajax-loader-white.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/ajax-loader.svg b/webapp/sources/rudder/rudder-web/src/main/svg/ajax-loader.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/ajax-loader.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/ajax-loader.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/dsc-icon-white.svg b/webapp/sources/rudder/rudder-web/src/main/svg/dsc-icon-white.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/dsc-icon-white.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/dsc-icon-white.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/dsc-icon.svg b/webapp/sources/rudder/rudder-web/src/main/svg/dsc-icon.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/dsc-icon.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/dsc-icon.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/logo-rudder-sm.svg b/webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-notext.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/logo-rudder-sm.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-notext.svg
diff --git a/logo/rudder-logo-rect-black.svg b/webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-rect-black.svg
similarity index 100%
rename from logo/rudder-logo-rect-black.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-rect-black.svg
diff --git a/logo/rudder-logo-rect-monochrome-black.svg b/webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-rect-monochrome-black.svg
similarity index 100%
rename from logo/rudder-logo-rect-monochrome-black.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-rect-monochrome-black.svg
diff --git a/logo/rudder-logo-rect-monochrome-white.svg b/webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-rect-monochrome-white.svg
similarity index 100%
rename from logo/rudder-logo-rect-monochrome-white.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-rect-monochrome-white.svg
diff --git a/logo/rudder-logo-rect-white.svg b/webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-rect-white.svg
similarity index 100%
rename from logo/rudder-logo-rect-white.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-rect-white.svg
diff --git a/logo/rudder-logo-square-black.svg b/webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-square-black.svg
similarity index 100%
rename from logo/rudder-logo-square-black.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-square-black.svg
diff --git a/logo/rudder-logo-square-monochrome-black.svg b/webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-square-monochrome-black.svg
similarity index 100%
rename from logo/rudder-logo-square-monochrome-black.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-square-monochrome-black.svg
diff --git a/logo/rudder-logo-square-monochrome-white.svg b/webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-square-monochrome-white.svg
similarity index 100%
rename from logo/rudder-logo-square-monochrome-white.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-square-monochrome-white.svg
diff --git a/logo/rudder-logo-square-white.svg b/webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-square-white.svg
similarity index 100%
rename from logo/rudder-logo-square-white.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/logo/rudder-logo-square-white.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/markdown-mark-solid.svg b/webapp/sources/rudder/rudder-web/src/main/svg/markdown-mark-solid.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/markdown-mark-solid.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/markdown-mark-solid.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/aix-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/aix-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/aix-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/aix-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/alma-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/alma-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/alma-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/alma-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/android-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/android-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/android-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/android-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/bsd-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/bsd-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/bsd-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/bsd-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/centos-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/centos-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/centos-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/centos-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/debian-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/debian-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/debian-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/debian-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/fedora-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/fedora-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/fedora-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/fedora-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/freebsd-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/freebsd-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/freebsd-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/freebsd-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/kali-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/kali-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/kali-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/kali-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/linux-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/linux-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/linux-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/linux-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/mint-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/mint-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/mint-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/mint-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/alma-logo-notext.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/alma-logo-notext.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/alma-logo-notext.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/alma-logo-notext.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/centos-logo-notext.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/centos-logo-notext.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/centos-logo-notext.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/centos-logo-notext.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/debian-logo-notext.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/debian-logo-notext.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/debian-logo-notext.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/debian-logo-notext.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/fedora-logo-notext.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/fedora-logo-notext.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/fedora-logo-notext.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/fedora-logo-notext.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/freebsd-logo-notext.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/freebsd-logo-notext.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/freebsd-logo-notext.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/freebsd-logo-notext.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/oracle-logo-notext.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/oracle-logo-notext.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/oracle-logo-notext.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/oracle-logo-notext.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/redhat-logo-notext.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/redhat-logo-notext.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/redhat-logo-notext.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/redhat-logo-notext.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/rocky-logo-notext.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/rocky-logo-notext.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/rocky-logo-notext.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/rocky-logo-notext.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/ubuntu-logo-notext.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/ubuntu-logo-notext.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/no-text/ubuntu-logo-notext.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/no-text/ubuntu-logo-notext.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/oracle-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/oracle-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/oracle-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/oracle-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/raspbian-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/raspbian-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/raspbian-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/raspbian-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/redhat-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/redhat-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/redhat-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/redhat-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/rocky-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/rocky-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/rocky-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/rocky-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/slackware-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/slackware-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/slackware-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/slackware-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/solaris-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/solaris-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/solaris-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/solaris-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/suse-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/suse-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/suse-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/suse-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/tuxedo-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/tuxedo-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/tuxedo-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/tuxedo-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/ubuntu-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/ubuntu-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/ubuntu-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/ubuntu-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/unknown-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/unknown-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/unknown-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/unknown-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/windows-2012-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/windows-2012-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/windows-2012-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/windows-2012-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/os/windows-logo.svg b/webapp/sources/rudder/rudder-web/src/main/svg/os/windows-logo.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/os/windows-logo.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/os/windows-logo.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-A.svg b/webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-A.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-A.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-A.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-B.svg b/webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-B.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-B.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-B.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-C.svg b/webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-C.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-C.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-C.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-D.svg b/webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-D.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-D.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-D.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-E.svg b/webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-E.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-E.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-E.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-F.svg b/webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-F.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-F.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-F.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-X.svg b/webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-X.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-X.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-X.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-sm-A.svg b/webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-sm-A.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-sm-A.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-sm-A.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-sm-B.svg b/webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-sm-B.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-sm-B.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-sm-B.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-sm-C.svg b/webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-sm-C.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-sm-C.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-sm-C.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-sm-D.svg b/webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-sm-D.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-sm-D.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-sm-D.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-sm-E.svg b/webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-sm-E.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-sm-E.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-sm-E.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-sm-F.svg b/webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-sm-F.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-sm-F.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-sm-F.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-sm-X.svg b/webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-sm-X.svg
similarity index 100%
rename from webapp/sources/rudder/rudder-web/src/main/webapp/images/score-badges/rudder-score-badge-sm-X.svg
rename to webapp/sources/rudder/rudder-web/src/main/svg/score-badges/rudder-score-badge-sm-X.svg
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/logo-rudder-white.svg b/webapp/sources/rudder/rudder-web/src/main/webapp/images/logo-rudder-white.svg
deleted file mode 100644
index ad22dab6a1f..00000000000
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/images/logo-rudder-white.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   xml:space="preserve"
-   width="1300"
-   height="300"
-   viewBox="0 0 1300 300"
-   sodipodi:docname="logo-rudder-white.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs6" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1043"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="0.5286983"
-     inkscape:cx="-269.87233"
-     inkscape:cy="84.714539"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g10" /><g
-     id="g10"
-     inkscape:groupmode="layer"
-     inkscape:label="2021-FIC-logo-rudder"
-     transform="matrix(1.3333333,0,0,1.3333333,0,7.5e-6)"><g
-       id="g12"><path
-         d="m 141.797,18.77 c -51.836,0 -93.856,41.964 -93.859,93.726 0,24.859 9.89,48.703 27.492,66.281 17.601,17.578 41.472,27.453 66.367,27.453 24.891,-0.003 48.762,-9.878 66.363,-27.457 17.602,-17.578 27.488,-41.418 27.488,-66.277 -0.039,-23.273 -8.75,-45.699 -24.433,-62.914 l -61.246,68.184 c -1.871,1.882 -4.344,2.816 -6.809,2.816 -2.465,0 -4.941,-0.934 -6.812,-2.816 -3.766,-3.758 -3.766,-9.852 0,-13.614 L 204.617,43.004 C 187.398,27.445 165.016,18.809 141.797,18.77 Z m -15.738,34.312 c 2.691,6.012 8.718,10.199 15.742,10.199 7.011,0 13.043,-4.187 15.734,-10.199 5.395,1.43 10.485,3.574 15.199,6.313 -0.609,1.566 -0.945,3.207 -1.074,4.843 l -20.578,17.891 c -2.949,-0.91 -6.059,-1.387 -9.281,-1.387 -17.535,0 -31.801,14.238 -31.801,31.766 0,17.5 14.266,31.75 31.801,31.75 17.527,0 31.797,-14.25 31.797,-31.75 0,-3.383 -0.543,-6.629 -1.516,-9.68 l 17.547,-20.156 c 1.82,-0.074 3.613,-0.418 5.344,-1.059 2.742,4.692 4.89,9.782 6.316,15.157 -6.012,2.703 -10.203,8.722 -10.203,15.738 0,7.004 4.191,13.019 10.203,15.707 -1.426,5.39 -3.574,10.473 -6.316,15.168 -6.153,-2.321 -13.368,-1.035 -18.325,3.91 -4.96,4.961 -6.253,12.152 -3.914,18.309 -4.714,2.738 -9.804,4.886 -15.199,6.308 -2.691,-6.004 -8.723,-10.195 -15.734,-10.195 -7.024,0 -13.051,4.191 -15.742,10.195 -5.399,-1.422 -10.489,-3.57 -15.188,-6.308 2.336,-6.157 1.035,-13.348 -3.93,-18.309 -4.937,-4.945 -12.16,-6.231 -18.312,-3.91 -2.754,-4.695 -4.887,-9.778 -6.328,-15.168 6.015,-2.688 10.211,-8.703 10.211,-15.707 0,-7.016 -4.196,-13.035 -10.211,-15.723 1.441,-5.387 3.574,-10.48 6.328,-15.172 6.152,2.321 13.375,1.035 18.312,-3.929 4.965,-4.946 6.266,-12.145 3.93,-18.289 4.699,-2.739 9.789,-4.883 15.188,-6.313 z"
-         style="fill:#13beb7;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16"
-         inkscape:connector-curvature="0" /></g><path
-       id="path18-2"
-       d="m 594.00776,45.01845 v 51.61634 c -2.72697,-5.08595 -6.75027,-9.16447 -12.08219,-12.23841 -5.32792,-3.19596 -11.24553,-4.79012 -17.76144,-4.79012 -8.05087,0 -15.15634,2.1289 -21.31325,6.38687 -6.15992,4.25392 -11.01476,10.05159 -14.56571,17.38347 -3.55495,7.21493 -5.32774,15.37429 -5.32774,24.47913 0,6.85997 1.06162,13.2432 3.19457,19.15714 2.13298,5.91383 5.15283,11.05696 9.05878,15.43184 4.02692,4.37496 8.70308,7.80506 14.035,10.28903 5.44492,2.36397 11.36652,3.54726 17.76143,3.54726 6.27289,0 12.25428,-1.41837 17.93719,-4.25833 5.68791,-2.83497 10.18774,-7.15134 13.4997,-12.9483 l 0.53529,4.789 c 0.711,3.78494 2.54653,6.74135 5.50351,8.87037 3.08194,2.12895 7.04706,3.1923 11.90298,3.1923 3.07796,0 7.10466,-0.47256 12.07759,-1.41753 V 150.9139 c -2.12897,-0.23402 -3.66769,-0.88627 -4.61669,-1.94822 -0.94998,-1.18405 -1.4221,-3.19479 -1.4221,-6.03074 V 45.01845 Z m 116.16613,0 v 51.61634 c -2.72693,-5.08595 -6.75023,-9.16447 -12.08216,-12.23841 -5.32791,-3.19596 -11.24557,-4.79012 -17.76148,-4.79012 -8.05083,0 -15.15559,2.1289 -21.3155,6.38687 -6.15694,4.25392 -11.01251,10.05159 -14.56348,17.38347 -3.55492,7.21493 -5.32773,15.37429 -5.32773,24.47913 0,6.85997 1.06162,13.2432 3.19459,19.15714 2.13296,5.91383 5.15283,11.05696 9.05875,15.43184 4.02697,4.37496 8.70311,7.80506 14.03503,10.28903 5.44491,2.36397 11.36768,3.54726 17.7626,3.54726 6.27289,0 12.25312,-1.41837 17.93605,-4.25833 5.68792,-2.83497 10.18774,-7.15134 13.49968,-12.9483 l 0.53533,4.789 c 0.71095,3.78494 2.54648,6.74135 5.50349,8.87037 3.08191,2.12895 7.04705,3.1923 11.90293,3.1923 3.07798,0 7.1047,-0.47256 12.07762,-1.41753 V 150.9139 c -2.12897,-0.23402 -3.67172,-0.88627 -4.61669,-1.94822 -0.94997,-1.18405 -1.42212,-3.19479 -1.42212,-6.03074 V 45.01845 Z M 301.762,48.56336 v 125.94515 h 29.13256 v -40.62085 h 19.7131 l 18.66433,31.3829 c 0,0 1.10617,1.82731 1.77016,2.65923 1.398,1.76501 3.3902,4.03924 4.62817,4.92917 2.90596,2.08995 6.3982,3.07051 11.37113,3.07051 1.53899,0 3.25801,-0.11993 5.15199,-0.35495 2.01596,-0.23801 4.32525,-0.59396 6.9302,-1.06601 v -23.59002 c -2.35895,0.0939 -3.43464,0.11657 -4.85563,-0.65248 -1.69196,-0.91092 -2.92204,-2.30029 -4.04002,-3.9642 l -1.17054,-1.97693 -9.85137,-16.64835 c 4.26194,-2.36398 7.93307,-5.37821 11.01501,-9.0461 3.07796,-3.78504 5.44539,-7.98462 7.10136,-12.59453 1.65998,-4.73002 2.48812,-9.69817 2.48812,-14.90111 0,-5.20301 -1.0662,-10.34477 -3.19917,-15.43073 -2.01097,-5.08584 -4.85152,-9.63642 -8.52347,-13.65937 -3.67194,-4.13693 -8.05481,-7.39136 -13.14474,-9.75834 -4.97193,-2.47996 -10.42187,-3.72299 -16.34276,-3.72299 z m 29.13256,25.54283 h 25.75189 c 2.24998,0 4.38293,0.71177 6.39491,2.12973 2.01197,1.41806 3.6718,3.42992 4.97278,6.03192 1.42198,2.48396 2.13202,5.43696 2.13202,8.86695 0,3.42892 -0.59194,6.44421 -1.77593,9.04609 -1.18297,2.601 -2.72384,4.67214 -4.61782,6.21114 -1.77698,1.41795 -3.84758,2.12507 -6.21455,2.12507 h -26.6433 z m 474.14136,5.35534 c -10.54065,0 -19.54147,2.30898 -27.00285,6.9279 -7.4613,4.50051 -13.2063,10.48156 -17.23305,17.94291 -3.90832,7.34296 -5.86185,15.5149 -5.86185,24.51588 0,6.27701 1.12463,12.31658 3.37493,18.11983 2.25022,5.68486 5.50732,10.71895 9.77092,15.10103 4.3821,4.38206 9.65235,7.87533 15.81098,10.48085 6.15855,2.48715 13.20577,3.73107 21.14092,3.73107 7.1061,0 13.5606,-1.06625 19.36388,-3.19803 5.92162,-2.13183 11.01435,-5.0335 15.27787,-8.70497 4.38218,-3.78993 7.75733,-8.11207 10.12605,-12.96788 l -24.16102,-6.75099 c -1.4211,3.43456 -4.02593,6.15861 -7.81583,8.172 -3.6714,2.01333 -7.63935,3.01993 -11.90295,3.01993 -3.43462,0 -6.69172,-0.71077 -9.77107,-2.13202 -3.0792,-1.53963 -5.62553,-3.73052 -7.6389,-6.57296 -1.89495,-2.84236 -3.01958,-6.33564 -3.375,-10.48086 h 68.92875 c 0.11842,-1.18434 0.23655,-2.54631 0.35497,-4.08594 0.23678,-1.6581 0.3549,-3.31701 0.3549,-4.97509 0,-8.5273 -1.95352,-16.40229 -5.86192,-23.62679 -3.90833,-7.34289 -9.59355,-13.26554 -17.05493,-17.766 -7.34287,-4.50053 -16.28415,-6.74987 -26.8248,-6.74987 z m 117.39526,0.50085 c -5.5659,0.11699 -10.8933,1.94846 -15.98318,5.49543 -5.094,3.5509 -9.23775,8.45719 -12.43373,14.72307 V 81.37986 h -26.11252 v 93.12865 h 28.4214 v -55.87808 c 2.484,-4.25797 6.51173,-7.449 12.07763,-9.57801 5.56695,-2.24594 11.78032,-3.37147 18.6483,-3.37147 V 80.13812 c -0.47303,-0.11698 -1.0626,-0.17574 -1.77368,-0.17574 z m -506.4065,1.41748 v 59.60109 c 0,11.47288 2.48899,20.22179 7.46091,26.25277 4.97294,6.03187 12.19982,9.04728 21.67167,9.04728 7.81287,0 14.8606,-1.41837 21.1375,-4.25833 6.39391,-2.957 11.7223,-7.50646 15.98323,-13.65937 l 0.5353,5.6804 c 0.71098,3.78087 2.54712,6.73799 5.50808,8.86695 2.95696,2.01192 6.92545,3.01539 11.8984,3.01539 1.53896,0 3.25701,-0.11709 5.15198,-0.35611 2.01197,-0.23402 4.31963,-0.58937 6.92561,-1.06142 V 150.9139 c -2.24997,-0.23402 -3.84746,-0.88627 -4.79244,-1.94822 -0.83199,-1.18405 -1.24636,-3.19479 -1.24636,-6.03074 V 81.37986 h -28.41807 v 57.47254 c -1.77797,3.19497 -3.79281,5.79644 -6.03878,7.80435 -2.24998,2.01204 -4.5621,3.48845 -6.92905,4.43747 -2.36697,0.82399 -4.85494,1.23834 -7.46092,1.23834 -4.14392,0 -7.34066,-1.47705 -9.59062,-4.43406 -2.24997,-3.07394 -3.37492,-7.44929 -3.37492,-13.12522 V 81.37986 Z M 804.6799,99.89141 c 3.55297,0 6.81,0.82891 9.77085,2.48695 2.96092,1.53971 5.3295,3.79016 7.10602,6.75104 1.77645,2.84238 2.90228,6.21756 3.37598,10.12593 h -40.50473 c 0.47363,-3.90837 1.59953,-7.28355 3.37598,-10.12593 1.77652,-2.96088 4.08547,-5.21133 6.92797,-6.75104 2.96093,-1.65804 6.27638,-2.48695 9.94793,-2.48695 z m -231.45699,3.84015 c 2.84296,0 5.62404,0.70765 8.35,2.12859 2.83997,1.41802 5.32848,3.30884 7.45746,5.67582 2.24997,2.36298 3.96916,5.14518 5.15313,8.33621 v 19.5109 c -0.94598,1.89393 -2.1327,3.66831 -3.55066,5.32433 -1.42199,1.65598 -3.02008,3.01593 -4.79704,4.07789 -1.66,1.06701 -3.43377,1.95351 -5.32775,2.66046 -1.89497,0.59397 -3.85221,0.8868 -5.86419,0.8868 -3.19496,0 -6.15591,-0.59062 -8.88185,-1.7736 -2.72297,-1.17993 -5.09054,-2.83574 -7.10252,-4.96475 -2.01596,-2.24593 -3.61304,-4.78858 -4.79703,-7.62861 -1.06597,-2.95694 -1.59672,-6.14908 -1.59672,-9.57801 0,-3.313 0.47267,-6.44522 1.41867,-9.40222 1.06599,-2.95694 2.54595,-5.55847 4.44093,-7.80441 1.89396,-2.36391 4.085,-4.19998 6.57295,-5.50001 2.60597,-1.30097 5.44567,-1.94939 8.52462,-1.94939 z m 116.16615,0 c 2.84296,0 5.62523,0.70765 8.35115,2.12859 2.83996,1.41802 5.32733,3.30884 7.45629,5.67582 2.25,2.36298 3.96901,5.14518 5.152,8.33621 v 19.5109 c -0.94496,1.89393 -2.13153,3.66831 -3.54954,5.32433 -1.42197,1.65598 -3.02007,3.01593 -4.79702,4.07789 -1.65997,1.06701 -3.43376,1.95351 -5.32775,2.66046 -1.89498,0.59397 -3.85221,0.8868 -5.86418,0.8868 -3.19496,0 -6.15649,-0.59062 -8.87842,-1.7736 -2.72697,-1.17993 -5.09396,-2.83574 -7.10593,-4.96475 -2.01597,-2.24593 -3.6119,-4.78858 -4.79588,-7.62861 -1.06601,-2.95694 -1.59787,-6.14908 -1.59787,-9.57801 0,-3.313 0.47251,-6.44522 1.41748,-9.40222 1.06701,-2.95694 2.54712,-5.55847 4.44212,-7.80441 1.89394,-2.36391 4.08612,-4.19998 6.57407,-5.50001 2.60594,-1.30097 5.4445,-1.94939 8.52348,-1.94939 z"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999851"
-       inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/logo-rudder.svg b/webapp/sources/rudder/rudder-web/src/main/webapp/images/logo-rudder.svg
deleted file mode 100644
index 7eb08a77a34..00000000000
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/images/logo-rudder.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   xml:space="preserve"
-   width="1300"
-   height="300"
-   viewBox="0 0 1300 300"
-   sodipodi:docname="logo-rudder-2021.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs6" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1848"
-     inkscape:window-height="1016"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="0.5286983"
-     inkscape:cx="72.47793"
-     inkscape:cy="334.38434"
-     inkscape:window-x="750"
-     inkscape:window-y="1107"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g10" /><g
-     id="g10"
-     inkscape:groupmode="layer"
-     inkscape:label="2021-FIC-logo-rudder"
-     transform="matrix(1.3333333,0,0,1.3333333,0,7.5e-6)"><g
-       id="g12"><path
-         d="m 141.797,18.77 c -51.836,0 -93.856,41.964 -93.859,93.726 0,24.859 9.89,48.703 27.492,66.281 17.601,17.578 41.472,27.453 66.367,27.453 24.891,-0.003 48.762,-9.878 66.363,-27.457 17.602,-17.578 27.488,-41.418 27.488,-66.277 -0.039,-23.273 -8.75,-45.699 -24.433,-62.914 l -61.246,68.184 c -1.871,1.882 -4.344,2.816 -6.809,2.816 -2.465,0 -4.941,-0.934 -6.812,-2.816 -3.766,-3.758 -3.766,-9.852 0,-13.614 L 204.617,43.004 C 187.398,27.445 165.016,18.809 141.797,18.77 Z m -15.738,34.312 c 2.691,6.012 8.718,10.199 15.742,10.199 7.011,0 13.043,-4.187 15.734,-10.199 5.395,1.43 10.485,3.574 15.199,6.313 -0.609,1.566 -0.945,3.207 -1.074,4.843 l -20.578,17.891 c -2.949,-0.91 -6.059,-1.387 -9.281,-1.387 -17.535,0 -31.801,14.238 -31.801,31.766 0,17.5 14.266,31.75 31.801,31.75 17.527,0 31.797,-14.25 31.797,-31.75 0,-3.383 -0.543,-6.629 -1.516,-9.68 l 17.547,-20.156 c 1.82,-0.074 3.613,-0.418 5.344,-1.059 2.742,4.692 4.89,9.782 6.316,15.157 -6.012,2.703 -10.203,8.722 -10.203,15.738 0,7.004 4.191,13.019 10.203,15.707 -1.426,5.39 -3.574,10.473 -6.316,15.168 -6.153,-2.321 -13.368,-1.035 -18.325,3.91 -4.96,4.961 -6.253,12.152 -3.914,18.309 -4.714,2.738 -9.804,4.886 -15.199,6.308 -2.691,-6.004 -8.723,-10.195 -15.734,-10.195 -7.024,0 -13.051,4.191 -15.742,10.195 -5.399,-1.422 -10.489,-3.57 -15.188,-6.308 2.336,-6.157 1.035,-13.348 -3.93,-18.309 -4.937,-4.945 -12.16,-6.231 -18.312,-3.91 -2.754,-4.695 -4.887,-9.778 -6.328,-15.168 6.015,-2.688 10.211,-8.703 10.211,-15.707 0,-7.016 -4.196,-13.035 -10.211,-15.723 1.441,-5.387 3.574,-10.48 6.328,-15.172 6.152,2.321 13.375,1.035 18.312,-3.929 4.965,-4.946 6.266,-12.145 3.93,-18.289 4.699,-2.739 9.789,-4.883 15.188,-6.313 z"
-         style="fill:#13beb7;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16"
-         inkscape:connector-curvature="0" /></g><path
-       id="path18-2"
-       d="m 594.00776,45.01845 v 51.61634 c -2.72697,-5.08595 -6.75027,-9.16447 -12.08219,-12.23841 -5.32792,-3.19596 -11.24553,-4.79012 -17.76144,-4.79012 -8.05087,0 -15.15634,2.1289 -21.31325,6.38687 -6.15992,4.25392 -11.01476,10.05159 -14.56571,17.38347 -3.55495,7.21493 -5.32774,15.37429 -5.32774,24.47913 0,6.85997 1.06162,13.2432 3.19457,19.15714 2.13298,5.91383 5.15283,11.05696 9.05878,15.43184 4.02692,4.37496 8.70308,7.80506 14.035,10.28903 5.44492,2.36397 11.36652,3.54726 17.76143,3.54726 6.27289,0 12.25428,-1.41837 17.93719,-4.25833 5.68791,-2.83497 10.18774,-7.15134 13.4997,-12.9483 l 0.53529,4.789 c 0.711,3.78494 2.54653,6.74135 5.50351,8.87037 3.08194,2.12895 7.04706,3.1923 11.90298,3.1923 3.07796,0 7.10466,-0.47256 12.07759,-1.41753 V 150.9139 c -2.12897,-0.23402 -3.66769,-0.88627 -4.61669,-1.94822 -0.94998,-1.18405 -1.4221,-3.19479 -1.4221,-6.03074 V 45.01845 Z m 116.16613,0 v 51.61634 c -2.72693,-5.08595 -6.75023,-9.16447 -12.08216,-12.23841 -5.32791,-3.19596 -11.24557,-4.79012 -17.76148,-4.79012 -8.05083,0 -15.15559,2.1289 -21.3155,6.38687 -6.15694,4.25392 -11.01251,10.05159 -14.56348,17.38347 -3.55492,7.21493 -5.32773,15.37429 -5.32773,24.47913 0,6.85997 1.06162,13.2432 3.19459,19.15714 2.13296,5.91383 5.15283,11.05696 9.05875,15.43184 4.02697,4.37496 8.70311,7.80506 14.03503,10.28903 5.44491,2.36397 11.36768,3.54726 17.7626,3.54726 6.27289,0 12.25312,-1.41837 17.93605,-4.25833 5.68792,-2.83497 10.18774,-7.15134 13.49968,-12.9483 l 0.53533,4.789 c 0.71095,3.78494 2.54648,6.74135 5.50349,8.87037 3.08191,2.12895 7.04705,3.1923 11.90293,3.1923 3.07798,0 7.1047,-0.47256 12.07762,-1.41753 V 150.9139 c -2.12897,-0.23402 -3.67172,-0.88627 -4.61669,-1.94822 -0.94997,-1.18405 -1.42212,-3.19479 -1.42212,-6.03074 V 45.01845 Z M 301.762,48.56336 v 125.94515 h 29.13256 v -40.62085 h 19.7131 l 18.66433,31.3829 c 0,0 1.10617,1.82731 1.77016,2.65923 1.398,1.76501 3.3902,4.03924 4.62817,4.92917 2.90596,2.08995 6.3982,3.07051 11.37113,3.07051 1.53899,0 3.25801,-0.11993 5.15199,-0.35495 2.01596,-0.23801 4.32525,-0.59396 6.9302,-1.06601 v -23.59002 c -2.35895,0.0939 -3.43464,0.11657 -4.85563,-0.65248 -1.69196,-0.91092 -2.92204,-2.30029 -4.04002,-3.9642 l -1.17054,-1.97693 -9.85137,-16.64835 c 4.26194,-2.36398 7.93307,-5.37821 11.01501,-9.0461 3.07796,-3.78504 5.44539,-7.98462 7.10136,-12.59453 1.65998,-4.73002 2.48812,-9.69817 2.48812,-14.90111 0,-5.20301 -1.0662,-10.34477 -3.19917,-15.43073 -2.01097,-5.08584 -4.85152,-9.63642 -8.52347,-13.65937 -3.67194,-4.13693 -8.05481,-7.39136 -13.14474,-9.75834 -4.97193,-2.47996 -10.42187,-3.72299 -16.34276,-3.72299 z m 29.13256,25.54283 h 25.75189 c 2.24998,0 4.38293,0.71177 6.39491,2.12973 2.01197,1.41806 3.6718,3.42992 4.97278,6.03192 1.42198,2.48396 2.13202,5.43696 2.13202,8.86695 0,3.42892 -0.59194,6.44421 -1.77593,9.04609 -1.18297,2.601 -2.72384,4.67214 -4.61782,6.21114 -1.77698,1.41795 -3.84758,2.12507 -6.21455,2.12507 h -26.6433 z m 474.14136,5.35534 c -10.54065,0 -19.54147,2.30898 -27.00285,6.9279 -7.4613,4.50051 -13.2063,10.48156 -17.23305,17.94291 -3.90832,7.34296 -5.86185,15.5149 -5.86185,24.51588 0,6.27701 1.12463,12.31658 3.37493,18.11983 2.25022,5.68486 5.50732,10.71895 9.77092,15.10103 4.3821,4.38206 9.65235,7.87533 15.81098,10.48085 6.15855,2.48715 13.20577,3.73107 21.14092,3.73107 7.1061,0 13.5606,-1.06625 19.36388,-3.19803 5.92162,-2.13183 11.01435,-5.0335 15.27787,-8.70497 4.38218,-3.78993 7.75733,-8.11207 10.12605,-12.96788 l -24.16102,-6.75099 c -1.4211,3.43456 -4.02593,6.15861 -7.81583,8.172 -3.6714,2.01333 -7.63935,3.01993 -11.90295,3.01993 -3.43462,0 -6.69172,-0.71077 -9.77107,-2.13202 -3.0792,-1.53963 -5.62553,-3.73052 -7.6389,-6.57296 -1.89495,-2.84236 -3.01958,-6.33564 -3.375,-10.48086 h 68.92875 c 0.11842,-1.18434 0.23655,-2.54631 0.35497,-4.08594 0.23678,-1.6581 0.3549,-3.31701 0.3549,-4.97509 0,-8.5273 -1.95352,-16.40229 -5.86192,-23.62679 -3.90833,-7.34289 -9.59355,-13.26554 -17.05493,-17.766 -7.34287,-4.50053 -16.28415,-6.74987 -26.8248,-6.74987 z m 117.39526,0.50085 c -5.5659,0.11699 -10.8933,1.94846 -15.98318,5.49543 -5.094,3.5509 -9.23775,8.45719 -12.43373,14.72307 V 81.37986 h -26.11252 v 93.12865 h 28.4214 v -55.87808 c 2.484,-4.25797 6.51173,-7.449 12.07763,-9.57801 5.56695,-2.24594 11.78032,-3.37147 18.6483,-3.37147 V 80.13812 c -0.47303,-0.11698 -1.0626,-0.17574 -1.77368,-0.17574 z m -506.4065,1.41748 v 59.60109 c 0,11.47288 2.48899,20.22179 7.46091,26.25277 4.97294,6.03187 12.19982,9.04728 21.67167,9.04728 7.81287,0 14.8606,-1.41837 21.1375,-4.25833 6.39391,-2.957 11.7223,-7.50646 15.98323,-13.65937 l 0.5353,5.6804 c 0.71098,3.78087 2.54712,6.73799 5.50808,8.86695 2.95696,2.01192 6.92545,3.01539 11.8984,3.01539 1.53896,0 3.25701,-0.11709 5.15198,-0.35611 2.01197,-0.23402 4.31963,-0.58937 6.92561,-1.06142 V 150.9139 c -2.24997,-0.23402 -3.84746,-0.88627 -4.79244,-1.94822 -0.83199,-1.18405 -1.24636,-3.19479 -1.24636,-6.03074 V 81.37986 h -28.41807 v 57.47254 c -1.77797,3.19497 -3.79281,5.79644 -6.03878,7.80435 -2.24998,2.01204 -4.5621,3.48845 -6.92905,4.43747 -2.36697,0.82399 -4.85494,1.23834 -7.46092,1.23834 -4.14392,0 -7.34066,-1.47705 -9.59062,-4.43406 -2.24997,-3.07394 -3.37492,-7.44929 -3.37492,-13.12522 V 81.37986 Z M 804.6799,99.89141 c 3.55297,0 6.81,0.82891 9.77085,2.48695 2.96092,1.53971 5.3295,3.79016 7.10602,6.75104 1.77645,2.84238 2.90228,6.21756 3.37598,10.12593 h -40.50473 c 0.47363,-3.90837 1.59953,-7.28355 3.37598,-10.12593 1.77652,-2.96088 4.08547,-5.21133 6.92797,-6.75104 2.96093,-1.65804 6.27638,-2.48695 9.94793,-2.48695 z m -231.45699,3.84015 c 2.84296,0 5.62404,0.70765 8.35,2.12859 2.83997,1.41802 5.32848,3.30884 7.45746,5.67582 2.24997,2.36298 3.96916,5.14518 5.15313,8.33621 v 19.5109 c -0.94598,1.89393 -2.1327,3.66831 -3.55066,5.32433 -1.42199,1.65598 -3.02008,3.01593 -4.79704,4.07789 -1.66,1.06701 -3.43377,1.95351 -5.32775,2.66046 -1.89497,0.59397 -3.85221,0.8868 -5.86419,0.8868 -3.19496,0 -6.15591,-0.59062 -8.88185,-1.7736 -2.72297,-1.17993 -5.09054,-2.83574 -7.10252,-4.96475 -2.01596,-2.24593 -3.61304,-4.78858 -4.79703,-7.62861 -1.06597,-2.95694 -1.59672,-6.14908 -1.59672,-9.57801 0,-3.313 0.47267,-6.44522 1.41867,-9.40222 1.06599,-2.95694 2.54595,-5.55847 4.44093,-7.80441 1.89396,-2.36391 4.085,-4.19998 6.57295,-5.50001 2.60597,-1.30097 5.44567,-1.94939 8.52462,-1.94939 z m 116.16615,0 c 2.84296,0 5.62523,0.70765 8.35115,2.12859 2.83996,1.41802 5.32733,3.30884 7.45629,5.67582 2.25,2.36298 3.96901,5.14518 5.152,8.33621 v 19.5109 c -0.94496,1.89393 -2.13153,3.66831 -3.54954,5.32433 -1.42197,1.65598 -3.02007,3.01593 -4.79702,4.07789 -1.65997,1.06701 -3.43376,1.95351 -5.32775,2.66046 -1.89498,0.59397 -3.85221,0.8868 -5.86418,0.8868 -3.19496,0 -6.15649,-0.59062 -8.87842,-1.7736 -2.72697,-1.17993 -5.09396,-2.83574 -7.10593,-4.96475 -2.01597,-2.24593 -3.6119,-4.78858 -4.79588,-7.62861 -1.06601,-2.95694 -1.59787,-6.14908 -1.59787,-9.57801 0,-3.313 0.47251,-6.44522 1.41748,-9.40222 1.06701,-2.95694 2.54712,-5.55847 4.44212,-7.80441 1.89394,-2.36391 4.08612,-4.19998 6.57407,-5.50001 2.60594,-1.30097 5.4445,-1.94939 8.52348,-1.94939 z"
-       style="fill:#041922;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999851"
-       inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/rudder-favicon.ico b/webapp/sources/rudder/rudder-web/src/main/webapp/images/rudder-favicon.ico
index 7d823fb4d31..e13ecb9b7d9 100644
Binary files a/webapp/sources/rudder/rudder-web/src/main/webapp/images/rudder-favicon.ico and b/webapp/sources/rudder/rudder-web/src/main/webapp/images/rudder-favicon.ico differ
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/images/tableau/fdTaboHead.jpg b/webapp/sources/rudder/rudder-web/src/main/webapp/images/tableau/fdTaboHead.jpg
deleted file mode 100644
index fe14f309d35..00000000000
Binary files a/webapp/sources/rudder/rudder-web/src/main/webapp/images/tableau/fdTaboHead.jpg and /dev/null differ
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/index.html b/webapp/sources/rudder/rudder-web/src/main/webapp/index.html
index b8644d55b03..09bec3e17bd 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/index.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/index.html
@@ -10,7 +10,9 @@
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/fontawesome-5-15-1/css/v4-shims.min.css"/>
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/ionicons-2.0.1/css/ionicons.min.css">
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/login.css">
+
     <link href="/images/rudder-favicon.ico" data-lift="with-cached-resource" rel="icon" type="image/x-icon" >
+
     <script type="text/javascript" data-lift="with-cached-resource" src="/javascript/libs/jquery.min.js"></script>
     <script type="text/javascript" data-lift="with-cached-resource" src="/javascript/libs/bootstrap.min.js"></script>
 </head>
@@ -21,7 +23,7 @@
     <div data-lift="Login.display">
 
       <div class="logo-container">
-        <img src="/images/logo-rudder.svg" data-lift="with-cached-resource" alt="Rudder"/>
+        <img src="/images/logo/rudder-logo-rect-black.svg" data-lift="with-cached-resource" alt="Rudder"/>
       </div>
 
       <div class="plugin-info"></div>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/databaseManagement.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/databaseManagement.html
index 95c2ddeaef8..8689c4d1dd4 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/databaseManagement.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/databaseManagement.html
@@ -2,15 +2,7 @@
 
 <head>
   <title>Rudder - Reports database</title>
-  <style>
-    .rudder-template > .one-col{
-      flex: 1;
-    }
-    .template-main{
-      flex-basis : initial !important;
-      flex: auto !important;
-    }
-  </style>
+  <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-database.css" media="screen">
   <script type="text/javascript">
     // <![CDATA[
     var initReportDatepickler = function(selector) {
@@ -101,19 +93,14 @@ <h3 class="page-title">Automatic report cleaning</h3>
                         highly recommended, to avoid Rudder's disk usage growing forever.
                       </div>
                     </div>
-                    <div class="automaticCleanDetail">
-                      Automatic report deleting is <b><span id="autoDeleteStatus">[Here
-              comes the report deleting status]</span></b>.
-                      <span id="autoDeleteDetails"> All reports older than
-              <b><span id="autoDeleteDays">[Here comes the automatic report
-              delete age parameter]</span> days</b> will be deleted regularly.
-              </span>
+                    <div class="mb-1">
+                      Automatic report deleting is <b><span id="autoDeleteStatus">[Here comes the report deleting status]</span></b>.
+                      <span id="autoDeleteDetails"> All reports older than <b><span id="autoDeleteDays">[Here comes the automatic report delete age parameter]</span> days</b> will be deleted regularly.</span>
                     </div>
                     <table id="automaticCleanDetails" class="database-info-table">
                       <tr>
                         <td>Frequency:</td>
-                        <td><b><span id="cleanFrequency">[Here
-                      comes the cleaning job frequency]</span></b></td>
+                        <td><b><span id="cleanFrequency">[Here comes the cleaning job frequency]</span></b></td>
                       </tr>
                       <tr>
                         <td>Next run:</td>
@@ -136,7 +123,7 @@ <h3 class="page-title">Manual report cleaning</h3>
                         until the cleaning process is idle.
                       </div>
                     </div>
-                    <div class="automaticCleanDetail">
+                    <div class="mb-1">
                       The delete process is <b id="deleteProgress">
                       [Here comes the report archiving progress]</b>.
                     </div>
@@ -145,12 +132,12 @@ <h3 class="page-title">Manual report cleaning</h3>
                         <td colspan="2">
                           <form class="lift:form.ajax">
                             <div>
-                      <span id="cleanParam">
-                        <span id="modeSelector"></span> all reports older than: <input id="reportFromDate" value="" />
-                        <lift:authz role="administration_write">
-                          <button id="deleteReports">Start cleaning reports</button>
-                        </lift:authz>
-                      </span>
+                              <span id="cleanParam">
+                                <span id="modeSelector"></span> all reports older than: <input id="reportFromDate" value="" />
+                                <lift:authz role="administration_write">
+                                  <button id="deleteReports">Start cleaning reports</button>
+                                </lift:authz>
+                              </span>
                               <span id="confirm"></span>
                             </div>
                             <lift:Msgs>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html
index 5d57fb9764a..92181bebd6f 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/policyServerManagement.html
@@ -18,10 +18,6 @@
       padding-top: 5px;
       margin-top: -5px;
     }
-    .agent-run-form.animate-hide .page-subtitle {
-      border-bottom: none;
-      margin-bottom: 8px;
-    }
     .agent-run-form h4.space-top{
       margin-top: 10px !important;
     }
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/techniqueLibraryManagement.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/techniqueLibraryManagement.html
index 98a1ada658b..3b518687d58 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/techniqueLibraryManagement.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/techniqueLibraryManagement.html
@@ -1,7 +1,8 @@
 <lift:surround with="common-layout" at="content">
 
 <head>
-<title>Rudder - Technique library management</title>
+  <title>Rudder - Technique library management</title>
+  <link media="screen" data-lift="with-cached-resource" href="/style/rudder/rudder-directives.css" rel="stylesheet" type="text/css">
 </head>
 
 <div data-lift="administration.TechniqueLibraryManagement.head"></div>
@@ -48,7 +49,7 @@
               </div>
             </div>
           </div>
-          <small id="updateLib" class="greyscala"></small>
+          <small id="updateLib" class="text-secondary"></small>
           <div data-lift="administration.TechniqueLibraryManagement.systemLibrary" ></div>
         </div>
 
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html
index db932f93de1..04d3ebe855d 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html
@@ -103,7 +103,7 @@ <h1>
       </lift:ignore>
       <div id="createGlobalParameterContainer"></div>
     </div>
-    <div id="deletionPopup" class="nodisplay"></div>
+    <div id="deletionPopup" class="d-none"></div>
   </div>
 
 </lift:surround>
\ No newline at end of file
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/nodeManager/manageNewNode.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/nodeManager/manageNewNode.html
index e86c42877df..c94154ab4fb 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/nodeManager/manageNewNode.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/nodeManager/manageNewNode.html
@@ -71,7 +71,7 @@ <h1>
                     <div  data-lift="lazy-load?template=lazy-load-spinner">
                       <div data-lift="node.AcceptNode.list">
                         <pending-servers></pending-servers>
-                        <div id="acceptNodeGrid_paginate_area" class="nodisplay"></div>
+                        <div id="acceptNodeGrid_paginate_area" class="d-none"></div>
                         <lift:authz role="node_write">
                           <div class="action-btns">
                             <pending-refuse></pending-refuse>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/utilities/eventLogs.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/utilities/eventLogs.html
index 6fcc8d15047..fffae489055 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/utilities/eventLogs.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/utilities/eventLogs.html
@@ -2,33 +2,7 @@
 
   <head_merge>
     <title>Rudder - Event logs</title>
-    <style>
-      .rudder-template > .one-col{
-        flex: 1;
-      }
-      .template-main{
-        flex-basis : initial !important;
-        flex: auto !important;
-      }
-      pre.technical-details{
-        white-space: pre-wrap;
-        border: 1px solid #D6DEEF;
-        border-radius: 4px;
-        background-color: #F8F9FC;
-        padding: 4px;
-      }
-      #filterLogs {
-        margin-top: 10px;
-        color: #738195;
-      }
-      .btn.showParameters{
-        margin-bottom: 10px;
-        min-width: 195px;
-      }
-      .dataTables_filter label input{
-        margin-left: 8px;
-      }
-    </style>
+    <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-eventlogs.css" media="screen">
     <script type="text/javascript" data-lift="with-cached-resource" src="/javascript/libs/jsondiffpatch.umd.slim.js"></script>
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/libs/html.css" />
   </head_merge>
@@ -59,7 +33,7 @@ <h1>
 
                   <table id="eventLogsGrid" class="display" cellspacing="0"></table>
 
-                  <div id="eventDetailPopup" class="nodisplay">
+                  <div id="eventDetailPopup" class="d-none">
                     <lift:ignore>
                       This div gets the content of the eventDetailPopup injected within
                     </lift:ignore>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/accept_new_server.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/accept_new_server.html
index 8f73a30fa6a..f3db33cb860 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/accept_new_server.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/accept_new_server.html
@@ -17,7 +17,7 @@ <h5 class="modal-title">Accept nodes in Rudder</h5>
                 <h6 class="text-center">
                     Please confirm that you wish to <b class="text-success">accept</b> the following nodes in Rudder
                 </h6>
-                <div id="pendingNodeConfirm_paginate_area" class="nodisplay"></div>
+                <div id="pendingNodeConfirm_paginate_area" class="d-none"></div>
                 <div class="table-responsive">
                     <table id="pendingNodeConfirm" class="my-3">
                       <thead>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/createCloneGroupPopup.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/createCloneGroupPopup.html
index c86d57d68ce..2feda40eab7 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/createCloneGroupPopup.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/createCloneGroupPopup.html
@@ -10,7 +10,7 @@ <h5 class="modal-title">Clone Group</h5>
                 <item-itemname ></item-itemname>
                 <item-itemcontainer ></item-itemcontainer>
                 <item-itemdescription ></item-itemdescription>
-                <div id="createGroupHiddable" class="nodisplay">
+                <div id="createGroupHiddable" class="d-none">
                     <item-grouptype ></item-grouptype>
                 </div>
                 <item-itemreason ></item-itemreason>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/expected_policy_popup.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/expected_policy_popup.html
index 39f9ce6c9b5..f667f5d5ab1 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/expected_policy_popup.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/expected_policy_popup.html
@@ -37,7 +37,7 @@ <h4 class="text-center">The following Rules will be applied to this node as it j
                   <div class="space-bottom space-top">
                     <span class="clearable">All the following grid will be replace by the real grid</span>
                     <div id="dependentRulesGrid">
-                      <div id="expectedPolicyTabs_paginate_area" class="nodisplay"></div>
+                      <div id="expectedPolicyTabs_paginate_area" class="d-none"></div>
                         <table cellspacing="0" id="expectedPolicyTabs" width="600">
                           <thead>
                             <tr class="head">
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/refuse_new_server.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/refuse_new_server.html
index 1fc0c59b65b..cfcfe10eadf 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/refuse_new_server.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/Popup/refuse_new_server.html
@@ -17,7 +17,7 @@ <h5 class="modal-title">Refuse nodes in Rudder</h5>
                 <h6 class="text-center">
                     Please confirm that you wish to <b class="text-danger">refuse</b> the following nodes in Rudder
                 </h6>
-                <div id="pendingNodeConfirm_paginate_area" class="nodisplay"></div>
+                <div id="pendingNodeConfirm_paginate_area" class="d-none"></div>
                 <div class="table-responsive space-bottom space-top">
                     <table id="pendingNodeConfirm">
                       <thead>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/common-layout.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/common-layout.html
index 06f100bb320..439128cea66 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/common-layout.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/common-layout.html
@@ -15,9 +15,6 @@
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/fontawesome-5-15-1/css/v4-shims.min.css"/>
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/ionicons-2.0.1/css/ionicons.min.css">
 
-
-    <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder.css" media="screen" />
-
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-bootstrap.css" media="screen" />
 
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-compliance.css" media="screen" />
@@ -30,6 +27,7 @@
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-menu.css"/>
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-template.css"/>
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-datatable.css" media="screen" />
+    <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-jstree.css" media="screen" />
     <link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-tags.css" media="screen" />
 
     <script type="text/javascript" data-lift="with-cached-resource" src="/javascript/utils/WeakMap.js"></script>
@@ -108,8 +106,8 @@
     <div class="wrapper">
       <header class="main-header">
         <a href="/secure/" class="logo fixed">
-          <span class="logo-mini"><img alt="Rudder" data-lift="with-cached-resource" src="/images/logo-rudder-sm.svg"></span>
-          <span class="logo-lg"><img alt="Rudder" data-lift="with-cached-resource" src="/images/logo-rudder-white.svg"></span>
+          <span class="logo-mini"><img alt="Rudder" data-lift="with-cached-resource" src="/images/logo/rudder-logo-notext.svg"></span>
+          <span class="logo-lg"><img alt="Rudder" data-lift="with-cached-resource" src="/images/logo/rudder-logo-rect-white.svg"></span>
         </a>
 
         <nav class="navbar navbar-expand">
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentDirectiveEditForm.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentDirectiveEditForm.html
index 5079a525257..a85db5e3462 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentDirectiveEditForm.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentDirectiveEditForm.html
@@ -98,10 +98,10 @@ <h1>
                 </label>
                 <div class="markdown">
                   <div id="longDescriptionFieldMarkdown"></div>
-                  <p id="longDescriptionFieldMarkdownEmpty" class="nodisplay half-opacity">No description defined, click on <i class="fa fa-pencil text-primary cursorPointer half-opacity" onmouseenter="toggleOpacity(this)" onmouseout="toggleOpacity(this)" onclick="toggleMarkdownEditor('longDescriptionField')"></i> to edit </p>
+                  <p id="longDescriptionFieldMarkdownEmpty" class="d-none half-opacity">No description defined, click on <i class="fa fa-pencil text-primary cursorPointer half-opacity" onmouseenter="toggleOpacity(this)" onmouseout="toggleOpacity(this)" onclick="toggleMarkdownEditor('longDescriptionField')"></i> to edit </p>
                 </div>
               </div>
-              <div id="longDescriptionFieldContainer" class="d-flex visually-hidden">
+              <div id="longDescriptionFieldContainer" class="d-flex d-none">
                 <div id="longDescriptionField">
                   Here comes the longDescription field
                 </div>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentRuleEditForm.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentRuleEditForm.html
index 9ea544a4e96..e0025e50df3 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentRuleEditForm.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentRuleEditForm.html
@@ -168,10 +168,10 @@ <h3 class="box-title"><i id="changeIconRule" class="fa fa-gear"></i> Rule</h3>
         </label>
         <div class="markdown">
           <div id="longDescriptionFieldMarkdown"></div>
-          <p id="longDescriptionFieldMarkdownEmpty" class="nodisplay half-opacity">No description defined, click on <i class="fa fa-pencil text-primary cursorPointer half-opacity" onmouseenter="toggleOpacity(this)" onmouseout="toggleOpacity(this)" onclick="toggleMarkdownEditor('longDescriptionField')"></i> to edit </p>
+          <p id="longDescriptionFieldMarkdownEmpty" class="d-none half-opacity">No description defined, click on <i class="fa fa-pencil text-primary cursorPointer half-opacity" onmouseenter="toggleOpacity(this)" onmouseout="toggleOpacity(this)" onclick="toggleMarkdownEditor('longDescriptionField')"></i> to edit </p>
         </div>
       </div>
-        <div id="longDescriptionFieldContainer" class="nodisplay">
+        <div id="longDescriptionFieldContainer" class="d-none">
           <div id="longDescriptionField">
             Here comes the longDescription field
           </div>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentTechniqueEditForm.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentTechniqueEditForm.html
index ac90dfde4a2..7915370ad00 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentTechniqueEditForm.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentTechniqueEditForm.html
@@ -110,7 +110,7 @@ <h4 class="text-center">
                         </div>
                         <div class="alert alert-warning col-xl-12 col-md-12 col-sm-12 text-center space-bottom" role="alert">
                             <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
-                            <span class="visually-hidden">Warning:</span>
+                            <span class="d-none">Warning:</span>
                             Deleting this Technique will also delete its history and compliance reports,
                             and the Directives and Rules above.
                         </div>
@@ -160,7 +160,7 @@ <h4 class="text-center">
                     </div>
                     <div class="alert alert-warning col-xl-12 col-md-12 col-sm-12 text-center space-bottom" role="alert">
                         <span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
-                        <span class="visually-hidden">Warning:</span>
+                        <span class="d-none">Warning:</span>
                         Enabling/Disabling this Technique will affect the Directives and Rules above.
                     </div>
                     <h4 class="col-xl-12 col-md-12 col-sm-12 audit-title">Change Audit Log</h4>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/NodeGroupForm.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/NodeGroupForm.html
index 59ac646ebee..a187e74786b 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/NodeGroupForm.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/components/NodeGroupForm.html
@@ -82,10 +82,10 @@ <h1>
                 </label>
                 <div class="markdown">
                   <div id="longDescriptionFieldMarkdown"></div>
-                  <p id="longDescriptionFieldMarkdownEmpty" class="nodisplay half-opacity">No description defined, click on <i class="fa fa-pencil text-primary cursorPointer half-opacity" onmouseenter="toggleOpacity(this)" onmouseout="toggleOpacity(this)" onclick="toggleMarkdownEditor('longDescriptionField')"></i> to edit </p>
+                  <p id="longDescriptionFieldMarkdownEmpty" class="d-none half-opacity">No description defined, click on <i class="fa fa-pencil text-primary cursorPointer half-opacity" onmouseenter="toggleOpacity(this)" onmouseout="toggleOpacity(this)" onclick="toggleMarkdownEditor('longDescriptionField')"></i> to edit </p>
                 </div>
               </div>
-              <div id="longDescriptionFieldContainer" class="d-flex visually-hidden">
+              <div id="longDescriptionFieldContainer" class="d-flex d-none">
                 <div id="longDescriptionField" class="col-6">
                   Here comes the longDescription field
                 </div>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/server/server_details.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/server/server_details.html
index 5f41c6abefd..050beb48d67 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/server/server_details.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/server/server_details.html
@@ -64,23 +64,6 @@
 <lift:ignore>This part is the detail of a node</lift:ignore>
 
 <detail-server>
-  <style>
-  #serverDetails{
-    display: flex;
-    flex-direction: column;
-    flex: 1;
-    overflow: hidden;
-  }
-  .query-search-message, #querySearchSection, #query-search-content, #querySearchInfo{
-    display:none !important;
-  }
-  .rudder-template .one-col .template-main .main-details{
-    padding-bottom: 0;
-  }
-  #logsDetails{
-    margin-bottom: 50px;
-  }
-  </style>
   <div class="main-header">
     <head_merge>
       <script data-lift="with-cached-resource" src="/javascript/rudder/elm/rudder-nodeproperties.js"></script>
diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/server_grid.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/server_grid.html
index 4d5e6315dd8..ef700cfbe62 100644
--- a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/server_grid.html
+++ b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/server_grid.html
@@ -5,7 +5,6 @@
  -->
 
 <servergrid-table >
-
   <table class="fixedlayout" cellspacing="0">
   <thead>
     <tr class="head" id="header">
@@ -17,5 +16,4 @@
   <tbody id="lines">
   </tbody>
   </table>
-
 </servergrid-table>
diff --git a/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/post-migration/ncf_techniques/technique_with_blocks/1.0/metadata.xml b/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/post-migration/ncf_techniques/technique_with_blocks/1.0/metadata.xml
index c9a6460bc41..0aee4135a7c 100644
--- a/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/post-migration/ncf_techniques/technique_with_blocks/1.0/metadata.xml
+++ b/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/post-migration/ncf_techniques/technique_with_blocks/1.0/metadata.xml
@@ -1,7 +1,7 @@
 <TECHNIQUE name="technique with blocks">
   <DESCRIPTION>regenerated</DESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
-  <AGENT type="cfengine-community,cfengine-nova">
+  <AGENT type="cfengine-community">
     <BUNDLES>
       <NAME>technique_with_blocks</NAME>
     </BUNDLES>
diff --git a/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/post-migration/ncf_techniques/technique_with_parameters/1.0/metadata.xml b/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/post-migration/ncf_techniques/technique_with_parameters/1.0/metadata.xml
index cc9c9c1668b..2d7787e3e07 100644
--- a/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/post-migration/ncf_techniques/technique_with_parameters/1.0/metadata.xml
+++ b/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/post-migration/ncf_techniques/technique_with_parameters/1.0/metadata.xml
@@ -3,7 +3,7 @@
   <MULTIINSTANCE>true</MULTIINSTANCE>
   <DESCRIPTION>A technique with some parameters</DESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
-  <AGENT type="cfengine-community,cfengine-nova">
+  <AGENT type="cfengine-community">
     <BUNDLES>
       <NAME>technique_with_parameters</NAME>
     </BUNDLES>
@@ -49,4 +49,4 @@
       </INPUT>
     </SECTION>
   </SECTIONS>
-</TECHNIQUE>
\ No newline at end of file
+</TECHNIQUE>
diff --git a/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/post-migration/ncf_techniques/test_import_export_archive/1.0/metadata.xml b/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/post-migration/ncf_techniques/test_import_export_archive/1.0/metadata.xml
index 928ce4aaad9..fb28e27dd9e 100644
--- a/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/post-migration/ncf_techniques/test_import_export_archive/1.0/metadata.xml
+++ b/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/post-migration/ncf_techniques/test_import_export_archive/1.0/metadata.xml
@@ -1,7 +1,7 @@
 <TECHNIQUE name="test import/export archive">
   <DESCRIPTION></DESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
-  <AGENT type="cfengine-community,cfengine-nova">
+  <AGENT type="cfengine-community">
     <BUNDLES>
       <NAME>test import export archive</NAME>
     </BUNDLES>
diff --git a/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/techniques/ncf_techniques/technique_with_blocks/1.0/metadata.xml b/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/techniques/ncf_techniques/technique_with_blocks/1.0/metadata.xml
index fbf5892aaba..621415857dd 100644
--- a/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/techniques/ncf_techniques/technique_with_blocks/1.0/metadata.xml
+++ b/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/techniques/ncf_techniques/technique_with_blocks/1.0/metadata.xml
@@ -1,7 +1,7 @@
 <TECHNIQUE name="technique with blocks">
   <DESCRIPTION></DESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
-  <AGENT type="cfengine-community,cfengine-nova">
+  <AGENT type="cfengine-community">
     <BUNDLES>
       <NAME>technique_with_blocks</NAME>
     </BUNDLES>
diff --git a/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/techniques/ncf_techniques/technique_with_parameters/1.0/metadata.xml b/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/techniques/ncf_techniques/technique_with_parameters/1.0/metadata.xml
index cc9c9c1668b..2d7787e3e07 100644
--- a/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/techniques/ncf_techniques/technique_with_parameters/1.0/metadata.xml
+++ b/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/techniques/ncf_techniques/technique_with_parameters/1.0/metadata.xml
@@ -3,7 +3,7 @@
   <MULTIINSTANCE>true</MULTIINSTANCE>
   <DESCRIPTION>A technique with some parameters</DESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
-  <AGENT type="cfengine-community,cfengine-nova">
+  <AGENT type="cfengine-community">
     <BUNDLES>
       <NAME>technique_with_parameters</NAME>
     </BUNDLES>
@@ -49,4 +49,4 @@
       </INPUT>
     </SECTION>
   </SECTIONS>
-</TECHNIQUE>
\ No newline at end of file
+</TECHNIQUE>
diff --git a/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/techniques/ncf_techniques/test_import_export_archive/1.0/metadata.xml b/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/techniques/ncf_techniques/test_import_export_archive/1.0/metadata.xml
index 928ce4aaad9..fb28e27dd9e 100644
--- a/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/techniques/ncf_techniques/test_import_export_archive/1.0/metadata.xml
+++ b/webapp/sources/rudder/rudder-web/src/test/resources/configuration-repository-migrate-json-8_0/techniques/ncf_techniques/test_import_export_archive/1.0/metadata.xml
@@ -1,7 +1,7 @@
 <TECHNIQUE name="test import/export archive">
   <DESCRIPTION></DESCRIPTION>
   <USEMETHODREPORTING>true</USEMETHODREPORTING>
-  <AGENT type="cfengine-community,cfengine-nova">
+  <AGENT type="cfengine-community">
     <BUNDLES>
       <NAME>test import export archive</NAME>
     </BUNDLES>
diff --git a/webapp/sources/rudder/rudder-web/src/test/resources/historical-inventories/fb0096f3-a928-454d-9776-e8079d48cdd8/2023-04-11T22:15:53.375+02:00 b/webapp/sources/rudder/rudder-web/src/test/resources/historical-inventories/fb0096f3-a928-454d-9776-e8079d48cdd8/2023-04-11T22:15:53.375+02:00
index f356daf9e17..9b92940a5c4 100644
--- a/webapp/sources/rudder/rudder-web/src/test/resources/historical-inventories/fb0096f3-a928-454d-9776-e8079d48cdd8/2023-04-11T22:15:53.375+02:00
+++ b/webapp/sources/rudder/rudder-web/src/test/resources/historical-inventories/fb0096f3-a928-454d-9776-e8079d48cdd8/2023-04-11T22:15:53.375+02:00
@@ -17,7 +17,7 @@ swap: 416284672
 osArchitectureType: x86_64
 inventoryDate: 20190912231642.000Z
 receiveDate: 20201115124940.616Z
-agentName: {"agentType":"cfengine-community","version":"4.3.10-lucid0","securityToken":{"value":"-----BEGIN RSA PUBLIC KEY-----\nMIIBCgKCAQEAxV6J9wZyte9pcrAKF7+I66kz7K/Qr6EmGrQz7uWgnDd5RpybhhZa\ncldhl7GywwRne21eTkSYfYJZgkN9CivtdS7YffX6J7G82B60EcjcDeLvmCYWPo8B\nzNO+ewCoA8XMRZakBB3OdZV6JeXpfbEdwYr8GIyVrg2RKodexUDbVOY8H9pGp1GG\nshGY9qmVY1zyEIQbFCn5dCtvpWS8CjVYu8B8NOdfAk6wGywpuKiwgyV625HKvPyu\noa6WCr3gJ37JUMtgFPNu3JwCFHnDVouG51RsqbbZzyuiWaJ0uGHVgXurZZ1qWdgE\nQmltnCYkXUMnN2W4e4VTbXLJ5ecDIdXnGwIDAQAB\n-----END RSA PUBLIC KEY-----","type":"publicKey"},"capabilities":["acl","bodydefault","cfengine","curl","dumpdatastate","xml","yaml"]}
+agentName: {"agentType":"cfengine-community","version":"4.3.10-lucid0","securityToken":{"value":"-----BEGIN CERTIFICATE-----\nMIIFqDCCA5CgAwIBAgIUFKaSnZN/LYRXXbI+Pz1d2Z384ikwDQYJKoZIhvcNAQEL\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDU5NTEyYTU2LTUzZTktNDFlMS1iMzZmLWNh\nMjJkM2NkZmNiYzAeFw0yMDAyMjgxMDAzMjhaFw0zMDAyMjUxMDAzMjhaMDYxNDAy\nBgoJkiaJk/IsZAEBDCQ1OTUxMmE1Ni01M2U5LTQxZTEtYjM2Zi1jYTIyZDNjZGZj\nYmMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDqwTjPASvhpk52b+0o\nI5GpoWtAtRVac3WmG3fEXvKNmhU03S52HG9HL8QcJeluZsCFkxKNl+1VrpMmIDmt\n2GsnZmBvWwQGUdoLUpxSNHBSD03x0iK5+qs4COnklxXfuJxk/JoOEBHRBKebbxXs\nVLyW4R05CWamrQKzCviGoaK3/4qb2lKY8mC+tT23np62FKtY7gN9uqEVk21SZE83\n1W2mXsETNaXKBR0xR5vbqKgSo1eQmDkauwxN1QoFjX2J7+8UOSSUQE4bsaC41Z6y\n4HdW4pqLdC4K//OsGS4NtVpMEInlI5WWnBk+pV09cHivZWr6yHcqOgMPGMWglNUu\nWL8bZCIo4EbRIKHydR41vZBIg7D25IJIcsx+4bg3T+ZQEzZjBg0CEWE32yAmHB2G\n8JJjyyMSMnfaenfSOG51UhlZfIWiyZsHLp5tB1xMq79B7jT3GtYskA55kPm7xe6l\nGNevsl1MGu126kOvUjoLRGZfj86urbToysho862a1NAZ6QGmfkG3FHMrZAVOMhfb\nRPbGWH1Mut2eWxVyeDYLNjIlRUc/RPvp8VUpe06unOpVrSqMcwRkBGZlbDZWSWG4\nS/VK8KwjeyYDtzGoj4yQbtmR2EXVEHJvFnVq63265lyRYulTSXmx01Uco9K+8g/i\n7SpTn6wEYHdm8nmNPRt0ZInaBQIDAQABo4GtMIGqMAkGA1UdEwQCMAAwHQYDVR0O\nBBYEFF90PBSY3aV97ewxT9iNSr/p16bGMHEGA1UdIwRqMGiAFF90PBSY3aV97ewx\nT9iNSr/p16bGoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkNTk1MTJhNTYtNTNlOS00\nMWUxLWIzNmYtY2EyMmQzY2RmY2JjghQUppKdk38thFddsj4/PV3ZnfziKTALBgNV\nHQ8EBAMCA7gwDQYJKoZIhvcNAQELBQADggIBAJ/xpoJ1Y4EtUKY9dRzNtRpaCzMc\nfeO/s44IuHcylOvSgfAoLOmY7W87JTiiK1khVAmShbQfXXEJBv4K+MKVkjZl93BW\nGcNmeTMCGZyFzYjxC34WU9Ik6lHBjd9kOnOACK5QWYD6oC4Z1KP0bpbrA+o51B0C\n8QurqUQgIaN6FfmET8xbAV/9T+WvydFQepBsIb/g7rW2gWhicajrRZwv/dXt0WYG\nNzFuSt8NBWxwK+11UxB53EoZloJanaWKl/qZfNgCIlu/BbpMyVAj94khXG9Do0Ck\nButatB6HR7WxLP9m82mHiHbDnefzrTXxDiHvdYut5KuauaMzP2uufTT+F2Mnff3P\nlwrLrIT8O8odiMS/oqzY9U3Br4CQXosSo9Ia6QqVuGVTbngklP+sa67XqYBKaFrK\ncVAJBKcmhaehIvMUrlyeDt2pM0VmbfSE+Poncx3TL9Yg6L/otvMnW9LultrjumOn\nzgahsDi7l1ZQnTMI2sZNuyUK9pBfZtO/1N+QLA1bphOXyim5bAsZ4O+0oXeFScTA\nmoDd8+/+Bmp1sjsrtgUchXipnX/O8+J0oQYfX+mqHLAII4ypJ128eGs2jrEdjowG\noVMureSwzxWAC4QPBMUAqe2Avnc3DFuMAMFq6njK7Z39Eb0+FGdPQhp87w1CNjq9\nwRHToEDvajGEHbAz\n-----END CERTIFICATE-----","type":"certificate"},"capabilities":["acl","bodydefault","cfengine","curl","dumpdatastate","xml","yaml"]}
 software: softwareId=a8c43188-be44-4526-821d-fc62761573a5,ou=Software,ou=Inventories,cn=rudder-configuration
 software: softwareId=4f70b599-479a-4c0c-96a2-2ac9efce50ff,ou=Software,ou=Inventories,cn=rudder-configuration
 software: softwareId=33353d7c-a83c-4eba-a63d-efb2ac888b58,ou=Software,ou=Inventories,cn=rudder-configuration
diff --git a/webapp/sources/rudder/rudder-web/src/test/resources/historical-inventories/fb0096f4-a928-454d-9776-e8079d48cdd8/2021-04-11T22:15:53.375+02:00 b/webapp/sources/rudder/rudder-web/src/test/resources/historical-inventories/fb0096f4-a928-454d-9776-e8079d48cdd8/2021-04-11T22:15:53.375+02:00
index f356daf9e17..9b92940a5c4 100644
--- a/webapp/sources/rudder/rudder-web/src/test/resources/historical-inventories/fb0096f4-a928-454d-9776-e8079d48cdd8/2021-04-11T22:15:53.375+02:00
+++ b/webapp/sources/rudder/rudder-web/src/test/resources/historical-inventories/fb0096f4-a928-454d-9776-e8079d48cdd8/2021-04-11T22:15:53.375+02:00
@@ -17,7 +17,7 @@ swap: 416284672
 osArchitectureType: x86_64
 inventoryDate: 20190912231642.000Z
 receiveDate: 20201115124940.616Z
-agentName: {"agentType":"cfengine-community","version":"4.3.10-lucid0","securityToken":{"value":"-----BEGIN RSA PUBLIC KEY-----\nMIIBCgKCAQEAxV6J9wZyte9pcrAKF7+I66kz7K/Qr6EmGrQz7uWgnDd5RpybhhZa\ncldhl7GywwRne21eTkSYfYJZgkN9CivtdS7YffX6J7G82B60EcjcDeLvmCYWPo8B\nzNO+ewCoA8XMRZakBB3OdZV6JeXpfbEdwYr8GIyVrg2RKodexUDbVOY8H9pGp1GG\nshGY9qmVY1zyEIQbFCn5dCtvpWS8CjVYu8B8NOdfAk6wGywpuKiwgyV625HKvPyu\noa6WCr3gJ37JUMtgFPNu3JwCFHnDVouG51RsqbbZzyuiWaJ0uGHVgXurZZ1qWdgE\nQmltnCYkXUMnN2W4e4VTbXLJ5ecDIdXnGwIDAQAB\n-----END RSA PUBLIC KEY-----","type":"publicKey"},"capabilities":["acl","bodydefault","cfengine","curl","dumpdatastate","xml","yaml"]}
+agentName: {"agentType":"cfengine-community","version":"4.3.10-lucid0","securityToken":{"value":"-----BEGIN CERTIFICATE-----\nMIIFqDCCA5CgAwIBAgIUFKaSnZN/LYRXXbI+Pz1d2Z384ikwDQYJKoZIhvcNAQEL\nBQAwNjE0MDIGCgmSJomT8ixkAQEMJDU5NTEyYTU2LTUzZTktNDFlMS1iMzZmLWNh\nMjJkM2NkZmNiYzAeFw0yMDAyMjgxMDAzMjhaFw0zMDAyMjUxMDAzMjhaMDYxNDAy\nBgoJkiaJk/IsZAEBDCQ1OTUxMmE1Ni01M2U5LTQxZTEtYjM2Zi1jYTIyZDNjZGZj\nYmMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDqwTjPASvhpk52b+0o\nI5GpoWtAtRVac3WmG3fEXvKNmhU03S52HG9HL8QcJeluZsCFkxKNl+1VrpMmIDmt\n2GsnZmBvWwQGUdoLUpxSNHBSD03x0iK5+qs4COnklxXfuJxk/JoOEBHRBKebbxXs\nVLyW4R05CWamrQKzCviGoaK3/4qb2lKY8mC+tT23np62FKtY7gN9uqEVk21SZE83\n1W2mXsETNaXKBR0xR5vbqKgSo1eQmDkauwxN1QoFjX2J7+8UOSSUQE4bsaC41Z6y\n4HdW4pqLdC4K//OsGS4NtVpMEInlI5WWnBk+pV09cHivZWr6yHcqOgMPGMWglNUu\nWL8bZCIo4EbRIKHydR41vZBIg7D25IJIcsx+4bg3T+ZQEzZjBg0CEWE32yAmHB2G\n8JJjyyMSMnfaenfSOG51UhlZfIWiyZsHLp5tB1xMq79B7jT3GtYskA55kPm7xe6l\nGNevsl1MGu126kOvUjoLRGZfj86urbToysho862a1NAZ6QGmfkG3FHMrZAVOMhfb\nRPbGWH1Mut2eWxVyeDYLNjIlRUc/RPvp8VUpe06unOpVrSqMcwRkBGZlbDZWSWG4\nS/VK8KwjeyYDtzGoj4yQbtmR2EXVEHJvFnVq63265lyRYulTSXmx01Uco9K+8g/i\n7SpTn6wEYHdm8nmNPRt0ZInaBQIDAQABo4GtMIGqMAkGA1UdEwQCMAAwHQYDVR0O\nBBYEFF90PBSY3aV97ewxT9iNSr/p16bGMHEGA1UdIwRqMGiAFF90PBSY3aV97ewx\nT9iNSr/p16bGoTqkODA2MTQwMgYKCZImiZPyLGQBAQwkNTk1MTJhNTYtNTNlOS00\nMWUxLWIzNmYtY2EyMmQzY2RmY2JjghQUppKdk38thFddsj4/PV3ZnfziKTALBgNV\nHQ8EBAMCA7gwDQYJKoZIhvcNAQELBQADggIBAJ/xpoJ1Y4EtUKY9dRzNtRpaCzMc\nfeO/s44IuHcylOvSgfAoLOmY7W87JTiiK1khVAmShbQfXXEJBv4K+MKVkjZl93BW\nGcNmeTMCGZyFzYjxC34WU9Ik6lHBjd9kOnOACK5QWYD6oC4Z1KP0bpbrA+o51B0C\n8QurqUQgIaN6FfmET8xbAV/9T+WvydFQepBsIb/g7rW2gWhicajrRZwv/dXt0WYG\nNzFuSt8NBWxwK+11UxB53EoZloJanaWKl/qZfNgCIlu/BbpMyVAj94khXG9Do0Ck\nButatB6HR7WxLP9m82mHiHbDnefzrTXxDiHvdYut5KuauaMzP2uufTT+F2Mnff3P\nlwrLrIT8O8odiMS/oqzY9U3Br4CQXosSo9Ia6QqVuGVTbngklP+sa67XqYBKaFrK\ncVAJBKcmhaehIvMUrlyeDt2pM0VmbfSE+Poncx3TL9Yg6L/otvMnW9LultrjumOn\nzgahsDi7l1ZQnTMI2sZNuyUK9pBfZtO/1N+QLA1bphOXyim5bAsZ4O+0oXeFScTA\nmoDd8+/+Bmp1sjsrtgUchXipnX/O8+J0oQYfX+mqHLAII4ypJ128eGs2jrEdjowG\noVMureSwzxWAC4QPBMUAqe2Avnc3DFuMAMFq6njK7Z39Eb0+FGdPQhp87w1CNjq9\nwRHToEDvajGEHbAz\n-----END CERTIFICATE-----","type":"certificate"},"capabilities":["acl","bodydefault","cfengine","curl","dumpdatastate","xml","yaml"]}
 software: softwareId=a8c43188-be44-4526-821d-fc62761573a5,ou=Software,ou=Inventories,cn=rudder-configuration
 software: softwareId=4f70b599-479a-4c0c-96a2-2ac9efce50ff,ou=Software,ou=Inventories,cn=rudder-configuration
 software: softwareId=33353d7c-a83c-4eba-a63d-efb2ac888b58,ou=Software,ou=Inventories,cn=rudder-configuration
diff --git a/webapp/sources/rudder/rudder-web/src/test/resources/ldap-data/schema/099-0-inventory.ldif b/webapp/sources/rudder/rudder-web/src/test/resources/ldap-data/schema/099-0-inventory.ldif
index a860ee72e78..4196323afe8 100644
--- a/webapp/sources/rudder/rudder-web/src/test/resources/ldap-data/schema/099-0-inventory.ldif
+++ b/webapp/sources/rudder/rudder-web/src/test/resources/ldap-data/schema/099-0-inventory.ldif
@@ -248,7 +248,7 @@ attributeTypes: ( 1.3.6.1.4.1.35061.1.1.300.12
   ORDERING generalizedTimeOrderingMatch )
 attributeTypes: ( 1.3.6.1.4.1.35061.1.1.300.13
   NAME 'agentName'
-  DESC 'List of name of the agent (Nova, Community, ...)'
+  DESC 'List of name of the agent (Dsc, Community, ...)'
   EQUALITY caseIgnoreMatch
   SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
diff --git a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateNodeAcceptationInventories.scala b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateNodeAcceptationInventories.scala
index e353cc05c6f..e645809eaa2 100644
--- a/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateNodeAcceptationInventories.scala
+++ b/webapp/sources/rudder/rudder-web/src/test/scala/bootstrap/liftweb/checks/migration/TestMigrateNodeAcceptationInventories.scala
@@ -50,10 +50,8 @@ import com.normation.inventory.ldap.core.InventoryDitServiceImpl
 import com.normation.inventory.ldap.core.InventoryMapper
 import com.normation.rudder.db.DBCommon
 import com.normation.rudder.db.Doobie
-import com.normation.rudder.domain.nodes.Node
-import com.normation.rudder.domain.nodes.NodeInfo
+import com.normation.rudder.facts.nodes.CoreNodeFactRepository
 import com.normation.rudder.facts.nodes.NodeFact
-import com.normation.rudder.services.nodes.NodeInfoService
 import com.normation.rudder.services.nodes.history.HistoryLogRepository
 import com.normation.rudder.services.nodes.history.impl.FactLog
 import com.normation.rudder.services.nodes.history.impl.FactLogData
@@ -65,6 +63,7 @@ import com.normation.rudder.services.nodes.history.impl.NodeDeleteEvent
 import com.normation.rudder.services.policies.NodeConfigData
 import com.normation.utils.DateFormaterService
 import com.normation.zio.*
+import com.softwaremill.quicklens.*
 import com.unboundid.ldap.sdk.DN
 import org.apache.commons.io.FileUtils
 import org.joda.time.DateTime
@@ -250,32 +249,16 @@ trait TestMigrateNodeAcceptationInventories extends Specification with AfterAll
   // 59512a56-53e9-41e1-b36f-ca22d3cdfcbc => ok, 2 files, both ok in age
   // fb0096f3-a928-454d-9776-e8079d48cdd8 => deleted, age ok
   // fb0096f4-a928-454d-9776-e8079d48cdd8 => deleted, too old
-  object nodeInfoService extends NodeInfoService {
-    import com.softwaremill.quicklens.*
-    val n = NodeConfigData.node1
-    def success(nodeId: NodeId): ZIO[Any, Nothing, Some[NodeInfo]] = Some(n.modify(_.node.id).setTo(nodeId)).succeed
-
-    override def getAll():                    IOResult[Map[NodeId, NodeInfo]] = ???
-    override def getNodeInfo(nodeId: NodeId): IOResult[Option[NodeInfo]]      = nodeId.value match {
-      case "0afa1d13-d125-4c91-9d71-24c47dc867e9" => None.succeed
-      case "0bd58a1f-3faa-4783-a7a2-52d84021663a" => success(nodeId)
-      case "1bd58a1f-3faa-4783-a7a2-52d84021663a" => success(nodeId)
-      case "4d3a43bc-8508-46a2-92d7-cfe7320309a5" => success(nodeId)
-      case "59512a56-53e9-41e1-b36f-ca22d3cdfcbc" => success(nodeId)
-      case "fb0096f3-a928-454d-9776-e8079d48cdd8" => None.succeed
-      case "fb0096f4-a928-454d-9776-e8079d48cdd8" => None.succeed
-    }
-    override def getNodeInfosSeq(nodesId: Seq[NodeId]): IOResult[Seq[NodeInfo]] = ???
-    override def getNumberOfManagedNodes:     IOResult[Int]                   = ???
-    override def getAllNodesIds():            IOResult[Set[NodeId]]           = ???
-    override def getAllNodes():               IOResult[Map[NodeId, Node]]     = ???
-    override def getAllSystemNodeIds():       IOResult[Seq[NodeId]]           = ???
-    override def getPendingNodeInfos():       IOResult[Map[NodeId, NodeInfo]] = ???
-    override def getPendingNodeInfo(nodeId: NodeId): IOResult[Option[NodeInfo]] = ???
-    override def getAllNodeInfos(): IOResult[Seq[NodeInfo]] = ???
-  }
+  val nodes = List(
+    NodeConfigData.fact1.modify(_.id.value).setTo("0bd58a1f-3faa-4783-a7a2-52d84021663a"),
+    NodeConfigData.fact1.modify(_.id.value).setTo("1bd58a1f-3faa-4783-a7a2-52d84021663a"),
+    NodeConfigData.fact1.modify(_.id.value).setTo("4d3a43bc-8508-46a2-92d7-cfe7320309a5"),
+    NodeConfigData.fact1.modify(_.id.value).setTo("59512a56-53e9-41e1-b36f-ca22d3cdfcbc")
+  ).map(x => (x.id, x)).toMap
+
+  val repo = CoreNodeFactRepository.makeNoop(nodes).runNow
 
-  lazy val migration = new MigrateNodeAcceptationInventories(nodeInfoService, null, fileLog, testFactLog, 365.days)
+  lazy val migration = new MigrateNodeAcceptationInventories(repo, null, fileLog, testFactLog, 365.days)
 
   val referenceNow: DateTime =
     dateFormat.parseDateTime("2023-06-01T04:15:35.000+02:00")
diff --git a/webapp/sources/scala-ldap/pom.xml b/webapp/sources/scala-ldap/pom.xml
index e48fcc4a01e..df004db59fc 100644
--- a/webapp/sources/scala-ldap/pom.xml
+++ b/webapp/sources/scala-ldap/pom.xml
@@ -19,7 +19,7 @@ limitations under the License.
   <parent>
     <groupId>com.normation</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>8.2.4-SNAPSHOT</version>
+    <version>8.3.0~alpha1-SNAPSHOT</version>
   </parent>
 
   <artifactId>scala-ldap</artifactId>
diff --git a/webapp/sources/utils/pom.xml b/webapp/sources/utils/pom.xml
index 17edb176a49..11e9cbffdb4 100644
--- a/webapp/sources/utils/pom.xml
+++ b/webapp/sources/utils/pom.xml
@@ -19,7 +19,7 @@ limitations under the License.
   <parent>
     <groupId>com.normation</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>8.2.4-SNAPSHOT</version>
+    <version>8.3.0~alpha1-SNAPSHOT</version>
   </parent>
 
   <artifactId>utils</artifactId>
diff --git a/webapp/sources/utils/src/main/scala/com/normation/ZioCommons.scala b/webapp/sources/utils/src/main/scala/com/normation/ZioCommons.scala
index 826e79ef6fc..d2dccf27eb3 100644
--- a/webapp/sources/utils/src/main/scala/com/normation/ZioCommons.scala
+++ b/webapp/sources/utils/src/main/scala/com/normation/ZioCommons.scala
@@ -43,8 +43,8 @@ import org.slf4j.Logger
 /**
  * This is our based error for Rudder. Any method that can
  * error should return that RudderError type to allow
- * seemless interaction between modules.
- * None the less, all module should have its own domain error
+ * seamless interaction between modules.
+ * Nonetheless, all module should have its own domain error
  * for meaningful semantic intra-module.
  */
 object errors {
@@ -90,10 +90,13 @@ object errors {
    * use `IOResult.succeed`).
    */
   object IOResult {
-    def attempt[A](error: String)(effect: => A):                IO[SystemError, A] = {
+    // attempt is blocking
+    def attempt[A](error: String)(effect: => A): IO[SystemError, A] = {
       // In ZIO 2 blocking is automagically managed - https://github.com/zio/zio/issues/1275
-      ZIO.attempt(effect).mapError(ex => SystemError(error, ex))
+      // in 2.1.0, they remove the auto-blocking. Our code is not ready for that, so we need to set it back.
+      ZIO.attemptBlocking(effect).mapError(ex => SystemError(error, ex))
     }
+
     def attempt[A](effect: => A):                               IO[SystemError, A] = {
       this.attempt("An error occurred")(effect)
     }
@@ -108,6 +111,29 @@ object errors {
     def attemptZIO[A](ioeffect: => IOResult[A]):                IOResult[A]        = {
       attemptZIO("An error occurred")(ioeffect)
     }
+
+    // for non-blocking case
+    def nonBlocking[A](error: String)(effect: => A): IO[SystemError, A] = {
+      // in ZIO 2.1, attempt is for non blocking, CPU bound effects
+      ZIO.attempt(effect).mapError(ex => SystemError(error, ex))
+    }
+
+    def nonBlocking[A](effect: => A): IO[SystemError, A] = {
+      this.nonBlocking("An error occurred")(effect)
+    }
+
+    def nonBlockingZIO[A](error: String)(ioeffect: => IOResult[A]): IOResult[A] = {
+      ZIO
+        .attempt(ioeffect)
+        .foldZIO(
+          ex => SystemError(error, ex).fail,
+          res => res
+        )
+    }
+    def nonBlockingZIO[A](ioeffect: => IOResult[A]):                IOResult[A] = {
+      nonBlockingZIO("An error occurred")(ioeffect)
+    }
+
   }
 
   object PureResult {