diff --git a/base_comment_template/__manifest__.py b/base_comment_template/__manifest__.py
index d5845e543..664551722 100644
--- a/base_comment_template/__manifest__.py
+++ b/base_comment_template/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Base Comments Templates",
     "summary": "Add conditional mako template to any report "
     "on models that inherits comment.template.",
-    "version": "13.0.2.0.0",
+    "version": "13.0.3.0.0",
     "category": "Reporting",
     "website": "https://github.com/OCA/reporting-engine",
     "author": "Camptocamp, Odoo Community Association (OCA)",
diff --git a/base_comment_template/migrations/13.0.1.0.0/post-migration.py b/base_comment_template/migrations/13.0.1.0.0/post-migration.py
index e1dce39d6..72123749b 100644
--- a/base_comment_template/migrations/13.0.1.0.0/post-migration.py
+++ b/base_comment_template/migrations/13.0.1.0.0/post-migration.py
@@ -16,6 +16,9 @@ def migrate(env, version):
         SPLIT_PART(ip.value_reference, ',', 2)::int AS base_comment_template_id
         FROM ir_property ip
         JOIN ir_model_fields imf ON ip.fields_id = imf.id
+        JOIN res_partner rp ON rp.id = SPLIT_PART(ip.res_id, ',', 2)::int
+        JOIN base_comment_template bct
+            ON bct.id = SPLIT_PART(ip.value_reference, ',', 2)::int
         WHERE imf.name = 'property_comment_template_id'
         AND imf.model = 'res.partner'
         AND ip.res_id IS NOT NULL
diff --git a/base_comment_template/migrations/13.0.3.0.0/pre-migration.py b/base_comment_template/migrations/13.0.3.0.0/pre-migration.py
new file mode 100644
index 000000000..2ed210690
--- /dev/null
+++ b/base_comment_template/migrations/13.0.3.0.0/pre-migration.py
@@ -0,0 +1,21 @@
+# Copyright 2021 Tecnativa - Pedro M: Baeza
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from openupgradelib import openupgrade  # pylint: disable=W7936
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    if openupgrade.table_exists(env.cr, "base_comment_template_res_partner_rel"):
+        # Swap column names, as they were incorrect
+        env.cr.execute(
+            "ALTER TABLE base_comment_template_res_partner_rel "
+            "RENAME base_comment_template_id TO temp"
+        )
+        env.cr.execute(
+            "ALTER TABLE base_comment_template_res_partner_rel "
+            "RENAME res_partner_id TO base_comment_template_id"
+        )
+        env.cr.execute(
+            "ALTER TABLE base_comment_template_res_partner_rel "
+            "RENAME temp TO res_partner_id"
+        )
diff --git a/base_comment_template/models/base_comment_template.py b/base_comment_template/models/base_comment_template.py
index 92d86807a..1d6905af0 100644
--- a/base_comment_template/models/base_comment_template.py
+++ b/base_comment_template/models/base_comment_template.py
@@ -45,8 +45,8 @@ class BaseCommentTemplate(models.Model):
     partner_ids = fields.Many2many(
         comodel_name="res.partner",
         relation="base_comment_template_res_partner_rel",
-        column1="res_partner_id",
-        column2="base_comment_template_id",
+        column1="base_comment_template_id",
+        column2="res_partner_id",
         string="Partner",
         readonly=True,
         help="If set, the comment template will be available only for the selected "
diff --git a/base_comment_template/models/res_partner.py b/base_comment_template/models/res_partner.py
index 9d9b1c606..cc06cbdc4 100644
--- a/base_comment_template/models/res_partner.py
+++ b/base_comment_template/models/res_partner.py
@@ -11,8 +11,8 @@ class ResPartner(models.Model):
     base_comment_template_ids = fields.Many2many(
         comodel_name="base.comment.template",
         relation="base_comment_template_res_partner_rel",
-        column1="base_comment_template_id",
-        column2="res_partner_id",
+        column1="res_partner_id",
+        column2="base_comment_template_id",
         string="Comment Templates",
         help="Specific partner comments that can be included in reports",
     )