diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74b688d56e..1f97b6e584 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,18 @@
 # Changelog
 
-### 35.9.0 [#1150](https://github.com/openfisca/openfisca-core/pull/1150)
+# 36.0.0.rc1 [#989](https://github.com/openfisca/openfisca-core/pull/989)
+
+#### New Features
+
+- Upgrade OpenAPI specification of the API to v3 from Swagger v2.
+- Continuously validate OpenAPI specification.
+
+#### Breaking changes
+
+- Drop support for OpenAPI specification v2 and prior.
+- Users relying on the aforesaid can use [this](https://converter.swagger.io/api/convert?url=OAS2_YAML_OR_JSON_URL) to migrate ([example](https://web.archive.org/web/20221103230822/https://converter.swagger.io/api/convert?url=https://api.demo.openfisca.org/latest/spec)). the aforesaid can use [https://converter.swagger.io/api/convert?url=OAS2_YAML_OR_JSON_URL] to migrate ([example](https://web.archive.org/web/20221103230822/https://converter.swagger.io/api/convert?url=https://api.demo.openfisca.org/latest/spec)).
+
+## 35.9.0 [#1150](https://github.com/openfisca/openfisca-core/pull/1150)
 
 #### New Features
 
diff --git a/setup.py b/setup.py
index 6ecbc9c28c..6b0d1ada26 100644
--- a/setup.py
+++ b/setup.py
@@ -41,15 +41,15 @@
     'flake8-rst-docstrings == 0.2.3',
     'mypy == 0.910',
     'openapi-spec-validator >= 0.3.0',
-    'openfisca-country-template >= 3.10.0, < 4.0.0',
-    'openfisca-extension-template >= 1.2.0rc0, < 2.0.0',
+    "openfisca-country-template @ git+https://github.com/openfisca/country-template.git@openapi-v3",
+    "openfisca-extension-template @ git+https://github.com/openfisca/extension-template.git@openapi-v3",
     'pycodestyle >= 2.8.0, < 2.9.0',
     'pylint == 2.10.2',
     ] + api_requirements
 
 setup(
     name = 'OpenFisca-Core',
-    version = '35.9.0',
+    version = '36.0.0.rc1',
     author = 'OpenFisca Team',
     author_email = 'contact@openfisca.org',
     classifiers = [