diff --git a/Dockerfile b/Dockerfile
index a71d601..a0d9f6e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,4 +64,4 @@ ENV KEEP_SERVER_PORT=21080
 # ENV KEEP_CLIENT_PASSWORD=""
 # ENV KEEP_CLIENT_JWT=""
 
-ENTRYPOINT ["/keep"]
+ENTRYPOINT ["/keep", "--server"]
diff --git a/src/args.rs b/src/args.rs
index e7782d5..b0bf5b2 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -229,29 +229,33 @@ pub struct OptionsArgs {
     #[arg(help("Output format (only works with --info, --status, --list)"))]
     pub output_format: Option<String>,
 
-    #[arg(long, env("KEEP_SERVER_PASSWORD"))]
+    #[arg(help_heading("Server Options"), long, env("KEEP_SERVER_PASSWORD"))]
     #[arg(help("Password for server authentication (requires --server)"))]
     pub server_password: Option<String>,
 
-    #[arg(long, env("KEEP_SERVER_PASSWORD_HASH"))]
+    #[arg(help_heading("Server Options"), long, env("KEEP_SERVER_PASSWORD_HASH"))]
     #[arg(help("Password hash for server authentication (requires --server)"))]
     pub server_password_hash: Option<String>,
 
-    #[arg(long, env("KEEP_SERVER_USERNAME"))]
+    #[arg(help_heading("Server Options"), long, env("KEEP_SERVER_USERNAME"))]
     #[arg(help(
         "Username for server Basic authentication (requires --server, defaults to 'keep')"
     ))]
     pub server_username: Option<String>,
 
-    #[arg(long, env("KEEP_SERVER_JWT_SECRET"))]
+    #[arg(help_heading("Server Options"), long, env("KEEP_SERVER_JWT_SECRET"))]
     #[arg(help("JWT secret for token-based authentication (requires --server)"))]
     pub server_jwt_secret: Option<String>,
 
-    #[arg(long, env("KEEP_SERVER_JWT_SECRET_FILE"))]
+    #[arg(
+        help_heading("Server Options"),
+        long,
+        env("KEEP_SERVER_JWT_SECRET_FILE")
+    )]
     #[arg(help("Path to file containing JWT secret (requires --server)"))]
     pub server_jwt_secret_file: Option<PathBuf>,
 
-    #[arg(long, env("KEEP_SERVER_MAX_BODY_SIZE"))]
+    #[arg(help_heading("Server Options"), long, env("KEEP_SERVER_MAX_BODY_SIZE"))]
     #[arg(help("Maximum request body size in bytes (requires --server, default: unlimited)"))]
     pub server_max_body_size: Option<u64>,