diff --git a/Cargo.lock b/Cargo.lock
index 69cf22f5..4f5832e1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,15 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "addr2line"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
-dependencies = [
- "gimli",
-]
-
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -102,9 +93,6 @@ name = "anyhow"
 version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27"
-dependencies = [
- "backtrace",
-]
 
 [[package]]
 name = "argon2"
@@ -536,21 +524,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "backtrace"
-version = "0.3.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
 [[package]]
 name = "base16ct"
 version = "0.1.1"
@@ -855,7 +828,6 @@ dependencies = [
  "aes-gcm",
  "base64",
  "hkdf",
- "hmac 0.12.1",
  "percent-encoding",
  "rand",
  "sha2 0.10.2",
@@ -1424,12 +1396,6 @@ dependencies = [
  "polyval",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
-
 [[package]]
 name = "globset"
 version = "0.4.8"
@@ -1705,7 +1671,6 @@ checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac"
 dependencies = [
  "http",
  "hyper",
- "log",
  "rustls 0.20.4",
  "rustls-native-certs 0.6.1",
  "tokio",
@@ -1906,14 +1871,14 @@ dependencies = [
  "tokio",
  "tokio-rustls 0.23.3",
  "tracing",
- "webpki-roots 0.22.2",
+ "webpki-roots 0.22.3",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.121"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f"
+checksum = "ec647867e2bf0772e28c8bcde4f0d19a9216916e890543b5a03ed8ef27b8f259"
 
 [[package]]
 name = "libm"
@@ -1992,7 +1957,6 @@ dependencies = [
  "argon2",
  "atty",
  "clap",
- "data-encoding",
  "dotenv",
  "futures 0.3.21",
  "hyper",
@@ -2010,7 +1974,6 @@ dependencies = [
  "opentelemetry-otlp",
  "opentelemetry-semantic-conventions",
  "opentelemetry-zipkin",
- "rand",
  "reqwest",
  "schemars",
  "serde_json",
@@ -2035,7 +1998,6 @@ dependencies = [
  "chrono",
  "cookie",
  "data-encoding",
- "elliptic-curve",
  "figment",
  "indoc",
  "lettre",
@@ -2148,7 +2110,6 @@ dependencies = [
  "opentelemetry",
  "opentelemetry-http",
  "opentelemetry-semantic-conventions",
- "pin-project-lite",
  "rustls 0.20.4",
  "serde",
  "serde_json",
@@ -2497,15 +2458,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "object"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.10.0"
@@ -3217,7 +3169,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots 0.22.2",
+ "webpki-roots 0.22.3",
  "winreg",
 ]
 
@@ -3300,12 +3252,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -3590,9 +3536,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12e47be9471c72889ebafb5e14d5ff930d89ae7a67bbdb5f8abb564f845a927e"
+checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -4707,9 +4653,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.22.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449"
+checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf"
 dependencies = [
  "webpki 0.22.0",
 ]
diff --git a/crates/axum-utils/Cargo.toml b/crates/axum-utils/Cargo.toml
index 76e8096a..43d083eb 100644
--- a/crates/axum-utils/Cargo.toml
+++ b/crates/axum-utils/Cargo.toml
@@ -10,7 +10,7 @@ async-trait = "0.1.53"
 axum = { version = "0.5.1", features = ["headers"] }
 bincode = "1.3.3"
 chrono = "0.4.19"
-cookie = { version = "0.16.0", features = ["signed", "private", "percent-encode"] }
+cookie = { version = "0.16.0", features = ["private", "percent-encode"] }
 data-encoding = "2.3.2"
 futures-util = "0.3.21"
 headers = "0.3.7"
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index b271df80..500a49a1 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0"
 [dependencies]
 tokio = { version = "1.17.0", features = ["full"] }
 futures = "0.3.21"
-anyhow = { version = "1.0.56", features = ["backtrace"] }
+anyhow = "1.0.56"
 clap = { version = "3.1.8", features = ["derive"] }
 dotenv = "0.15.0"
 schemars = { version = "0.8.8", features = ["url", "chrono"] }
@@ -21,8 +21,6 @@ argon2 = { version = "0.4.0", features = ["password-hash"] }
 reqwest = { version = "0.11.10", features = ["rustls-tls"], default-features = false, optional = true }
 watchman_client = "0.7.2"
 atty = "0.2.14"
-rand = "0.8.5"
-data-encoding = "2.3.2"
 
 tracing = "0.1.32"
 tracing-appender = "0.2.2"
diff --git a/crates/cli/src/commands/manage.rs b/crates/cli/src/commands/manage.rs
index 2022d256..33ed1783 100644
--- a/crates/cli/src/commands/manage.rs
+++ b/crates/cli/src/commands/manage.rs
@@ -14,7 +14,6 @@
 
 use argon2::Argon2;
 use clap::Parser;
-use data_encoding::BASE64;
 use mas_config::{DatabaseConfig, RootConfig};
 use mas_storage::{
     oauth2::client::{insert_client_from_config, lookup_client_by_client_id, truncate_clients},
@@ -117,14 +116,7 @@ impl Options {
 
                     // TODO: should be moved somewhere else
                     let encrypted_client_secret = client_secret
-                        .map(|client_secret| {
-                            let nonce: [u8; 12] = rand::random();
-                            let message = encrypter.encrypt(&nonce, client_secret.as_bytes())?;
-                            let concat = [&nonce[..], &message[..]].concat();
-                            let res = BASE64.encode(&concat);
-
-                            anyhow::Ok(res)
-                        })
+                        .map(|client_secret| encrypter.encryt_to_string(client_secret.as_bytes()))
                         .transpose()?;
 
                     insert_client_from_config(
diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml
index 9330b614..f669f0c8 100644
--- a/crates/config/Cargo.toml
+++ b/crates/config/Cargo.toml
@@ -29,7 +29,6 @@ rsa = "0.6.0-pre"
 p256 = { version = "0.10.1", features = ["ecdsa", "pem", "pkcs8"] }
 pkcs8 = { version = "0.8.0", features = ["pem"] }
 chacha20poly1305 = { version = "0.10.0-pre", features = ["std"] }
-elliptic-curve = { version = "0.11.12", features = ["pem", "pkcs8"] }
 pem-rfc7468 = "0.5.1"
 cookie = { version = "0.16.0", features = ["private", "key-expansion"] }
 data-encoding = "2.3.2"
diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml
index 77f5039a..5b927034 100644
--- a/crates/http/Cargo.toml
+++ b/crates/http/Cargo.toml
@@ -12,12 +12,11 @@ futures-util = "0.3.21"
 http = "0.2.6"
 http-body = "0.4.4"
 hyper = "0.14.18"
-hyper-rustls = { version = "0.23.0", features = ["http1", "http2"] }
+hyper-rustls = { version = "0.23.0", features = ["http1", "http2", "rustls-native-certs"], default-features = false }
 once_cell = "1.10.0"
 opentelemetry = "0.17.0"
 opentelemetry-http = "0.6.0"
 opentelemetry-semantic-conventions = "0.9.0"
-pin-project-lite = "0.2.8"
 rustls = "0.20.4"
 serde = "1.0.136"
 serde_json = "1.0.79"