diff --git a/Makefile b/Makefile
index a902ce8c..c052f1cd 100644
--- a/Makefile
+++ b/Makefile
@@ -32,10 +32,8 @@ clean-test: # Clean test output
 .PHONY: .remove-old-cache
 
 pre-commit .cache/make/long-pre-commit: .pre-commit-config.yaml .pre-commit-hooks.yaml # Update and install pre-commit hooks
-	@# Uncomment the lines below to autoupdate all repos except a few filtered out with egrep
-#	yq -r '.repos[].repo' .pre-commit-config.yaml | egrep -v -e '^local' -e mirrors-isort | \
-#		sed -E -e 's/http/--repo http/g' | xargs pre-commit autoupdate
-	pre-commit autoupdate
+	@# Uncomment the line below to autoupdate all repos except a few filtered out with egrep
+	yq -r '.repos[].repo' .pre-commit-config.yaml | egrep -v -e '^local' -e commitlint | sed -E -e 's/http/--repo http/g' | xargs pre-commit autoupdate
 	pre-commit install --install-hooks
 	pre-commit install --hook-type commit-msg
 	pre-commit gc
diff --git a/docs/defaults.rst b/docs/defaults.rst
index 40e522ec..0d6c8e4d 100644
--- a/docs/defaults.rst
+++ b/docs/defaults.rst
@@ -316,41 +316,17 @@ Content of `styles/pylint.toml <https://raw.githubusercontent.com/andreoliwa/nit
     ["pyproject.toml".tool.poetry.dev-dependencies]
     pylint = "*"
 
-.. _default-python-3-5-3-6-3-7-to-3-8:
+.. _default-python-3-5:
 
-Python 3.5, 3.6, 3.7 to 3.8
----------------------------
-
-Content of `styles/python35-36-37-38.toml <https://raw.githubusercontent.com/andreoliwa/nitpick/develop/styles/python35-36-37-38.toml>`_:
-
-.. code-block:: toml
-
-    ["pyproject.toml".tool.poetry.dependencies]
-    python = "^3.5 || ^3.6 || ^3.7 || ^3.8"
-
-.. _default-python-3-5-3-6-or-3-7:
-
-Python 3.5, 3.6 or 3.7
-----------------------
-
-Content of `styles/python35-36-37.toml <https://raw.githubusercontent.com/andreoliwa/nitpick/develop/styles/python35-36-37.toml>`_:
-
-.. code-block:: toml
-
-    ["pyproject.toml".tool.poetry.dependencies]
-    python = "^3.5 || ^3.6 || ^3.7"
-
-.. _default-python-3-6-or-3-7:
-
-Python 3.6 or 3.7
------------------
+Python 3.5
+----------
 
-Content of `styles/python36-37.toml <https://raw.githubusercontent.com/andreoliwa/nitpick/develop/styles/python36-37.toml>`_:
+Content of `styles/python35.toml <https://raw.githubusercontent.com/andreoliwa/nitpick/develop/styles/python35.toml>`_:
 
 .. code-block:: toml
 
     ["pyproject.toml".tool.poetry.dependencies]
-    python = "^3.6 || ^3.7"
+    python = "^3.5"
 
 .. _default-python-3-6:
 
@@ -375,3 +351,15 @@ Content of `styles/python37.toml <https://raw.githubusercontent.com/andreoliwa/n
 
     ["pyproject.toml".tool.poetry.dependencies]
     python = "^3.7"
+
+.. _default-python-3-8:
+
+Python 3.8
+----------
+
+Content of `styles/python38.toml <https://raw.githubusercontent.com/andreoliwa/nitpick/develop/styles/python38.toml>`_:
+
+.. code-block:: toml
+
+    ["pyproject.toml".tool.poetry.dependencies]
+    python = "^3.8"
diff --git a/docs/generate_rst.py b/docs/generate_rst.py
index 1c69ade1..d27f3b5e 100644
--- a/docs/generate_rst.py
+++ b/docs/generate_rst.py
@@ -35,11 +35,10 @@
         "pre-commit/python.toml": "pre-commit_ (Python hooks)",
         "pylint.toml": "Pylint_",
         "pytest.toml": "pytest_",
-        "python35-36-37.toml": "Python 3.5, 3.6 or 3.7",
-        "python35-36-37-38.toml": "Python 3.5, 3.6, 3.7 to 3.8",
-        "python36-37.toml": "Python 3.6 or 3.7",
+        "python35.toml": "Python 3.5",
         "python36.toml": "Python 3.6",
         "python37.toml": "Python 3.7",
+        "python38.toml": "Python 3.8",
     }
 )
 app = NitpickApp.create_app()
diff --git a/poetry.lock b/poetry.lock
index b71a9ae9..9f473e21 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -884,8 +884,8 @@ test = ["pytest", "testfixtures", "responses"]
 
 [metadata]
 lock-version = "1.1"
-python-versions = "^3.5 || ^3.6 || ^3.7 || ^3.8"
-content-hash = "b3cbeda6a65d74cf1b72ce1c96195b834f279619d2e71d2aef95824d06382898"
+python-versions = "^3.5"
+content-hash = "f192527f63c5d5dcec05d42ce673f65992d9f4642e1734d675e52b6c582d533e"
 
 [metadata.files]
 alabaster = [
diff --git a/pyproject.toml b/pyproject.toml
index 63ef12e5..ad2c57e1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.nitpick]
 # Use the default style and override some things (like the Python version)
-style = ["nitpick-style", "styles/python35-36-37-38"]
+style = ["nitpick-style", "styles/python35"]
 
 [tool.black]
 line-length = 120
@@ -35,7 +35,7 @@ setup_cfg = "nitpick.plugins.setup_cfg"
 pyproject_toml = "nitpick.plugins.pyproject_toml"
 
 [tool.poetry.dependencies]
-python = "^3.5 || ^3.6 || ^3.7 || ^3.8"
+python = "^3.5"
 flake8 = ">=3.0.0"
 attrs = "*"
 toml = "*"
diff --git a/styles/python35-36-37-38.toml b/styles/python35-36-37-38.toml
deleted file mode 100644
index 12447b98..00000000
--- a/styles/python35-36-37-38.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-["pyproject.toml".tool.poetry.dependencies]
-python = "^3.5 || ^3.6 || ^3.7 || ^3.8"
diff --git a/styles/python36-37.toml b/styles/python35.toml
similarity index 64%
rename from styles/python36-37.toml
rename to styles/python35.toml
index 6e19273b..217fd8d6 100644
--- a/styles/python36-37.toml
+++ b/styles/python35.toml
@@ -1,2 +1,2 @@
 ["pyproject.toml".tool.poetry.dependencies]
-python = "^3.6 || ^3.7"
+python = "^3.5"
diff --git a/styles/python35-36-37.toml b/styles/python38.toml
similarity index 57%
rename from styles/python35-36-37.toml
rename to styles/python38.toml
index 30f0ed82..b4ae4948 100644
--- a/styles/python35-36-37.toml
+++ b/styles/python38.toml
@@ -1,2 +1,2 @@
 ["pyproject.toml".tool.poetry.dependencies]
-python = "^3.5 || ^3.6 || ^3.7"
+python = "^3.8"