diff --git a/Cargo.lock b/Cargo.lock
index 33b07210..0d6c8ba0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -41,9 +41,9 @@ version = "0.1.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
 ]
 
 [[package]]
@@ -54,9 +54,9 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 
 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
@@ -68,17 +68,11 @@ dependencies = [
  "cc",
  "cfg-if 1.0.0",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.4.4",
  "object",
  "rustc-demangle",
 ]
 
-[[package]]
-name = "base-x"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
-
 [[package]]
 name = "base64"
 version = "0.10.1"
@@ -138,9 +132,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279"
+checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
 dependencies = [
  "lazy_static",
  "memchr",
@@ -225,12 +219,24 @@ dependencies = [
 
 [[package]]
 name = "chrono-tz"
-version = "0.5.3"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2554a3155fec064362507487171dcc4edc3df60cb10f3a1fb10ed8094822b120"
+checksum = "58549f1842da3080ce63002102d5bc954c7bc843d4f47818e642abdc36253552"
 dependencies = [
  "chrono",
+ "chrono-tz-build",
+ "phf",
+]
+
+[[package]]
+name = "chrono-tz-build"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db058d493fb2f65f41861bfed7e3fe6335264a9f0f92710cab5bdf01fef09069"
+dependencies = [
  "parse-zoneinfo",
+ "phf",
+ "phf_codegen",
 ]
 
 [[package]]
@@ -244,9 +250,9 @@ dependencies = [
 
 [[package]]
 name = "cmd_lib"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7114bcaf989b09f9fb057b7d7c81491bc1558e8a67bd49bf7f682318d8a6501"
+checksum = "0ba0f413777386d37f85afa5242f277a7b461905254c1af3c339d4af06800f62"
 dependencies = [
  "cmd_lib_macros",
  "faccess",
@@ -257,27 +263,21 @@ dependencies = [
 
 [[package]]
 name = "cmd_lib_macros"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "356fd654e9a433e730a826d4e01ea2414ab122ca8a5374eadf6c43a6090f8dd3"
+checksum = "9e66605092ff6c6e37e0246601ae6c3f62dc1880e0599359b5f303497c112dc0"
 dependencies = [
  "proc-macro-error",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
 ]
 
-[[package]]
-name = "const_fn"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7"
-
 [[package]]
 name = "const_format"
-version = "0.2.22"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22bc6cd49b0ec407b680c3e380182b6ac63b73991cb7602de350352fc309b614"
+checksum = "0936ffe6d0c8d6a51b3b0a73b2acbe925d786f346cf45bfddc8341d79fb7dc8a"
 dependencies = [
  "const_format_proc_macros",
 ]
@@ -288,7 +288,7 @@ version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef196d5d972878a48da7decb7686eded338b4858fbabeed513d63a7c98b2b82d"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
  "unicode-xid 0.2.2",
 ]
@@ -393,7 +393,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
  "cfg-if 0.1.10",
  "crossbeam-utils 0.7.2",
  "lazy_static",
@@ -432,7 +432,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
  "cfg-if 0.1.10",
  "lazy_static",
 ]
@@ -459,24 +459,24 @@ dependencies = [
 
 [[package]]
 name = "curl"
-version = "0.4.38"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "003cb79c1c6d1c93344c7e1201bb51c2148f24ec2bd9c253709d6b2efb796515"
+checksum = "37d855aeef205b43f65a5001e0997d81f8efca7badad4fad7d897aa7f0d0651f"
 dependencies = [
  "curl-sys",
  "libc",
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "socket2 0.4.1",
+ "socket2 0.4.4",
  "winapi 0.3.9",
 ]
 
 [[package]]
 name = "curl-sys"
-version = "0.4.45+curl-7.78.0"
+version = "0.4.54+curl-7.83.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de9e5a72b1c744eb5dd20b2be4d7eb84625070bb5c4ab9b347b70464ab1e62eb"
+checksum = "25debbc3365c3e7ee79e30918df5759e84dbd4485807a18829188abf1786ec4e"
 dependencies = [
  "cc",
  "libc",
@@ -499,9 +499,9 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
 ]
 
 [[package]]
@@ -549,9 +549,9 @@ dependencies = [
 
 [[package]]
 name = "dirs"
-version = "3.0.2"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
 dependencies = [
  "dirs-sys",
 ]
@@ -588,18 +588,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "discard"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
-
-[[package]]
-name = "doc-comment"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
-
 [[package]]
 name = "dtoa"
 version = "0.4.8"
@@ -623,14 +611,14 @@ dependencies = [
 
 [[package]]
 name = "enum-as-inner"
-version = "0.3.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
+checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
 dependencies = [
  "heck",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
 ]
 
 [[package]]
@@ -660,9 +648,9 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
  "synstructure",
 ]
 
@@ -672,6 +660,15 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 
+[[package]]
+name = "fastrand"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "filetime"
 version = "0.2.15"
@@ -686,14 +683,14 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.20"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
+checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
 dependencies = [
  "cfg-if 1.0.0",
  "crc32fast",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.5.1",
 ]
 
 [[package]]
@@ -751,22 +748,22 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
 [[package]]
 name = "function_name"
-version = "0.2.0"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b2afa9b514dc3a75af6cf24d1914e1c7eb6f1b86de849147563548d5c0a0cd"
+checksum = "bef632c665dc6e2b99ffa4d913f7160bd902c4d3e4cb732d81dc3d221f848512"
 dependencies = [
  "function_name-proc-macro",
 ]
 
 [[package]]
 name = "function_name-proc-macro"
-version = "0.2.0"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6790a8d356d2f65d7972181e866b92a50a87c27d6a48cbe9dbb8be13ca784c7d"
+checksum = "569d2238870f92cff64fc810013b61edaf446ebcfba36b649b96bc5b4078328a"
 dependencies = [
  "proc-macro-crate",
- "quote 0.6.13",
- "syn 0.15.44",
+ "quote 1.0.9",
+ "syn 1.0.93",
 ]
 
 [[package]]
@@ -777,9 +774,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
 
 [[package]]
 name = "futures"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b"
+checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -792,9 +789,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
+checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -802,9 +799,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
+checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
 
 [[package]]
 name = "futures-cpupool"
@@ -818,9 +815,9 @@ dependencies = [
 
 [[package]]
 name = "futures-executor"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c"
+checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -829,42 +826,39 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582"
+checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
+checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
 dependencies = [
- "autocfg 1.0.1",
- "proc-macro-hack",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"
+checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
 
 [[package]]
 name = "futures-task"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
+checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
 
 [[package]]
 name = "futures-util"
-version = "0.3.16"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
+checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
 dependencies = [
- "autocfg 1.0.1",
  "futures-channel",
  "futures-core",
  "futures-io",
@@ -874,8 +868,6 @@ dependencies = [
  "memchr",
  "pin-project-lite 0.2.7",
  "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
  "slab",
 ]
 
@@ -906,25 +898,14 @@ dependencies = [
 
 [[package]]
 name = "gethostname"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e692e296bfac1d2533ef168d0b60ff5897b8b70a4009276834014dd8924cc028"
+checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e"
 dependencies = [
  "libc",
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.3"
@@ -955,9 +936,9 @@ checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"
 
 [[package]]
 name = "git2"
-version = "0.14.2"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3826a6e0e2215d7a41c2bfc7c9244123969273f3476b939a226aac0ab56e9e3c"
+checksum = "d0155506aab710a86160ddb504a480d2964d7ab5b9e62419be69e0032bc5931c"
 dependencies = [
  "bitflags",
  "libc",
@@ -1032,9 +1013,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.3"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726"
+checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
 dependencies = [
  "bytes 1.0.1",
  "fnv",
@@ -1044,8 +1025,8 @@ dependencies = [
  "http 0.2.4",
  "indexmap",
  "slab",
- "tokio 1.10.0",
- "tokio-util 0.6.7",
+ "tokio 1.18.2",
+ "tokio-util 0.7.1",
  "tracing",
 ]
 
@@ -1074,12 +1055,9 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.3.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
 
 [[package]]
 name = "hermit-abi"
@@ -1125,7 +1103,7 @@ checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
 dependencies = [
  "bytes 0.4.12",
  "fnv",
- "itoa",
+ "itoa 0.4.7",
 ]
 
 [[package]]
@@ -1136,7 +1114,7 @@ checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
 dependencies = [
  "bytes 1.0.1",
  "fnv",
- "itoa",
+ "itoa 0.4.7",
 ]
 
 [[package]]
@@ -1210,7 +1188,7 @@ dependencies = [
  "http-body 0.1.0",
  "httparse",
  "iovec",
- "itoa",
+ "itoa 0.4.7",
  "log",
  "net2",
  "rustc_version 0.2.3",
@@ -1241,7 +1219,7 @@ dependencies = [
  "http-body 0.3.1",
  "httparse",
  "httpdate 0.3.2",
- "itoa",
+ "itoa 0.4.7",
  "pin-project",
  "socket2 0.3.19",
  "tokio 0.2.25",
@@ -1260,15 +1238,15 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.3",
+ "h2 0.3.13",
  "http 0.2.4",
  "http-body 0.4.3",
  "httparse",
  "httpdate 1.0.1",
- "itoa",
+ "itoa 0.4.7",
  "pin-project-lite 0.2.7",
- "socket2 0.4.1",
- "tokio 1.10.0",
+ "socket2 0.4.4",
+ "tokio 1.18.2",
  "tower-service",
  "tracing",
  "want 0.3.0",
@@ -1309,7 +1287,7 @@ dependencies = [
  "bytes 1.0.1",
  "hyper 0.14.11",
  "native-tls",
- "tokio 1.10.0",
+ "tokio 1.18.2",
  "tokio-native-tls",
 ]
 
@@ -1359,7 +1337,7 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
  "hashbrown",
 ]
 
@@ -1383,14 +1361,14 @@ dependencies = [
 
 [[package]]
 name = "ipconfig"
-version = "0.2.2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7"
+checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98"
 dependencies = [
- "socket2 0.3.19",
+ "socket2 0.4.4",
  "widestring",
  "winapi 0.3.9",
- "winreg 0.6.2",
+ "winreg 0.7.0",
 ]
 
 [[package]]
@@ -1401,9 +1379,9 @@ checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
 
 [[package]]
 name = "itertools"
-version = "0.10.1"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
+checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
 dependencies = [
  "either",
 ]
@@ -1414,6 +1392,12 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
+[[package]]
+name = "itoa"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+
 [[package]]
 name = "jobserver"
 version = "0.1.23"
@@ -1450,15 +1434,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.99"
+version = "0.2.125"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765"
+checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.13.2+1.4.2"
+version = "0.13.4+1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a42de9a51a5c12e00fc0e4ca6bc2ea43582fc6418488e8f615e905d886f258b"
+checksum = "d0fa6563431ede25f5cc7f6d803c6afbc1c5d3ad3d4925d12c882bf2b526f5d1"
 dependencies = [
  "cc",
  "libc",
@@ -1511,10 +1495,11 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.4"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
+checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
 dependencies = [
+ "autocfg 1.1.0",
  "scopeguard",
 ]
 
@@ -1550,9 +1535,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
 
 [[package]]
 name = "matchers"
-version = "0.0.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
  "regex-automata",
 ]
@@ -1592,7 +1577,7 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
 ]
 
 [[package]]
@@ -1601,7 +1586,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
 ]
 
 [[package]]
@@ -1627,7 +1612,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
 dependencies = [
  "adler",
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
+dependencies = [
+ "adler",
 ]
 
 [[package]]
@@ -1643,7 +1637,7 @@ dependencies = [
  "kernel32-sys",
  "libc",
  "log",
- "miow 0.2.2",
+ "miow",
  "net2",
  "slab",
  "winapi 0.2.8",
@@ -1651,15 +1645,14 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.7.13"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
+checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799"
 dependencies = [
  "libc",
  "log",
- "miow 0.3.7",
- "ntapi",
- "winapi 0.3.9",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1674,15 +1667,6 @@ dependencies = [
  "ws2_32-sys",
 ]
 
-[[package]]
-name = "miow"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "native-tls"
 version = "0.2.8"
@@ -1740,7 +1724,7 @@ version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
  "num-traits",
 ]
 
@@ -1750,7 +1734,7 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
 ]
 
 [[package]]
@@ -1763,6 +1747,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_threads"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "object"
 version = "0.26.0"
@@ -1816,7 +1809,7 @@ version = "0.9.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
  "cc",
  "libc",
  "pkg-config",
@@ -1846,13 +1839,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
+checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
 dependencies = [
- "instant",
- "lock_api 0.4.4",
- "parking_lot_core 0.8.3",
+ "lock_api 0.4.7",
+ "parking_lot_core 0.9.3",
 ]
 
 [[package]]
@@ -1872,16 +1864,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.3"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
+checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
 dependencies = [
  "cfg-if 1.0.0",
- "instant",
  "libc",
  "redox_syscall 0.2.10",
  "smallvec 1.6.1",
- "winapi 0.3.9",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1895,9 +1886,9 @@ dependencies = [
 
 [[package]]
 name = "passwords"
-version = "3.1.7"
+version = "3.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03258d8822ae1e392ba9385d4f66c1eed50129fd679c13faa2ce6f62bae5b511"
+checksum = "b5dee744d341c868910c3f97727c610c9ef781fde5a5621f238163dccb7dee5c"
 dependencies = [
  "random-pick",
 ]
@@ -1941,9 +1932,9 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
 ]
 
 [[package]]
@@ -1957,6 +1948,45 @@ dependencies = [
  "sha-1",
 ]
 
+[[package]]
+name = "phf"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
+dependencies = [
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+dependencies = [
+ "phf_shared",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher",
+ "uncased",
+]
+
 [[package]]
 name = "pin-project"
 version = "1.0.8"
@@ -1972,9 +2002,9 @@ version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
 ]
 
 [[package]]
@@ -2023,9 +2053,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
  "version_check",
 ]
 
@@ -2035,7 +2065,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
  "version_check",
 ]
@@ -2046,12 +2076,6 @@ version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
-
 [[package]]
 name = "proc-macro2"
 version = "0.4.30"
@@ -2063,9 +2087,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.28"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
+checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa"
 dependencies = [
  "unicode-xid 0.2.2",
 ]
@@ -2092,14 +2116,14 @@ dependencies = [
  "dirs",
  "flate2",
  "function_name",
- "futures 0.3.16",
+ "futures 0.3.21",
  "gethostname",
  "git2",
  "itertools",
  "lazy_static",
  "maplit",
- "rand 0.8.4",
- "reqwest 0.11.4",
+ "rand 0.8.5",
+ "reqwest 0.11.10",
  "retry",
  "rusoto_core",
  "rusoto_credential",
@@ -2111,7 +2135,7 @@ dependencies = [
  "rusoto_sts",
  "rust-crypto",
  "scaleway_api_rs",
- "semver 1.0.4",
+ "semver 1.0.9",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2126,14 +2150,14 @@ dependencies = [
  "test-utilities",
  "thiserror",
  "timeout-readwrite",
- "tokio 1.10.0",
+ "tokio 1.18.2",
  "tracing",
  "tracing-subscriber",
  "tracing-test",
  "trust-dns-resolver",
  "url 2.2.2",
  "urlencoding",
- "uuid 0.8.2",
+ "uuid 1.0.0",
  "walkdir",
 ]
 
@@ -2158,7 +2182,7 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
 ]
 
 [[package]]
@@ -2194,7 +2218,7 @@ dependencies = [
  "libc",
  "rand_chacha 0.1.1",
  "rand_core 0.4.2",
- "rand_hc 0.1.0",
+ "rand_hc",
  "rand_isaac",
  "rand_jitter",
  "rand_os",
@@ -2205,27 +2229,13 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.7.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc 0.2.0",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
  "rand_core 0.6.3",
- "rand_hc 0.3.1",
 ]
 
 [[package]]
@@ -2238,16 +2248,6 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "rand_chacha"
 version = "0.3.1"
@@ -2273,22 +2273,13 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
 [[package]]
 name = "rand_core"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom",
 ]
 
 [[package]]
@@ -2300,24 +2291,6 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
-dependencies = [
- "rand_core 0.6.3",
-]
-
 [[package]]
 name = "rand_isaac"
 version = "0.1.1"
@@ -2378,7 +2351,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b6c791ad2f753537ebdc0300173be0fc4821eaa628feb2c404f8acaba612d57"
 dependencies = [
  "proc-macro-hack",
- "rand 0.8.4",
+ "rand 0.8.5",
  "random-number-macro-impl",
 ]
 
@@ -2390,7 +2363,7 @@ checksum = "fc6653af545be5b0b1a2b4c19ef0f0cb288b2e5c024016a8eb0fe2efa8d9f8de"
 dependencies = [
  "proc-macro-hack",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
 ]
 
 [[package]]
@@ -2408,7 +2381,7 @@ version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
 dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.1.0",
  "crossbeam-deque 0.8.1",
  "either",
  "rayon-core",
@@ -2457,7 +2430,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom",
  "redox_syscall 0.2.10",
 ]
 
@@ -2555,7 +2528,7 @@ dependencies = [
  "percent-encoding 2.1.0",
  "pin-project-lite 0.2.7",
  "serde",
- "serde_urlencoded 0.7.0",
+ "serde_urlencoded 0.7.1",
  "tokio 0.2.25",
  "tokio-tls",
  "url 2.2.2",
@@ -2567,15 +2540,16 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.4"
+version = "0.11.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22"
+checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb"
 dependencies = [
  "base64 0.13.0",
  "bytes 1.0.1",
  "encoding_rs",
  "futures-core",
  "futures-util",
+ "h2 0.3.13",
  "http 0.2.4",
  "http-body 0.4.3",
  "hyper 0.14.11",
@@ -2591,14 +2565,14 @@ dependencies = [
  "pin-project-lite 0.2.7",
  "serde",
  "serde_json",
- "serde_urlencoded 0.7.0",
- "tokio 1.10.0",
+ "serde_urlencoded 0.7.1",
+ "tokio 1.18.2",
  "tokio-native-tls",
  "url 2.2.2",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "winreg 0.7.0",
+ "winreg 0.10.1",
 ]
 
 [[package]]
@@ -2613,24 +2587,24 @@ dependencies = [
 
 [[package]]
 name = "retry"
-version = "1.2.1"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ee4a654b43dd7e3768be7a1c0fc20e90f0a84b72a60ffb6c11e1cae2545c2e"
+checksum = "ac95c60a949a63fd2822f4964939662d8f2c16c4fa0624fd954bc6e703b9a3f6"
 dependencies = [
- "rand 0.7.3",
+ "rand 0.8.5",
 ]
 
 [[package]]
 name = "rusoto_core"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b4f000e8934c1b4f70adde180056812e7ea6b1a247952db8ee98c94cd3116cc"
+checksum = "1db30db44ea73551326269adcf7a2169428a054f14faf9e1768f2163494f2fa2"
 dependencies = [
  "async-trait",
  "base64 0.13.0",
  "bytes 1.0.1",
  "crc32fast",
- "futures 0.3.16",
+ "futures 0.3.21",
  "http 0.2.4",
  "hyper 0.14.11",
  "hyper-tls 0.5.0",
@@ -2641,37 +2615,37 @@ dependencies = [
  "rustc_version 0.4.0",
  "serde",
  "serde_json",
- "tokio 1.10.0",
+ "tokio 1.18.2",
  "xml-rs",
 ]
 
 [[package]]
 name = "rusoto_credential"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a46b67db7bb66f5541e44db22b0a02fed59c9603e146db3a9e633272d3bac2f"
+checksum = "ee0a6c13db5aad6047b6a44ef023dbbc21a056b6dab5be3b79ce4283d5c02d05"
 dependencies = [
  "async-trait",
  "chrono",
  "dirs-next",
- "futures 0.3.16",
+ "futures 0.3.21",
  "hyper 0.14.11",
  "serde",
  "serde_json",
  "shlex",
- "tokio 1.10.0",
+ "tokio 1.18.2",
  "zeroize",
 ]
 
 [[package]]
 name = "rusoto_dynamodb"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7935e1f9ca57c4ee92a4d823dcd698eb8c992f7e84ca21976ae72cd2b03016e7"
+checksum = "63ad8e126a46122a171587bbee590c5a51f311b65a5e83bb78a1f2adee720762"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
- "futures 0.3.16",
+ "futures 0.3.21",
  "rusoto_core",
  "serde",
  "serde_json",
@@ -2679,13 +2653,13 @@ dependencies = [
 
 [[package]]
 name = "rusoto_ecr"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ec4a28e4fb276307c2129abb16cf7d5573da4ec24d9e3895cc5c8a8bc21a4d"
+checksum = "f2acfd092a618d37dbfb6f42e519c6e530a11115859a3e1f03d1daf8cc648d09"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
- "futures 0.3.16",
+ "futures 0.3.21",
  "rusoto_core",
  "serde",
  "serde_json",
@@ -2693,13 +2667,13 @@ dependencies = [
 
 [[package]]
 name = "rusoto_eks"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bada849ce4a4836ae23920613144339b23dc0ebfc4d19fbc20f6b7b9d3cb6d9"
+checksum = "7d36c20a3081a49bae0a30e8a8493b138aa3501c0fabfad1951b8ef347e983e5"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
- "futures 0.3.16",
+ "futures 0.3.21",
  "rusoto_core",
  "serde",
  "serde_derive",
@@ -2708,42 +2682,42 @@ dependencies = [
 
 [[package]]
 name = "rusoto_iam"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeb3a551b0fea2882b7caafc7dcdc74c80e73f16c41bfb722f4ea88e3e21625d"
+checksum = "9c1d23303f7dbc131a38ae29cdf1d8aecfc69f771fea021dbef066b341047a90"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
- "futures 0.3.16",
+ "futures 0.3.21",
  "rusoto_core",
- "serde_urlencoded 0.7.0",
+ "serde_urlencoded 0.7.1",
  "xml-rs",
 ]
 
 [[package]]
 name = "rusoto_s3"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "048c2fe811a823ad5a9acc976e8bf4f1d910df719dcf44b15c3e96c5b7a51027"
+checksum = "7aae4677183411f6b0b412d66194ef5403293917d66e70ab118f07cc24c5b14d"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
- "futures 0.3.16",
+ "futures 0.3.21",
  "rusoto_core",
  "xml-rs",
 ]
 
 [[package]]
 name = "rusoto_signature"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6264e93384b90a747758bcc82079711eacf2e755c3a8b5091687b5349d870bcc"
+checksum = "a5ae95491c8b4847931e291b151127eccd6ff8ca13f33603eb3d0035ecb05272"
 dependencies = [
  "base64 0.13.0",
  "bytes 1.0.1",
  "chrono",
  "digest 0.9.0",
- "futures 0.3.16",
+ "futures 0.3.21",
  "hex",
  "hmac",
  "http 0.2.4",
@@ -2756,21 +2730,21 @@ dependencies = [
  "rustc_version 0.4.0",
  "serde",
  "sha2",
- "tokio 1.10.0",
+ "tokio 1.18.2",
 ]
 
 [[package]]
 name = "rusoto_sts"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7edd42473ac006fd54105f619e480b0a94136e7f53cf3fb73541363678fd92"
+checksum = "d1643f49aa67cb7cb895ebac5a2ff3f991c6dbdc58ad98b28158cd5706aecd1d"
 dependencies = [
  "async-trait",
  "bytes 1.0.1",
  "chrono",
- "futures 0.3.16",
+ "futures 0.3.21",
  "rusoto_core",
- "serde_urlencoded 0.7.0",
+ "serde_urlencoded 0.7.1",
  "xml-rs",
 ]
 
@@ -2814,7 +2788,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.4",
+ "semver 1.0.9",
 ]
 
 [[package]]
@@ -2844,7 +2818,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d20620dd2a8b440dcd2b6777c75c845217115ce69f0c1a9575cb9f7af1e7b49d"
 dependencies = [
- "reqwest 0.11.4",
+ "reqwest 0.11.10",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2901,9 +2875,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.4"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
+checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd"
 
 [[package]]
 name = "semver-parser"
@@ -2913,31 +2887,31 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.127"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"
+checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.127"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc"
+checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.66"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127"
+checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
 dependencies = [
- "itoa",
+ "itoa 1.0.1",
  "ryu",
  "serde",
 ]
@@ -2949,28 +2923,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
 dependencies = [
  "dtoa",
- "itoa",
+ "itoa 0.4.7",
  "serde",
  "url 1.7.2",
 ]
 
 [[package]]
 name = "serde_urlencoded"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa",
+ "itoa 1.0.1",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.23"
+version = "0.8.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0"
+checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc"
 dependencies = [
  "indexmap",
  "ryu",
@@ -2990,12 +2964,6 @@ dependencies = [
  "opaque-debug 0.2.3",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
-
 [[package]]
 name = "sha2"
 version = "0.9.5"
@@ -3033,6 +3001,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "siphasher"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+
 [[package]]
 name = "slab"
 version = "0.4.4"
@@ -3076,72 +3050,14 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.1"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
 dependencies = [
  "libc",
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "standback"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "stdweb"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
-dependencies = [
- "discard",
- "rustc_version 0.2.3",
- "stdweb-derive",
- "stdweb-internal-macros",
- "stdweb-internal-runtime",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "stdweb-derive"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
-dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "serde",
- "serde_derive",
- "syn 1.0.74",
-]
-
-[[package]]
-name = "stdweb-internal-macros"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
-dependencies = [
- "base-x",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "serde",
- "serde_derive",
- "serde_json",
- "sha1",
- "syn 1.0.74",
-]
-
-[[package]]
-name = "stdweb-internal-runtime"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
-
 [[package]]
 name = "string"
 version = "0.2.1"
@@ -3153,21 +3069,21 @@ dependencies = [
 
 [[package]]
 name = "strum"
-version = "0.23.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb"
+checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8"
 
 [[package]]
 name = "strum_macros"
-version = "0.23.1"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38"
+checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef"
 dependencies = [
  "heck",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
  "rustversion",
- "syn 1.0.74",
+ "syn 1.0.93",
 ]
 
 [[package]]
@@ -3189,11 +3105,11 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.74"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c"
+checksum = "04066589568b72ec65f42d65a1a52436e954b168773148893c020269563decf2"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
  "unicode-xid 0.2.2",
 ]
@@ -3204,21 +3120,20 @@ version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
  "unicode-xid 0.2.2",
 ]
 
 [[package]]
 name = "sysinfo"
-version = "0.18.2"
+version = "0.23.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d404aefa651a24a7f2a1190fec9fb6380ba84ac511a6fefad79eb0e63d39a97d"
+checksum = "56b1e20ee77901236c389ff74618a899ff5fd34719a7ff0fd1d64f0acca5179a"
 dependencies = [
  "cfg-if 1.0.0",
  "core-foundation-sys",
- "doc-comment",
  "libc",
  "ntapi",
  "once_cell",
@@ -3228,9 +3143,9 @@ dependencies = [
 
 [[package]]
 name = "tar"
-version = "0.4.37"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6f5515d3add52e0bbdcad7b83c388bb36ba7b754dda3b5f5bc2d38640cdba5c"
+checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
 dependencies = [
  "filetime",
  "libc",
@@ -3249,13 +3164,13 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
  "cfg-if 1.0.0",
+ "fastrand",
  "libc",
- "rand 0.8.4",
  "redox_syscall 0.2.10",
  "remove_dir_all",
  "winapi 0.3.9",
@@ -3263,9 +3178,9 @@ dependencies = [
 
 [[package]]
 name = "tera"
-version = "1.12.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf95b0d8a46da5fe3ea119394a6c7f1e745f9de359081641c99946e2bf55d4f2"
+checksum = "d3cac831b615c25bcef632d1cabf864fa05813baad3d526829db18eb70e8b58d"
 dependencies = [
  "chrono",
  "chrono-tz",
@@ -3275,7 +3190,7 @@ dependencies = [
  "percent-encoding 2.1.0",
  "pest",
  "pest_derive",
- "rand 0.8.4",
+ "rand 0.8.5",
  "regex",
  "serde",
  "serde_json",
@@ -3299,46 +3214,46 @@ dependencies = [
  "maplit",
  "passwords",
  "qovery-engine",
- "rand 0.7.3",
- "reqwest 0.11.4",
+ "rand 0.8.5",
+ "reqwest 0.11.10",
  "retry",
  "scaleway_api_rs",
  "serde",
  "serde_derive",
  "serde_json",
- "time 0.2.27",
- "tokio 1.10.0",
+ "time 0.3.9",
+ "tokio 1.18.2",
  "tracing",
  "tracing-subscriber",
  "url 2.2.2",
- "uuid 0.8.2",
+ "uuid 1.0.0",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.30"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
+checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.30"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
+checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
+checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
 dependencies = [
  "once_cell",
 ]
@@ -3356,40 +3271,12 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.2.27"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
+checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd"
 dependencies = [
- "const_fn",
  "libc",
- "standback",
- "stdweb",
- "time-macros",
- "version_check",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "time-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
-dependencies = [
- "proc-macro-hack",
- "time-macros-impl",
-]
-
-[[package]]
-name = "time-macros-impl"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "standback",
- "syn 1.0.74",
+ "num_threads",
 ]
 
 [[package]]
@@ -3455,20 +3342,20 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.10.0"
+version = "1.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b"
+checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395"
 dependencies = [
- "autocfg 1.0.1",
  "bytes 1.0.1",
  "libc",
  "memchr",
- "mio 0.7.13",
+ "mio 0.8.3",
  "num_cpus",
  "once_cell",
- "parking_lot 0.11.1",
+ "parking_lot 0.12.0",
  "pin-project-lite 0.2.7",
  "signal-hook-registry",
+ "socket2 0.4.4",
  "tokio-macros",
  "winapi 0.3.9",
 ]
@@ -3517,13 +3404,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "1.3.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
+checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
 ]
 
 [[package]]
@@ -3533,7 +3420,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
  "native-tls",
- "tokio 1.10.0",
+ "tokio 1.18.2",
 ]
 
 [[package]]
@@ -3634,16 +3521,16 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.6.7"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
+checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
 dependencies = [
  "bytes 1.0.1",
  "futures-core",
  "futures-sink",
- "log",
  "pin-project-lite 0.2.7",
- "tokio 1.10.0",
+ "tokio 1.18.2",
+ "tracing",
 ]
 
 [[package]]
@@ -3663,9 +3550,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.26"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
+checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
 dependencies = [
  "cfg-if 1.0.0",
  "log",
@@ -3676,22 +3563,23 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.15"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
+checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.21"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
+checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
 dependencies = [
  "lazy_static",
+ "valuable",
 ]
 
 [[package]]
@@ -3717,9 +3605,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-serde"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
+checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
 dependencies = [
  "serde",
  "tracing-core",
@@ -3727,12 +3615,11 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.19"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab69019741fca4d98be3c62d2b75254528b5432233fd8a4d2739fec20278de48"
+checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"
 dependencies = [
  "ansi_term",
- "chrono",
  "lazy_static",
  "matchers",
  "regex",
@@ -3749,9 +3636,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-test"
-version = "0.1.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3b48778c2d401c6a7fcf38a0e3c55dc8e8e753cbd381044a8cdb6fd69a29f53"
+checksum = "3eb7bda2e93bbc9c5b247034acc6a4b3d04f033a3d4b8fc1cb87d4d1c7c7ebd7"
 dependencies = [
  "lazy_static",
  "tracing-core",
@@ -3761,20 +3648,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-test-macro"
-version = "0.1.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c49adbab879d2e0dd7f75edace5f0ac2156939ecb7e6a1e8fa14e53728328c48"
+checksum = "4801dca35e4e2cee957c469bd4a1c370fadb7894c0d50721a40eba3523e6e91c"
 dependencies = [
  "lazy_static",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
 ]
 
 [[package]]
 name = "trust-dns-proto"
-version = "0.20.3"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0d7f5db438199a6e2609debe3f69f808d074e0a2888ee0bccb45fe234d03f4"
+checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d"
 dependencies = [
  "async-trait",
  "cfg-if 1.0.0",
@@ -3787,19 +3674,19 @@ dependencies = [
  "ipnet",
  "lazy_static",
  "log",
- "rand 0.8.4",
+ "rand 0.8.5",
  "smallvec 1.6.1",
  "thiserror",
  "tinyvec",
- "tokio 1.10.0",
+ "tokio 1.18.2",
  "url 2.2.2",
 ]
 
 [[package]]
 name = "trust-dns-resolver"
-version = "0.20.3"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ad17b608a64bd0735e67bde16b0636f8aa8591f831a25d18443ed00a699770"
+checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558"
 dependencies = [
  "cfg-if 1.0.0",
  "futures-util",
@@ -3807,11 +3694,11 @@ dependencies = [
  "lazy_static",
  "log",
  "lru-cache",
- "parking_lot 0.11.1",
+ "parking_lot 0.12.0",
  "resolv-conf",
  "smallvec 1.6.1",
  "thiserror",
- "tokio 1.10.0",
+ "tokio 1.18.2",
  "trust-dns-proto",
 ]
 
@@ -3842,6 +3729,15 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
 
+[[package]]
+name = "uncased"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baeed7327e25054889b9bd4f975f32e5f4c5d434042d59ab6cd4142c0a76ed0"
+dependencies = [
+ "version_check",
+]
+
 [[package]]
 name = "unic-char-property"
 version = "0.9.0"
@@ -3916,12 +3812,6 @@ dependencies = [
  "tinyvec",
 ]
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
-
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
@@ -3984,14 +3874,20 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "0.8.2"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+checksum = "8cfcd319456c4d6ea10087ed423473267e1a071f3bc0aa89f80d60997843c6f0"
 dependencies = [
- "getrandom 0.2.3",
+ "getrandom",
  "serde",
 ]
 
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -4042,18 +3938,18 @@ dependencies = [
  "try-lock",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.10.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.75"
@@ -4075,9 +3971,9 @@ dependencies = [
  "bumpalo",
  "lazy_static",
  "log",
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
  "wasm-bindgen-shared",
 ]
 
@@ -4109,9 +4005,9 @@ version = "0.2.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.38",
  "quote 1.0.9",
- "syn 1.0.74",
+ "syn 1.0.93",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -4134,9 +4030,9 @@ dependencies = [
 
 [[package]]
 name = "widestring"
-version = "0.4.3"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c"
+checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
 
 [[package]]
 name = "winapi"
@@ -4181,6 +4077,49 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows-sys"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+dependencies = [
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+
 [[package]]
 name = "winreg"
 version = "0.6.2"
@@ -4199,6 +4138,15 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+dependencies = [
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
diff --git a/lib/aws-ec2/chart_values/mongodb/q-values.j2.yaml b/lib/aws-ec2/chart_values/mongodb/q-values.j2.yaml
index 9f001e92..1c06525f 100644
--- a/lib/aws-ec2/chart_values/mongodb/q-values.j2.yaml
+++ b/lib/aws-ec2/chart_values/mongodb/q-values.j2.yaml
@@ -13,7 +13,7 @@
 image:
   ## Bitnami MongoDB registry
   ##
-  registry: quay.io
+  registry: docker.io
   ## Bitnami MongoDB image name
   ##
   repository: bitnami/mongodb
@@ -207,19 +207,22 @@ annotations: {}
 
 # Additional abels to apply to the deployment or statefulsets
 labels:
-  ownerId: {{ owner_id }}
   envId: {{ environment_id }}
   databaseId: {{ id }}
-  databaseName: {{ sanitized_name }}
+  databaseLongId: {{ long_id }}
+  envLongId: {{ environment_long_id }}
+  projectLongId: {{ project_long_id }}
 
 # Annotations to be added to MongoDB pods
 podAnnotations: {}
 
 # Additional pod labels to apply
 podLabels:
-  ownerId: {{ owner_id }}
   envId: {{ environment_id }}
   databaseId: {{ id }}
+  databaseLongId: {{ long_id }}
+  envLongId: {{ environment_long_id }}
+  projectLongId: {{ project_long_id }}
 
 ## Use an alternate scheduler, e.g. "stork".
 ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
diff --git a/lib/aws-ec2/chart_values/mysql/q-values.j2.yaml b/lib/aws-ec2/chart_values/mysql/q-values.j2.yaml
index daa4475d..f9386a86 100644
--- a/lib/aws-ec2/chart_values/mysql/q-values.j2.yaml
+++ b/lib/aws-ec2/chart_values/mysql/q-values.j2.yaml
@@ -13,7 +13,7 @@
 ##
 image:
   debug: false
-  registry: quay.io
+  registry: docker.io
   repository: bitnami/mysql
   tag: "{{ version }}"
 
@@ -44,10 +44,11 @@ fullnameOverride: {{ sanitized_name }}
 clusterDomain: cluster.local
 
 commonLabels:
-  ownerId: {{ owner_id }}
   envId: {{ environment_id }}
   databaseId: {{ id }}
-  databaseName: {{ sanitized_name }}
+  databaseLongId: {{ long_id }}
+  envLongId: {{ environment_long_id }}
+  projectLongId: {{ project_long_id }}
 
 ## Init containers parameters:
 ## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section.
diff --git a/lib/aws-ec2/chart_values/postgresql/q-values.j2.yaml b/lib/aws-ec2/chart_values/postgresql/q-values.j2.yaml
index 3e908351..c1ccd3cf 100644
--- a/lib/aws-ec2/chart_values/postgresql/q-values.j2.yaml
+++ b/lib/aws-ec2/chart_values/postgresql/q-values.j2.yaml
@@ -13,7 +13,7 @@ global:
 ## ref: https://hub.docker.com/r/bitnami/postgresql/tags/
 ##
 image:
-  registry: quay.io
+  registry: docker.io
   repository: bitnami/postgresql
   tag: "{{ version }}"
   ## Specify a imagePullPolicy
@@ -349,14 +349,18 @@ master:
   affinity: {}
   tolerations: []
   labels:
-    ownerId: {{ owner_id }}
     envId: {{ environment_id }}
     databaseId: {{ id }}
+    databaseLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   annotations: {}
   podLabels:
-    ownerId: {{ owner_id }}
     envId: {{ environment_id }}
     databaseId: {{ id }}
+    databaseLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   podAnnotations: {}
   priorityClassName: ""
   ## Extra init containers
diff --git a/lib/aws-ec2/chart_values/redis/q-values.j2.yaml b/lib/aws-ec2/chart_values/redis/q-values.j2.yaml
index 007bb33a..292d0853 100644
--- a/lib/aws-ec2/chart_values/redis/q-values.j2.yaml
+++ b/lib/aws-ec2/chart_values/redis/q-values.j2.yaml
@@ -13,7 +13,7 @@ global:
 ## ref: https://hub.docker.com/r/bitnami/redis/tags/
 ##
 image:
-  registry: quay.io
+  registry: docker.io
   repository: bitnami/redis
   ## Bitnami Redis image tag
   ## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links
@@ -132,9 +132,11 @@ sentinel:
     ##
     annotations: {}
     labels:
-      ownerId: {{ owner_id }}
       envId: {{ environment_id }}
       databaseId: {{ id }}
+      databaseLongId: {{ long_id }}
+      envLongId: {{ environment_long_id }}
+      projectLongId: {{ project_long_id }}
     loadBalancerIP:
 
 ## Specifies the Kubernetes Cluster's Domain Name.
@@ -291,10 +293,11 @@ master:
   ## Redis Master additional pod labels and annotations
   ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
   podLabels:
-    ownerId: {{ owner_id }}
     envId: {{ environment_id }}
     databaseId: {{ id }}
-    databaseName: {{ sanitized_name }}
+    databaseLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   podAnnotations: {}
 
   ## Redis Master resource requests and limits
@@ -388,9 +391,11 @@ master:
       external-dns.alpha.kubernetes.io/ttl: "300"
     {% endif %}
     labels:
-      ownerId: {{ owner_id }}
       envId: {{ environment_id }}
       databaseId: {{ id }}
+      databaseLongId: {{ long_id }}
+      envLongId: {{ environment_long_id }}
+      projectLongId: {{ project_long_id }}
     loadBalancerIP:
     # loadBalancerSourceRanges: ["10.0.0.0/8"]
 
@@ -425,9 +430,11 @@ master:
   ## https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#updating-statefulsets
   statefulset:
     labels:
-      ownerId: {{ owner_id }}
       envId: {{ environment_id }}
       databaseId: {{ id }}
+      databaseLongId: {{ long_id }}
+      envLongId: {{ environment_long_id }}
+      projectLongId: {{ project_long_id }}
     updateStrategy: RollingUpdate
     ## Partition update strategy
     ## https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#partitions
diff --git a/lib/aws-ec2/charts/q-application/templates/deployment.j2.yaml b/lib/aws-ec2/charts/q-application/templates/deployment.j2.yaml
index 84053b29..13384335 100644
--- a/lib/aws-ec2/charts/q-application/templates/deployment.j2.yaml
+++ b/lib/aws-ec2/charts/q-application/templates/deployment.j2.yaml
@@ -10,6 +10,9 @@ metadata:
     envId: {{ environment_id }}
     appId: {{ id }}
     app: {{ sanitized_name }}
+    appLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   annotations:
     releaseTime: {% raw %}{{ dateInZone "2006-01-02 15:04:05Z" (now) "UTC"| quote }}{% endraw %}
 spec:
@@ -33,6 +36,9 @@ spec:
         envId: {{ environment_id }}
         appId: {{ id }}
         app: {{ sanitized_name }}
+        appLongId: {{ long_id }}
+        envLongId: {{ environment_long_id }}
+        projectLongId: {{ project_long_id }}
       annotations:
         checksum/config: {% raw %}{{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}{% endraw %}
     spec:
diff --git a/lib/aws-ec2/charts/q-application/templates/statefulset.j2.yaml b/lib/aws-ec2/charts/q-application/templates/statefulset.j2.yaml
index fb7cf72b..83ee57a4 100644
--- a/lib/aws-ec2/charts/q-application/templates/statefulset.j2.yaml
+++ b/lib/aws-ec2/charts/q-application/templates/statefulset.j2.yaml
@@ -10,6 +10,9 @@ metadata:
     envId: {{ environment_id }}
     appId: {{ id }}
     app: {{ sanitized_name }}
+    appLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   annotations:
     releaseTime: {% raw %}{{ dateInZone "2006-01-02 15:04:05Z" (now) "UTC"| quote }}{% endraw %}
 spec:
@@ -28,6 +31,9 @@ spec:
         envId: {{ environment_id }}
         appId: {{ id }}
         app: {{ sanitized_name }}
+        appLongId: {{ long_id }}
+        envLongId: {{ environment_long_id }}
+        projectLongId: {{ project_long_id }}
       annotations:
         checksum/config: {% raw %}{{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}{% endraw %}
     spec:
@@ -91,27 +97,6 @@ spec:
 {%- endfor %}
   volumeClaimTemplates:
 {%- for s in storage %}
-{% if clone %}
-  - metadata:
-      name: {{ s.id }}
-      labels:
-        ownerId: {{ owner_id }}
-        envId: {{ environment_id }}
-        appId: {{ id }}
-        app: {{ sanitized_name }}
-        diskId: {{ s.id }}
-        diskType: {{ s.storage_type }}
-    spec:
-      accessModes:
-        - ReadWriteOnce
-      storageClassName: aws-ebs-{{ s.storage_type }}-0
-      dataSource:
-        name: {{ s.id }}
-        kind: PersistentVolumeClaim
-      resources:
-        requests:
-          storage: {{ disk.size_in_gib }}Gi
-{% else %}
   - metadata:
       name: {{ s.id }}
       labels:
@@ -127,6 +112,5 @@ spec:
       resources:
         requests:
           storage: {{ s.size_in_gib }}Gi
-{%- endif %}
 {%- endfor %}
 {%- endif %}
diff --git a/lib/aws-ec2/charts/q-ingress-tls/templates/cert-issuer.j2.yaml b/lib/aws-ec2/charts/q-ingress-tls/templates/cert-issuer.j2.yaml
index cfb54db6..cbb3e258 100644
--- a/lib/aws-ec2/charts/q-ingress-tls/templates/cert-issuer.j2.yaml
+++ b/lib/aws-ec2/charts/q-ingress-tls/templates/cert-issuer.j2.yaml
@@ -7,6 +7,9 @@ metadata:
   namespace: {{ namespace }}
   labels:
     ownerId: {{ owner_id }}
+    routerLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
 spec:
   acme:
     server: {{ spec_acme_server }}
diff --git a/lib/aws-ec2/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml b/lib/aws-ec2/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml
index 5cf11a24..dfb1c595 100644
--- a/lib/aws-ec2/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml
+++ b/lib/aws-ec2/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml
@@ -10,6 +10,9 @@ metadata:
     routerName: {{ sanitized_name }}
     routerId: {{ id }}
     envId: {{ environment_id }}
+    routerLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
     fqdn: "{{ router_default_domain }}"
   annotations:
     external-dns.alpha.kubernetes.io/hostname: {{ router_default_domain }}
diff --git a/lib/aws/chart_values/mongodb/q-values.j2.yaml b/lib/aws/chart_values/mongodb/q-values.j2.yaml
index 3e513b15..1c06525f 100644
--- a/lib/aws/chart_values/mongodb/q-values.j2.yaml
+++ b/lib/aws/chart_values/mongodb/q-values.j2.yaml
@@ -210,6 +210,8 @@ labels:
   envId: {{ environment_id }}
   databaseId: {{ id }}
   databaseLongId: {{ long_id }}
+  envLongId: {{ environment_long_id }}
+  projectLongId: {{ project_long_id }}
 
 # Annotations to be added to MongoDB pods
 podAnnotations: {}
@@ -219,6 +221,8 @@ podLabels:
   envId: {{ environment_id }}
   databaseId: {{ id }}
   databaseLongId: {{ long_id }}
+  envLongId: {{ environment_long_id }}
+  projectLongId: {{ project_long_id }}
 
 ## Use an alternate scheduler, e.g. "stork".
 ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
diff --git a/lib/aws/chart_values/mysql/q-values.j2.yaml b/lib/aws/chart_values/mysql/q-values.j2.yaml
index 218cf192..f9386a86 100644
--- a/lib/aws/chart_values/mysql/q-values.j2.yaml
+++ b/lib/aws/chart_values/mysql/q-values.j2.yaml
@@ -47,6 +47,8 @@ commonLabels:
   envId: {{ environment_id }}
   databaseId: {{ id }}
   databaseLongId: {{ long_id }}
+  envLongId: {{ environment_long_id }}
+  projectLongId: {{ project_long_id }}
 
 ## Init containers parameters:
 ## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section.
diff --git a/lib/aws/chart_values/postgresql/q-values.j2.yaml b/lib/aws/chart_values/postgresql/q-values.j2.yaml
index 1c11b3c8..c1ccd3cf 100644
--- a/lib/aws/chart_values/postgresql/q-values.j2.yaml
+++ b/lib/aws/chart_values/postgresql/q-values.j2.yaml
@@ -352,11 +352,15 @@ master:
     envId: {{ environment_id }}
     databaseId: {{ id }}
     databaseLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   annotations: {}
   podLabels:
     envId: {{ environment_id }}
     databaseId: {{ id }}
     databaseLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   podAnnotations: {}
   priorityClassName: ""
   ## Extra init containers
diff --git a/lib/aws/chart_values/redis/q-values.j2.yaml b/lib/aws/chart_values/redis/q-values.j2.yaml
index 4de95952..292d0853 100644
--- a/lib/aws/chart_values/redis/q-values.j2.yaml
+++ b/lib/aws/chart_values/redis/q-values.j2.yaml
@@ -135,6 +135,8 @@ sentinel:
       envId: {{ environment_id }}
       databaseId: {{ id }}
       databaseLongId: {{ long_id }}
+      envLongId: {{ environment_long_id }}
+      projectLongId: {{ project_long_id }}
     loadBalancerIP:
 
 ## Specifies the Kubernetes Cluster's Domain Name.
@@ -294,6 +296,8 @@ master:
     envId: {{ environment_id }}
     databaseId: {{ id }}
     databaseLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   podAnnotations: {}
 
   ## Redis Master resource requests and limits
@@ -390,6 +394,8 @@ master:
       envId: {{ environment_id }}
       databaseId: {{ id }}
       databaseLongId: {{ long_id }}
+      envLongId: {{ environment_long_id }}
+      projectLongId: {{ project_long_id }}
     loadBalancerIP:
     # loadBalancerSourceRanges: ["10.0.0.0/8"]
 
@@ -427,6 +433,8 @@ master:
       envId: {{ environment_id }}
       databaseId: {{ id }}
       databaseLongId: {{ long_id }}
+      envLongId: {{ environment_long_id }}
+      projectLongId: {{ project_long_id }}
     updateStrategy: RollingUpdate
     ## Partition update strategy
     ## https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#partitions
diff --git a/lib/aws/charts/q-application/templates/deployment.j2.yaml b/lib/aws/charts/q-application/templates/deployment.j2.yaml
index a292b299..e1aea0cf 100644
--- a/lib/aws/charts/q-application/templates/deployment.j2.yaml
+++ b/lib/aws/charts/q-application/templates/deployment.j2.yaml
@@ -9,6 +9,8 @@ metadata:
     appLongId: {{ long_id }}
     ownerId: {{ owner_id }}
     envId: {{ environment_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
     appId: {{ id }}
     app: {{ sanitized_name }}
   annotations:
@@ -35,6 +37,8 @@ spec:
         envId: {{ environment_id }}
         appId: {{ id }}
         app: {{ sanitized_name }}
+        envLongId: {{ environment_long_id }}
+        projectLongId: {{ project_long_id }}
       annotations:
         checksum/config: {% raw %}{{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}{% endraw %}
         appCommitId: {{ version }}
diff --git a/lib/aws/charts/q-application/templates/statefulset.j2.yaml b/lib/aws/charts/q-application/templates/statefulset.j2.yaml
index 867a9f92..6f418ae9 100644
--- a/lib/aws/charts/q-application/templates/statefulset.j2.yaml
+++ b/lib/aws/charts/q-application/templates/statefulset.j2.yaml
@@ -11,6 +11,8 @@ metadata:
     appId: {{ id }}
     appLongId: {{ long_id }}
     app: {{ sanitized_name }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   annotations:
     releaseTime: {% raw %}{{ dateInZone "2006-01-02 15:04:05Z" (now) "UTC"| quote }}{% endraw %}
 spec:
@@ -30,6 +32,8 @@ spec:
         appId: {{ id }}
         appLongId: {{ long_id }}
         app: {{ sanitized_name }}
+        envLongId: {{ environment_long_id }}
+        projectLongId: {{ project_long_id }}
       annotations:
         checksum/config: {% raw %}{{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}{% endraw %}
     spec:
diff --git a/lib/aws/charts/q-ingress-tls/templates/cert-issuer.j2.yaml b/lib/aws/charts/q-ingress-tls/templates/cert-issuer.j2.yaml
index 5a4d0ae4..2556e1b7 100644
--- a/lib/aws/charts/q-ingress-tls/templates/cert-issuer.j2.yaml
+++ b/lib/aws/charts/q-ingress-tls/templates/cert-issuer.j2.yaml
@@ -7,6 +7,8 @@ metadata:
   namespace: {{ namespace }}
   labels:
     routerLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
 spec:
   acme:
     server: {{ spec_acme_server }}
diff --git a/lib/aws/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml b/lib/aws/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml
index 8e4c688e..42e34a99 100644
--- a/lib/aws/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml
+++ b/lib/aws/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml
@@ -9,6 +9,8 @@ metadata:
     routerId: {{ id }}
     routerLongId: {{ long_id }}
     envId: {{ environment_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
     fqdn: "{{ router_default_domain }}"
   annotations:
     external-dns.alpha.kubernetes.io/hostname: {{ router_default_domain }}
diff --git a/lib/digitalocean/chart_values/mongodb/q-values.j2.yaml b/lib/digitalocean/chart_values/mongodb/q-values.j2.yaml
index 409ff2ec..49f11a9d 100644
--- a/lib/digitalocean/chart_values/mongodb/q-values.j2.yaml
+++ b/lib/digitalocean/chart_values/mongodb/q-values.j2.yaml
@@ -213,6 +213,8 @@ labels:
   envId: {{ environment_id }}
   databaseId: {{ id }}
   databaseLongId: {{ long_id }}
+  envLongId: {{ environment_long_id }}
+  projectLongId: {{ project_long_id }}
 
 # Annotations to be added to MongoDB pods
 podAnnotations: {}
@@ -222,6 +224,8 @@ podLabels:
   envId: {{ environment_id }}
   databaseId: {{ id }}
   databaseLongId: {{ long_id }}
+  envLongId: {{ environment_long_id }}
+  projectLongId: {{ project_long_id }}
 
 ## Use an alternate scheduler, e.g. "stork".
 ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
diff --git a/lib/digitalocean/chart_values/mysql/q-values.j2.yaml b/lib/digitalocean/chart_values/mysql/q-values.j2.yaml
index 3c8ec5db..a8b97e15 100644
--- a/lib/digitalocean/chart_values/mysql/q-values.j2.yaml
+++ b/lib/digitalocean/chart_values/mysql/q-values.j2.yaml
@@ -47,6 +47,8 @@ commonLabels:
   envId: {{ environment_id }}
   databaseId: {{ id }}
   databaseLongId: {{ long_id }}
+  envLongId: {{ environment_long_id }}
+  projectLongId: {{ project_long_id }}
 
 ## Init containers parameters:
 ## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section.
diff --git a/lib/digitalocean/chart_values/postgresql/q-values.j2.yaml b/lib/digitalocean/chart_values/postgresql/q-values.j2.yaml
index 22c1974e..67fb018f 100644
--- a/lib/digitalocean/chart_values/postgresql/q-values.j2.yaml
+++ b/lib/digitalocean/chart_values/postgresql/q-values.j2.yaml
@@ -354,11 +354,15 @@ master:
     envId: {{ environment_id }}
     databaseId: {{ id }}
     databaseLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   annotations: {}
   podLabels:
     envId: {{ environment_id }}
     databaseId: {{ id }}
     databaseLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   podAnnotations: {}
   priorityClassName: ""
   ## Extra init containers
diff --git a/lib/digitalocean/chart_values/redis/q-values.j2.yaml b/lib/digitalocean/chart_values/redis/q-values.j2.yaml
index 2f44304e..7eee6fd5 100644
--- a/lib/digitalocean/chart_values/redis/q-values.j2.yaml
+++ b/lib/digitalocean/chart_values/redis/q-values.j2.yaml
@@ -135,6 +135,8 @@ sentinel:
       envId: {{ environment_id }}
       databaseId: {{ id }}
       databaseLongId: {{ long_id }}
+      envLongId: {{ environment_long_id }}
+      projectLongId: {{ project_long_id }}
     loadBalancerIP:
 
 ## Specifies the Kubernetes Cluster's Domain Name.
@@ -294,6 +296,8 @@ master:
     envId: {{ environment_id }}
     databaseId: {{ id }}
     databaseLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   podAnnotations: {}
 
   ## Redis Master resource requests and limits
@@ -393,6 +397,8 @@ master:
       envId: {{ environment_id }}
       databaseId: {{ id }}
       databaseLongId: {{ long_id }}
+      envLongId: {{ environment_long_id }}
+      projectLongId: {{ project_long_id }}
     loadBalancerIP:
     # loadBalancerSourceRanges: ["10.0.0.0/8"]
 
@@ -430,6 +436,8 @@ master:
       envId: {{ environment_id }}
       databaseId: {{ id }}
       databaseLongId: {{ long_id }}
+      envLongId: {{ environment_long_id }}
+      projectLongId: {{ project_long_id }}
     updateStrategy: RollingUpdate
     ## Partition update strategy
     ## https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#partitions
diff --git a/lib/digitalocean/charts/q-application/templates/deployment.j2.yaml b/lib/digitalocean/charts/q-application/templates/deployment.j2.yaml
index a292b299..ef795e4f 100644
--- a/lib/digitalocean/charts/q-application/templates/deployment.j2.yaml
+++ b/lib/digitalocean/charts/q-application/templates/deployment.j2.yaml
@@ -11,6 +11,8 @@ metadata:
     envId: {{ environment_id }}
     appId: {{ id }}
     app: {{ sanitized_name }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   annotations:
     releaseTime: {% raw %}{{ dateInZone "2006-01-02 15:04:05Z" (now) "UTC"| quote }}{% endraw %}
 spec:
@@ -31,6 +33,8 @@ spec:
     metadata:
       labels:
         appLongId: {{ long_id }}
+        envLongId: {{ environment_long_id }}
+        projectLongId: {{ project_long_id }}
         ownerId: {{ owner_id }}
         envId: {{ environment_id }}
         appId: {{ id }}
diff --git a/lib/digitalocean/charts/q-application/templates/statefulset.j2.yaml b/lib/digitalocean/charts/q-application/templates/statefulset.j2.yaml
index 66e34216..36934cb2 100644
--- a/lib/digitalocean/charts/q-application/templates/statefulset.j2.yaml
+++ b/lib/digitalocean/charts/q-application/templates/statefulset.j2.yaml
@@ -6,6 +6,8 @@ metadata:
   name: {{ sanitized_name }}
   namespace: {{ namespace }}
   labels:
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
     appLongId: {{ long_id }}
     ownerId: {{ owner_id }}
     envId: {{ environment_id }}
@@ -25,6 +27,8 @@ spec:
   template:
     metadata:
       labels:
+        envLongId: {{ environment_long_id }}
+        projectLongId: {{ project_long_id }}
         appLongId: {{ long_id }}
         ownerId: {{ owner_id }}
         envId: {{ environment_id }}
diff --git a/lib/digitalocean/charts/q-ingress-tls/templates/cert-issuer.j2.yaml b/lib/digitalocean/charts/q-ingress-tls/templates/cert-issuer.j2.yaml
index 23b35f81..8ad2ef94 100644
--- a/lib/digitalocean/charts/q-ingress-tls/templates/cert-issuer.j2.yaml
+++ b/lib/digitalocean/charts/q-ingress-tls/templates/cert-issuer.j2.yaml
@@ -7,6 +7,8 @@ metadata:
   namespace: {{ namespace }}
   labels:
     routerLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
 spec:
   acme:
     server: {{ spec_acme_server }}
diff --git a/lib/digitalocean/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml b/lib/digitalocean/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml
index 8e4c688e..9c4d9b01 100644
--- a/lib/digitalocean/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml
+++ b/lib/digitalocean/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml
@@ -8,6 +8,8 @@ metadata:
   labels:
     routerId: {{ id }}
     routerLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
     envId: {{ environment_id }}
     fqdn: "{{ router_default_domain }}"
   annotations:
diff --git a/lib/scaleway/chart_values/mongodb/q-values.j2.yaml b/lib/scaleway/chart_values/mongodb/q-values.j2.yaml
index e5a0d7d9..1bc6e443 100644
--- a/lib/scaleway/chart_values/mongodb/q-values.j2.yaml
+++ b/lib/scaleway/chart_values/mongodb/q-values.j2.yaml
@@ -148,6 +148,8 @@ labels:
   envId: {{ environment_id }}
   databaseId: {{ id }}
   databaseLongId: {{ long_id }}
+  envLongId: {{ environment_long_id }}
+  projectLongId: {{ project_long_id }}
 
 
 # Additional pod labels to apply
@@ -155,6 +157,8 @@ podLabels:
   envId: {{ environment_id }}
   databaseId: {{ id }}
   databaseLongId: {{ long_id }}
+  envLongId: {{ environment_long_id }}
+  projectLongId: {{ project_long_id }}
 
 ## updateStrategy for MongoDB Primary, Secondary and Arbitrer statefulsets
 ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
diff --git a/lib/scaleway/chart_values/mysql/q-values.j2.yaml b/lib/scaleway/chart_values/mysql/q-values.j2.yaml
index 612b39cd..ab5ee54e 100644
--- a/lib/scaleway/chart_values/mysql/q-values.j2.yaml
+++ b/lib/scaleway/chart_values/mysql/q-values.j2.yaml
@@ -47,6 +47,8 @@ commonLabels:
   envId: {{ environment_id }}
   databaseId: {{ id }}
   databaseLongId: {{ long_id }}
+  envLongId: {{ environment_long_id }}
+  projectLongId: {{ project_long_id }}
 
 ## Init containers parameters:
 ## volumePermissions: Change the owner and group of the persistent volume mountpoint to runAsUser:fsGroup values from the securityContext section.
diff --git a/lib/scaleway/chart_values/postgresql/q-values.j2.yaml b/lib/scaleway/chart_values/postgresql/q-values.j2.yaml
index 9ca8052f..3bdebe20 100644
--- a/lib/scaleway/chart_values/postgresql/q-values.j2.yaml
+++ b/lib/scaleway/chart_values/postgresql/q-values.j2.yaml
@@ -190,11 +190,15 @@ master:
     envId: {{ environment_id }}
     databaseId: {{ id }}
     databaseLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   annotations: {}
   podLabels:
     envId: {{ environment_id }}
     databaseId: {{ id }}
     databaseLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   podAnnotations: {}
   priorityClassName: ""
   ## Extra init containers
diff --git a/lib/scaleway/chart_values/redis/q-values.j2.yaml b/lib/scaleway/chart_values/redis/q-values.j2.yaml
index f1b92cb8..c4a5ccde 100644
--- a/lib/scaleway/chart_values/redis/q-values.j2.yaml
+++ b/lib/scaleway/chart_values/redis/q-values.j2.yaml
@@ -124,6 +124,8 @@ sentinel:
       envId: {{ environment_id }}
       databaseId: {{ id }}
       databaseLongId: {{ long_id }}
+      envLongId: {{ environment_long_id }}
+      projectLongId: {{ project_long_id }}
     loadBalancerIP:
 
 networkPolicy:
@@ -251,6 +253,8 @@ master:
     envId: {{ environment_id }}
     databaseId: {{ id }}
     databaseLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
   podAnnotations: {}
 
   ## Redis Master resource requests and limits
@@ -352,6 +356,8 @@ master:
       envId: {{ environment_id }}
       databaseId: {{ id }}
       databaseLongId: {{ long_id }}
+      envLongId: {{ environment_long_id }}
+      projectLongId: {{ project_long_id }}
     loadBalancerIP:
     # loadBalancerSourceRanges: ["10.0.0.0/8"]
 
@@ -389,6 +395,8 @@ master:
       envId: {{ environment_id }}
       databaseId: {{ id }}
       databaseLongId: {{ long_id }}
+      envLongId: {{ environment_long_id }}
+      projectLongId: {{ project_long_id }}
     updateStrategy: RollingUpdate
     ## Partition update strategy
     ## https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#partitions
diff --git a/lib/scaleway/charts/q-application/templates/deployment.j2.yaml b/lib/scaleway/charts/q-application/templates/deployment.j2.yaml
index 7c5d7531..146eb9fa 100644
--- a/lib/scaleway/charts/q-application/templates/deployment.j2.yaml
+++ b/lib/scaleway/charts/q-application/templates/deployment.j2.yaml
@@ -7,6 +7,8 @@ metadata:
   namespace: {{ namespace }}
   labels:
     appLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
     ownerId: {{ owner_id }}
     envId: {{ environment_id }}
     appId: {{ id }}
@@ -30,6 +32,8 @@ spec:
     metadata:
       labels:
         appLongId: {{ long_id }}
+        envLongId: {{ environment_long_id }}
+        projectLongId: {{ project_long_id }}
         ownerId: {{ owner_id }}
         envId: {{ environment_id }}
         appId: {{ id }}
diff --git a/lib/scaleway/charts/q-application/templates/statefulset.j2.yaml b/lib/scaleway/charts/q-application/templates/statefulset.j2.yaml
index 1e7160d8..b7332fa8 100644
--- a/lib/scaleway/charts/q-application/templates/statefulset.j2.yaml
+++ b/lib/scaleway/charts/q-application/templates/statefulset.j2.yaml
@@ -7,6 +7,8 @@ metadata:
   namespace: {{ namespace }}
   labels:
     appLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
     ownerId: {{ owner_id }}
     envId: {{ environment_id }}
     appId: {{ id }}
@@ -26,6 +28,8 @@ spec:
     metadata:
       labels:
         appLongId: {{ long_id }}
+        envLongId: {{ environment_long_id }}
+        projectLongId: {{ project_long_id }}
         ownerId: {{ owner_id }}
         envId: {{ environment_id }}
         appId: {{ id }}
diff --git a/lib/scaleway/charts/q-ingress-tls/templates/cert-issuer.j2.yaml b/lib/scaleway/charts/q-ingress-tls/templates/cert-issuer.j2.yaml
index 5a4d0ae4..2556e1b7 100644
--- a/lib/scaleway/charts/q-ingress-tls/templates/cert-issuer.j2.yaml
+++ b/lib/scaleway/charts/q-ingress-tls/templates/cert-issuer.j2.yaml
@@ -7,6 +7,8 @@ metadata:
   namespace: {{ namespace }}
   labels:
     routerLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
 spec:
   acme:
     server: {{ spec_acme_server }}
diff --git a/lib/scaleway/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml b/lib/scaleway/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml
index 8e4c688e..9c4d9b01 100644
--- a/lib/scaleway/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml
+++ b/lib/scaleway/charts/q-ingress-tls/templates/ingress-qovery.j2.yaml
@@ -8,6 +8,8 @@ metadata:
   labels:
     routerId: {{ id }}
     routerLongId: {{ long_id }}
+    envLongId: {{ environment_long_id }}
+    projectLongId: {{ project_long_id }}
     envId: {{ environment_id }}
     fqdn: "{{ router_default_domain }}"
   annotations:
diff --git a/src/cloud_provider/environment.rs b/src/cloud_provider/environment.rs
index c32cb888..0c971627 100644
--- a/src/cloud_provider/environment.rs
+++ b/src/cloud_provider/environment.rs
@@ -1,12 +1,17 @@
 use crate::cloud_provider::service::{Action, DatabaseService, RouterService, StatefulService, StatelessService};
 use crate::models::application::ApplicationService;
+use crate::utilities::to_short_id;
+use uuid::Uuid;
 
 pub struct Environment {
     namespace: String,
     pub id: String,
+    pub long_id: Uuid,
     pub project_id: String,
+    pub project_long_id: Uuid,
     pub owner_id: String,
     pub organization_id: String,
+    pub organization_long_id: Uuid,
     pub action: Action,
     pub applications: Vec<Box<dyn ApplicationService>>,
     pub routers: Vec<Box<dyn RouterService>>,
@@ -15,21 +20,25 @@ pub struct Environment {
 
 impl Environment {
     pub fn new(
-        id: &str,
-        project_id: &str,
-        owner_id: &str,
-        organization_id: &str,
+        long_id: Uuid,
+        project_long_id: Uuid,
+        organization_long_id: Uuid,
         action: Action,
         applications: Vec<Box<dyn ApplicationService>>,
         routers: Vec<Box<dyn RouterService>>,
         databases: Vec<Box<dyn DatabaseService>>,
     ) -> Self {
+        let project_id = to_short_id(&project_long_id);
+        let env_id = to_short_id(&long_id);
         Environment {
-            namespace: format!("{}-{}", project_id, id),
-            id: id.to_string(),
-            project_id: project_id.to_string(),
-            owner_id: owner_id.to_string(),
-            organization_id: organization_id.to_string(),
+            namespace: format!("{}-{}", project_id, env_id),
+            id: env_id,
+            long_id,
+            project_id,
+            project_long_id,
+            owner_id: "FAKE".to_string(),
+            organization_id: to_short_id(&organization_long_id),
+            organization_long_id,
             action,
             applications,
             routers,
diff --git a/src/cloud_provider/service.rs b/src/cloud_provider/service.rs
index 46b7844e..d94cd767 100644
--- a/src/cloud_provider/service.rs
+++ b/src/cloud_provider/service.rs
@@ -333,8 +333,11 @@ pub fn default_tera_context(
     context.insert("long_id", service.long_id());
     context.insert("owner_id", environment.owner_id.as_str());
     context.insert("project_id", environment.project_id.as_str());
+    context.insert("project_long_id", &environment.project_long_id);
     context.insert("organization_id", environment.organization_id.as_str());
+    context.insert("organization_long_id", &environment.organization_long_id);
     context.insert("environment_id", environment.id.as_str());
+    context.insert("environment_long_id", &environment.long_id);
     context.insert("region", kubernetes.region().as_str());
     context.insert("zone", kubernetes.zone());
     context.insert("name", service.name());
diff --git a/src/io_models.rs b/src/io_models.rs
index b37ab285..499f0094 100644
--- a/src/io_models.rs
+++ b/src/io_models.rs
@@ -82,10 +82,9 @@ impl Display for QoveryIdentifier {
 #[derive(Serialize, Deserialize, Clone, Eq, PartialEq, Hash)]
 pub struct EnvironmentRequest {
     pub execution_id: String,
-    pub id: String,
-    pub owner_id: String,
-    pub project_id: String,
-    pub organization_id: String,
+    pub long_id: Uuid,
+    pub project_long_id: Uuid,
+    pub organization_long_id: Uuid,
     pub action: Action,
     pub applications: Vec<Application>,
     pub routers: Vec<Router>,
@@ -134,10 +133,9 @@ impl EnvironmentRequest {
         }
 
         Ok(Environment::new(
-            self.id.as_str(),
-            self.project_id.as_str(),
-            self.owner_id.as_str(),
-            self.organization_id.as_str(),
+            self.long_id,
+            self.project_long_id,
+            self.organization_long_id,
             self.action.to_service_action(),
             applications,
             routers,
diff --git a/src/models/application.rs b/src/models/application.rs
index 8f43b41f..4e7801cb 100644
--- a/src/models/application.rs
+++ b/src/models/application.rs
@@ -101,8 +101,11 @@ impl<T: CloudProvider> Application<T> {
         context.insert("long_id", &self.long_id);
         context.insert("owner_id", environment.owner_id.as_str());
         context.insert("project_id", environment.project_id.as_str());
+        context.insert("project_long_id", &environment.project_long_id);
         context.insert("organization_id", environment.organization_id.as_str());
+        context.insert("organization_long_id", &environment.organization_long_id);
         context.insert("environment_id", environment.id.as_str());
+        context.insert("environment_long_id", &environment.long_id);
         context.insert("region", kubernetes.region().as_str());
         context.insert("zone", kubernetes.zone());
         context.insert("name", self.name());
diff --git a/test_utilities/src/common.rs b/test_utilities/src/common.rs
index 90f29dc0..98a9266b 100644
--- a/test_utilities/src/common.rs
+++ b/test_utilities/src/common.rs
@@ -254,10 +254,9 @@ pub fn environment_3_apps_3_routers_3_databases(
 
     EnvironmentRequest {
         execution_id: context.execution_id().to_string(),
-        id: generate_id(),
-        owner_id: generate_id(),
-        project_id: generate_id(),
-        organization_id: context.organization_id().to_string(),
+        long_id: Uuid::new_v4(),
+        project_long_id: Uuid::new_v4(),
+        organization_long_id: Uuid::new_v4(),
         action: Action::Create,
         applications: vec![
             Application {
@@ -518,21 +517,19 @@ pub fn environment_3_apps_3_routers_3_databases(
 }
 
 pub fn working_minimal_environment(context: &Context, test_domain: &str) -> EnvironmentRequest {
-    let suffix = generate_id();
-    let application_id = generate_id();
-    let application_name = format!("{}-{}", "simple-app", &suffix);
+    let application_id = Uuid::new_v4();
+    let application_name = to_short_id(&application_id);
     let router_name = "main".to_string();
-    let application_domain = format!("{}.{}.{}", application_id, context.cluster_id(), test_domain);
+    let application_domain = format!("{}.{}.{}", application_name, context.cluster_id(), test_domain);
     EnvironmentRequest {
         execution_id: context.execution_id().to_string(),
-        id: generate_id(),
-        owner_id: generate_id(),
-        project_id: generate_id(),
-        organization_id: context.organization_id().to_string(),
+        long_id: application_id,
+        project_long_id: Uuid::new_v4(),
+        organization_long_id: Uuid::new_v4(),
         action: Action::Create,
         applications: vec![Application {
-            long_id: Uuid::new_v4(),
-            name: application_name,
+            long_id: application_id,
+            name: application_name.to_string(),
             git_url: "https://github.com/Qovery/engine-testing.git".to_string(),
             commit_id: "fc575a2f3be0b9100492c8a463bf18134a8698a5".to_string(),
             dockerfile_path: Some("Dockerfile".to_string()),
@@ -572,7 +569,7 @@ pub fn working_minimal_environment(context: &Context, test_domain: &str) -> Envi
             custom_domains: vec![],
             routes: vec![Route {
                 path: "/".to_string(),
-                application_name: format!("{}-{}", "simple-app", &suffix),
+                application_name: application_name.to_string(),
             }],
             sticky_sessions_enabled: false,
         }],
@@ -587,10 +584,9 @@ pub fn database_test_environment(context: &Context) -> EnvironmentRequest {
 
     EnvironmentRequest {
         execution_id: context.execution_id().to_string(),
-        id: generate_id(),
-        owner_id: generate_id(),
-        project_id: generate_id(),
-        organization_id: context.organization_id().to_string(),
+        long_id: Uuid::new_v4(),
+        project_long_id: Uuid::new_v4(),
+        organization_long_id: Uuid::new_v4(),
         action: Action::Create,
         applications: vec![Application {
             long_id: Uuid::new_v4(),
@@ -624,15 +620,14 @@ pub fn database_test_environment(context: &Context) -> EnvironmentRequest {
 }
 
 pub fn database_test_environment_on_upgrade(context: &Context) -> EnvironmentRequest {
-    let suffix = "c3dn5so3dltod3s";
-    let application_name = format!("{}-{}", "simple-app", &suffix);
+    let suffix = Uuid::new_v4();
+    let application_name = format!("{}-{}", "simple-app", to_short_id(&suffix));
 
     EnvironmentRequest {
         execution_id: context.execution_id().to_string(),
-        id: "c4dn5so3dltod3s".to_string(),
-        owner_id: "c5dn5so3dltod3s".to_string(),
-        project_id: "c6dn5so3dltod3s".to_string(),
-        organization_id: context.organization_id().to_string(),
+        long_id: suffix,
+        project_long_id: suffix,
+        organization_long_id: Uuid::new_v4(),
         action: Action::Create,
         applications: vec![Application {
             long_id: Uuid::from_str("9d0158db-b783-4bc2-a23b-c7d9228cbe90").unwrap(),
@@ -698,10 +693,9 @@ pub fn environnement_2_app_2_routers_1_psql(
 
     EnvironmentRequest {
         execution_id: context.execution_id().to_string(),
-        id: generate_id(),
-        owner_id: generate_id(),
-        project_id: generate_id(),
-        organization_id: context.organization_id().to_string(),
+        long_id: Uuid::new_v4(),
+        project_long_id: Uuid::new_v4(),
+        organization_long_id: Uuid::new_v4(),
         action: Action::Create,
         databases: vec![Database {
             kind: DatabaseKind::Postgresql,
@@ -876,10 +870,9 @@ pub fn echo_app_environment(context: &Context, test_domain: &str) -> Environment
     let suffix = generate_id();
     EnvironmentRequest {
         execution_id: context.execution_id().to_string(),
-        id: generate_id(),
-        owner_id: generate_id(),
-        project_id: generate_id(),
-        organization_id: context.organization_id().to_string(),
+        long_id: Uuid::new_v4(),
+        project_long_id: Uuid::new_v4(),
+        organization_long_id: Uuid::new_v4(),
         action: Action::Create,
         applications: vec![Application {
             long_id: Uuid::new_v4(),
@@ -939,10 +932,9 @@ pub fn environment_only_http_server(context: &Context) -> EnvironmentRequest {
     let suffix = generate_id();
     EnvironmentRequest {
         execution_id: context.execution_id().to_string(),
-        id: generate_id(),
-        owner_id: generate_id(),
-        project_id: generate_id(),
-        organization_id: context.organization_id().to_string(),
+        long_id: Uuid::new_v4(),
+        project_long_id: Uuid::new_v4(),
+        organization_long_id: Uuid::new_v4(),
         action: Action::Create,
         applications: vec![Application {
             long_id: Uuid::new_v4(),
@@ -989,10 +981,9 @@ pub fn environment_only_http_server_router(context: &Context, test_domain: &str)
     let id = Uuid::new_v4();
     EnvironmentRequest {
         execution_id: context.execution_id().to_string(),
-        id: generate_id(),
-        owner_id: generate_id(),
-        project_id: generate_id(),
-        organization_id: context.organization_id().to_string(),
+        long_id: Uuid::new_v4(),
+        project_long_id: Uuid::new_v4(),
+        organization_long_id: Uuid::new_v4(),
         action: Action::Create,
         applications: vec![Application {
             long_id: id,
diff --git a/test_utilities/src/utilities.rs b/test_utilities/src/utilities.rs
index 91858a5f..c8d01869 100644
--- a/test_utilities/src/utilities.rs
+++ b/test_utilities/src/utilities.rs
@@ -748,7 +748,11 @@ pub fn is_pod_restarted_env(
     pod_to_check: &str,
     secrets: FuncTestsSecrets,
 ) -> (bool, String) {
-    let namespace_name = format!("{}-{}", &environment_check.project_id, &environment_check.id,);
+    let namespace_name = format!(
+        "{}-{}",
+        to_short_id(&environment_check.project_long_id),
+        to_short_id(&environment_check.long_id),
+    );
 
     let kubernetes_config = kubernetes_config_path(context, provider_kind.clone(), "/tmp", secrets.clone());
 
@@ -779,7 +783,11 @@ pub fn get_pods(
     pod_to_check: &str,
     secrets: FuncTestsSecrets,
 ) -> Result<KubernetesList<KubernetesPod>, CommandError> {
-    let namespace_name = format!("{}-{}", &environment_check.project_id, &environment_check.id,);
+    let namespace_name = format!(
+        "{}-{}",
+        to_short_id(&environment_check.project_long_id),
+        to_short_id(&environment_check.long_id),
+    );
 
     let kubernetes_config = kubernetes_config_path(context, provider_kind.clone(), "/tmp", secrets.clone());
 
@@ -847,7 +855,11 @@ pub fn get_pvc(
     environment_check: EnvironmentRequest,
     secrets: FuncTestsSecrets,
 ) -> Result<PVC, CommandError> {
-    let namespace_name = format!("{}-{}", &environment_check.project_id, &environment_check.id,);
+    let namespace_name = format!(
+        "{}-{}",
+        to_short_id(&environment_check.project_long_id),
+        to_short_id(&environment_check.long_id),
+    );
 
     let kubernetes_config = kubernetes_config_path(context, provider_kind.clone(), "/tmp", secrets.clone());
 
@@ -872,7 +884,11 @@ pub fn get_svc(
     environment_check: EnvironmentRequest,
     secrets: FuncTestsSecrets,
 ) -> Result<SVC, CommandError> {
-    let namespace_name = format!("{}-{}", &environment_check.project_id, &environment_check.id,);
+    let namespace_name = format!(
+        "{}-{}",
+        to_short_id(&environment_check.project_long_id),
+        to_short_id(&environment_check.long_id),
+    );
 
     let kubernetes_config = kubernetes_config_path(context, provider_kind.clone(), "/tmp", secrets.clone());