diff --git a/server/Cargo.lock b/server/Cargo.lock
index 6b0e4c2..710205f 100644
--- a/server/Cargo.lock
+++ b/server/Cargo.lock
@@ -38,17 +38,6 @@ version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
 
-[[package]]
-name = "async-trait"
-version = "0.1.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "atoi"
 version = "2.0.0"
@@ -72,13 +61,13 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "axum"
-version = "0.7.9"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
+checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5"
 dependencies = [
- "async-trait",
  "axum-core",
  "bytes",
+ "form_urlencoded",
  "futures-util",
  "http",
  "http-body",
@@ -106,13 +95,12 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.4.5"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
+checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6"
 dependencies = [
- "async-trait",
  "bytes",
- "futures-util",
+ "futures-core",
  "http",
  "http-body",
  "http-body-util",
@@ -933,9 +921,9 @@ checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 
 [[package]]
 name = "matchit"
-version = "0.7.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
 
 [[package]]
 name = "md-5"
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 6de4611..6fcb3cb 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-axum = "0.7.9"
+axum = "0.8.4"
 tokio = { version = "1.47.1", features = ["full"] }
 sqlx = { version = "0.8.6", features = ["runtime-tokio-rustls", "sqlite", "chrono", "uuid"] }
 serde = { version = "1.0", features = ["derive"] }
diff --git a/server/src/controllers/users.rs b/server/src/controllers/users.rs
index 150bf5f..d8d68e2 100644
--- a/server/src/controllers/users.rs
+++ b/server/src/controllers/users.rs
@@ -120,7 +120,7 @@ impl UsersController {
         if request.username.is_some() || request.password.is_some() {
             Self::validate_user_input(
                 &username,
-                &request.password.as_deref().unwrap_or("validpassword"),
+                request.password.as_deref().unwrap_or("validpassword"),
             )?;
         }
 
diff --git a/server/src/main.rs b/server/src/main.rs
index 24fecf1..280b0ad 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -24,12 +24,12 @@ async fn main() -> Result<()> {
         
         .route("/admin/users", get(admin::get_users))
         .route("/admin/users", post(admin::create_user_handler))
-        .route("/admin/users/:id", put(admin::update_user_handler))
-        .route("/admin/users/:id", delete(admin::delete_user_handler))
+        .route("/admin/users/{id}", put(admin::update_user_handler))
+        .route("/admin/users/{id}", delete(admin::delete_user_handler))
         
         .route("/machines/register", post(machines::register_machine))
         .route("/machines", get(machines::get_machines))
-        .route("/machines/:id", delete(machines::delete_machine))
+        .route("/machines/{id}", delete(machines::delete_machine))
         
         .layer(CorsLayer::permissive())
         
diff --git a/server/src/utils/auth.rs b/server/src/utils/auth.rs
index 70baace..9b11b25 100644
--- a/server/src/utils/auth.rs
+++ b/server/src/utils/auth.rs
@@ -1,7 +1,6 @@
 use crate::controllers::auth::AuthController;
 use crate::utils::{models::*, DbPool};
 use axum::{
-    async_trait,
     extract::FromRequestParts,
     http::{header::AUTHORIZATION, request::Parts, StatusCode},
 };
@@ -11,7 +10,6 @@ pub struct AuthUser {
     pub user: User,
 }
 
-#[async_trait]
 impl<S> FromRequestParts<S> for AuthUser
 where
     S: Send + Sync,
@@ -49,7 +47,6 @@ pub struct AdminUser {
     pub user: User,
 }
 
-#[async_trait]
 impl<S> FromRequestParts<S> for AdminUser
 where
     S: Send + Sync,