diff --git a/pyproject.toml b/pyproject.toml
index e810b52b..92a50c00 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,7 +21,18 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
 # NOTE: The below is managed by ./tools/update-optional-dependencies.py
-dependencies = ["bentoml[grpc,io]>=1.0.22", "transformers[torch,tokenizers,accelerate]>=4.29.0", "optimum", "attrs>=23.1.0", "cattrs>=23.1.0", "orjson", "inflection", "tabulate[widechars]>=0.9.0", "httpx", "typing_extensions"]
+dependencies = [
+    "bentoml[grpc,io]>=1.0.22",
+    "transformers[torch,tokenizers,accelerate]>=4.29.0",
+    "optimum",
+    "attrs>=23.1.0",
+    "cattrs>=23.1.0",
+    "orjson",
+    "inflection",
+    "tabulate[widechars]>=0.9.0",
+    "httpx",
+    "typing_extensions",
+]
 description = 'OpenLLM: REST/gRPC API server for running any open Large-Language Model - StableLM, Llama, Alpaca, Dolly, Flan-T5, Custom'
 dynamic = ["version"]
 keywords = [
@@ -47,15 +58,24 @@ requires-python = ">=3.8"
 # NOTE: Don't modify project.optional-dependencies
 # as it is managed by ./tools/update-optional-dependencies.py
 [project.optional-dependencies]
+agents = ["transformers[agents]>=4.30", "diffusers", "soundfile"]
+all = [
+    "openllm[chatglm]",
+    "openllm[starcoder]",
+    "openllm[falcon]",
+    "openllm[mpt]",
+    "openllm[fine-tune]",
+    "openllm[openai]",
+    "openllm[flan-t5]",
+    "openllm[agents]",
+]
 chatglm = ["cpm-kernels", "sentencepiece"]
-starcoder = ["bitsandbytes"]
 falcon = ["einops", "xformers", "safetensors"]
+fine-tune = ["peft", "bitsandbytes", "datasets", "accelerate", "deepspeed", "trl"]
+flan-t5 = ["flax", "jax", "jaxlib", "tensorflow", "keras"]
 mpt = ["triton"]
 openai = ["openai", "tiktoken"]
-fine-tune = ["peft", "bitsandbytes", "datasets", "accelerate", "deepspeed", "trl"]
-agents = ["transformers[agents]>=4.30", "diffusers", "soundfile"]
-flan-t5 = ["flax", "jax", "jaxlib", "tensorflow", "keras"]
-all = ["openllm[chatglm]", "openllm[starcoder]", "openllm[falcon]", "openllm[mpt]", "openllm[openai]", "openllm[fine-tune]", "openllm[agents]", "openllm[flan-t5]"]
+starcoder = ["bitsandbytes"]
 
 [project.urls]
 Documentation = "https://github.com/bentoml/openllm#readme"