diff --git a/.copier-answers.yml b/.copier-answers.yml
index 841fc9cb0..dfc9853ab 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.3.4
+_commit: v1.3.6
 _src_path: gh:oca/oca-addons-repo-template
 ci: Travis
 dependency_installation_mode: PIP
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 16a185f1b..d4cc423cc 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -6,6 +6,12 @@ env:
 parserOptions:
   ecmaVersion: 2017
 
+overrides:
+  - files:
+      - "**/*.esm.js"
+    parserOptions:
+      sourceType: module
+
 # Globals available in Odoo that shouldn't produce errorings
 globals:
   _: readonly
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 282a1fa70..80ab1a211 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -13,5 +13,8 @@ jobs:
         with:
           # The pylint-odoo version we use here does not support python 3.10
           # https://github.com/OCA/oca-addons-repo-template/issues/80
-          python-version: "3.9"
+          # We also need to pin to an older version of python for older odoo versions
+          # where we are not using black > 21. Older black versions won't work with
+          # Python 3.9.8+, and we can't bump black without reformatting.
+          python-version: "3.9.7"
       - uses: pre-commit/action@v2.0.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 9ac71fee4..000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# OCA Guidelines
-
-Please follow the official guide from the
-[OCA Guidelines page](https://odoo-community.org/page/contributing).
-
-## Project Specific Guidelines
-
-<!-- /!\ do not modify above this line -->
-
-This project does not have specific coding guidelines.