diff --git a/end_to_end_tests/golden-record/pyproject.toml b/end_to_end_tests/golden-record/pyproject.toml
index 1e77df4ce..4f0fd66b9 100644
--- a/end_to_end_tests/golden-record/pyproject.toml
+++ b/end_to_end_tests/golden-record/pyproject.toml
@@ -12,7 +12,7 @@ packages = [
 include = ["CHANGELOG.md", "my_test_api_client/py.typed"]
 
 [tool.poetry.dependencies]
-python = "^3.6"
+python = "^3.7"
 httpx = ">=0.15.4,<0.22.0"
 attrs = ">=20.1.0,<22.0.0"
 python-dateutil = "^2.8.0"
@@ -23,7 +23,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.black]
 line-length = 120
-target_version = ['py36', 'py37', 'py38']
+target_version = ['py37', 'py38', 'py39']
 exclude = '''
 (
   /(
diff --git a/integration-tests/pyproject.toml b/integration-tests/pyproject.toml
index e3f321b5e..a56730ea8 100644
--- a/integration-tests/pyproject.toml
+++ b/integration-tests/pyproject.toml
@@ -10,7 +10,7 @@ packages = [
 include = ["CHANGELOG.md", "open_api_test_server_client/py.typed"]
 
 [tool.poetry.dependencies]
-python = "^3.6"
+python = "^3.7"
 httpx = ">=0.15.4,<0.22.0"
 attrs = ">=20.1.0,<22.0.0"
 python-dateutil = "^2.8.0"
@@ -24,7 +24,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.black]
 line-length = 120
-target_version = ['py36', 'py37', 'py38']
+target_version = ['py37', 'py38', 'py39']
 exclude = '''
 (
   /(
diff --git a/openapi_python_client/templates/pyproject.toml.jinja b/openapi_python_client/templates/pyproject.toml.jinja
index 0f104dccd..2fc2f0064 100644
--- a/openapi_python_client/templates/pyproject.toml.jinja
+++ b/openapi_python_client/templates/pyproject.toml.jinja
@@ -13,7 +13,7 @@ packages = [
 include = ["CHANGELOG.md", "{{ package_name }}/py.typed"]
 
 [tool.poetry.dependencies]
-python = "^3.6"
+python = "^3.7"
 httpx = ">=0.15.4,<0.22.0"
 attrs = ">=20.1.0,<22.0.0"
 python-dateutil = "^2.8.0"
@@ -25,7 +25,7 @@ build-backend = "poetry.core.masonry.api"
 {% endif %}
 [tool.black]
 line-length = 120
-target_version = ['py36', 'py37', 'py38']
+target_version = ['py37', 'py38', 'py39']
 exclude = '''
 (
   /(
diff --git a/openapi_python_client/templates/setup.py.jinja b/openapi_python_client/templates/setup.py.jinja
index 083160b5b..3a50d0cdc 100644
--- a/openapi_python_client/templates/setup.py.jinja
+++ b/openapi_python_client/templates/setup.py.jinja
@@ -12,7 +12,7 @@ setup(
     long_description=long_description,
     long_description_content_type="text/markdown",
     packages=["{{ package_name }}"],
-    python_requires=">=3.6, <4",
+    python_requires=">=3.7, <4",
     install_requires=["httpx >= 0.15.0, < 0.22.0", "attrs >= 20.1.0, < 22.0.0", "python-dateutil >= 2.8.0, < 3"],
     package_data={"{{ package_name }}": ["py.typed"]},
 )
diff --git a/pyproject.toml b/pyproject.toml
index ce5030dfb..4e8aaa097 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,7 +19,7 @@ packages = [
 include = ["CHANGELOG.md", "openapi_python_client/py.typed"]
 
 [tool.poetry.dependencies]
-python = "^3.6.2"
+python = "^3.7"
 jinja2 = "^3.0.0"
 typer = "^0.3"
 colorama = {version = "^0.4.3", markers = "sys_platform == 'win32'"}
@@ -51,7 +51,6 @@ typer-cli = "^0.0.12"
 types-PyYAML = "^6.0.3"
 types-certifi = "^2020.0.0"
 types-python-dateutil = "^2.0.0"
-types-dataclasses = { version = "^0.6.0", python = "<3.7" }
 pylint = "^2.9.6"
 
 [tool.taskipy.tasks]
@@ -83,7 +82,7 @@ docs = "typer openapi_python_client/cli.py utils docs > usage.md"
 
 [tool.black]
 line-length = 120
-target_version = ['py36', 'py37', 'py38']
+target_version = ['py37', 'py38', 'py39']
 exclude = '''
 (
   /(