diff --git a/Pipfile b/Pipfile
index 005d82e..1a5ad36 100644
--- a/Pipfile
+++ b/Pipfile
@@ -12,6 +12,8 @@ ipdb = "*"
 ipython = "*"
 pre-commit = "*"
 homeassistant = "*"
+build = "*"
+twine = "*"
 
 [requires]
 python_version = "3"
diff --git a/pyproject.toml b/pyproject.toml
index b8a0d49..8385996 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,12 +1,45 @@
+[project]
+name = "homeassistant-historical-sensor"
+version = "2.0.0rc3"
+dependencies = [
+    "importlib-metadata; python_version >= '3.11'",
+]
+authors = [
+  {name = "Luis López", email = "luis@cuarentaydos.com"},
+]
+readme = "README.md"
+description ="Historical sensors for HomeAssistant"
+license = {file = "LICENSE"}
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+]
+requires-python = ">3.11"
+
+[project.urls]
+Homepage = "https://github.com/ldotlopez/ha-historical-sensor"
+Issues = "https://github.com/ldotlopez/ha-historical-sensor/issues"
+Repository = "https://github.com/ldotlopez/ha-historical-sensor.git"
+
 [build-system]
-requires = ["setuptools>=40.8.0", "wheel"]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
 build-backend = "setuptools.build_meta"
 
+[bdist_wheel]
+universal = 1
+
 [tool.black]
-target-version = ['py39']
+target-version = ['py311']
 
 [tool.isort]
 profile = "black"
 
 [tool.mypy]
 files = ['homeassistant_historical_sensor']
+
+[tool.setuptools]
+packages = ["homeassistant_historical_sensor"]
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 59af3a9..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-[metadata]
-name = homeassistant-historical-sensor
-version = 2.0.0rc3
-author = Luis López
-author_email = luis@cuarentaydos.com
-description = Historical sensors for HomeAssistant
-long_description = file: README.md
-long_description_content_type = text/markdown
-url = https://github.com/ldotlopez/ha-historical-sensor
-project_urls =
-    Repository = https://github.com/ldotlopez/ha-historical-sensor/
-    Bug Tracker = https://github.com/ldotlopez/ha-historical-sensor/issues
-
-
-[options]
-package_dir =
-    homeassistant-historical-sensor = homeassistant_historical_sensor
-packages = find:
-python_requires = >=3.10
-
-
-[options.packages.find]
-where =