diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d71bd0d..87baf04 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,13 @@
+default_language_version:
+    python: python3.7
 repos:
--   repo: https://github.com/PyCQA/prospector
-    rev: 1.7.7 # The version of Prospector to use, if not 'master' for latest
-    hooks:
-    -   id: prospector
-        language: system
\ No newline at end of file
+    - repo: https://github.com/pre-commit/mirrors-autopep8
+      rev: 'v1.6.0'  # Use the sha / tag you want to point at
+      hooks:
+          - id: autopep8
+            language: system
+    -   repo: https://github.com/PyCQA/prospector
+        rev: 1.7.7 # The version of Prospector to use, if not 'master' for latest
+        hooks:
+        -   id: prospector
+            language: system
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..9be63ab
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,52 @@
+[tool.poetry]
+name = "psa-car-controller"
+version = "3.0.0"
+description = "This is a python program to control a psa car with connected_car v4 api."
+authors = ["Florian Bezannier <florian.bezannier@hotmail.fr>"]
+license = "GPL-3.0"
+
+[tool.poetry.dependencies]
+python = "^3.7.0"
+paho-mqtt = ">=1.5.0"
+dash = ">=2"
+dash-daq = "^0.5.0"
+plotly = ">=5"
+cryptography = ">=2.6"
+Werkzeug = ">=1.0.0"
+Flask = ">=1.0.4"
+dash-bootstrap-components = ">=1"
+ConfigUpdater = ">=3.0"
+pandas = ">=0.23"
+oauth2-client = "^1.2.1"
+requests = "^2.27.1"
+pytz = "^2021.3"
+argparse = "^1.4.0"
+geojson = "^2.5.0"
+reverse-geocode = "^1.4.1"
+androguard = "^3.3.5"
+pycryptodomex = "^3.14.1"
+pydantic = "^1.9.0"
+"ruamel.yaml" = ">=0.15.0"
+certifi = ">=14.05.14"
+six = ">=1.10"
+python-dateutil = ">=2.5.3"
+urllib3 = ">=1.15.1"
+
+[tool.poetry.dev-dependencies]
+prospector = ">=1.3.0"
+pre-commit = "^2.17.0"
+coverage = "^6.3.2"
+deepdiff = "^5.7.0"
+selenium = "^4.1.3"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+
+[tool.autopep8]
+max_line_length = 120
+in-place = true
+recursive = true
+aggressive = 3
+exclude = "__main__.py,psa-car-controller/psa/connected_car_api"
\ No newline at end of file
diff --git a/requirements-dev.txt b/requirements-dev.txt
deleted file mode 100644
index d0f5a46..0000000
--- a/requirements-dev.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-prospector>=1.3.0
-pre-commit
-coverage
-deepdiff
-selenium
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index ae46ddb..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-paho-mqtt>=1.5.0
-dash>=2
-dash_daq
-plotly>=5
-cryptography>=2.6
-Werkzeug>=1.0.0
-flask>=1.0.4
-dash_bootstrap_components>=1
-configupdater>=3.0
-pandas
-oauth2_client
-requests
-pytz
-typing
-argparse
-geojson
-reverse_geocode
-androguard
-pycryptodomex
-pydantic
-ruamel.yaml>=0.15.0
-
-#swagger req
-certifi >= 14.05.14
-six >= 1.10
-python_dateutil >= 2.5.3
-urllib3 >= 1.15.1