diff --git a/serve/pyproject.toml b/serve/pyproject.toml
index cb56f1bbf3..4152805c5a 100644
--- a/serve/pyproject.toml
+++ b/serve/pyproject.toml
@@ -1,23 +1,26 @@
-[project]
+[tool.poetry]
 name = "mlc-serve"
-requires-python = ">=3.9"
+version = "0.1.0"
 description = "LLM Batch Inference server"
-dynamic = ["version"]
+authors = ["OctoML <cloud@octo.ai>"]
 
-dependencies = ["fastapi==0.103.1", "pydantic>=1.8.0", "prometheus-client>=0.18.0"]
+[tool.poetry.dependencies]
+python = ">=3.9"
+fastapi = ">=0.103.1"
+pydantic = ">=1.8.0"
+prometheus-client = ">=0.18.0"
 
-[project.optional-dependencies]
-test = ["pytest~=7.4.2", "httpx_sse~=0.3.1", "pytest-timeout~=2.2.0"]
+[tool.poetry.group.dev.dependencies]
+pytest = "^7.4.2"
+httpx_sse = "^0.3.1"
+pytest-timeout = "^2.2.0"
 
 [tool.setuptools]
 packages = ["mlc_serve"]
 
 [build-system]
-requires = ["setuptools>=60", "wheel", "setuptools-scm>=8.0"]
-build-backend = "setuptools.build_meta"
-
-[tool.setuptools_scm]
-root = ".."
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
 
 [tool.mypy]
-ignore_missing_imports = true
\ No newline at end of file
+ignore_missing_imports = true
diff --git a/setup.py b/setup.py
index ed25a674b3..53bb2ce507 100644
--- a/setup.py
+++ b/setup.py
@@ -22,10 +22,6 @@ def git_describe_version(original_version):
 
 __version__ = git_describe_version(None)
 
-def find_mlc_serve():
-    packages = find_packages(where="serve")
-    return [package for package in packages if package.startswith("mlc_serve")]
-
 setup(
     name="mlc_llm",
     version=__version__,
@@ -43,8 +39,8 @@ def find_mlc_serve():
     ],
     keywords="machine learning",
     zip_safe=False,
-    packages=find_packages() + find_mlc_serve(),
-    package_dir={"mlc_llm": "mlc_llm", "mlc_serve": "serve/mlc_serve"},
+    packages=find_packages(),
+    package_dir={"mlc_llm": "mlc_llm",},
     install_requires=["numpy", "torch", "transformers", "scipy", "timm"],
     entry_points={"console_scripts": ["mlc_llm_build = mlc_llm.build:main"]},
     distclass=Distribution,