diff --git a/templates/adding_a_new_model/cookiecutter-template-{{cookiecutter.modelname}}/to_replace_{{cookiecutter.lowercase_modelname}}.py b/templates/adding_a_new_model/cookiecutter-template-{{cookiecutter.modelname}}/to_replace_{{cookiecutter.lowercase_modelname}}.py
index 1ff23d30..cee8b983 100644
--- a/templates/adding_a_new_model/cookiecutter-template-{{cookiecutter.modelname}}/to_replace_{{cookiecutter.lowercase_modelname}}.py
+++ b/templates/adding_a_new_model/cookiecutter-template-{{cookiecutter.modelname}}/to_replace_{{cookiecutter.lowercase_modelname}}.py
@@ -299,3 +299,23 @@ from ..{{cookiecutter.lowercase_modelname}}.modeling_tf_{{cookiecutter.lowercase
         ({{cookiecutter.camelcase_modelname}}Config, TF{{cookiecutter.camelcase_modelname}}ForConditionalGeneration),
 {% endif -%}
 # End.
+
+# To replace in: "utils/check_repo.py" if generating PyTorch
+
+# Below: "models to ignore for model xxx mapping"
+# Replace with:
+{% if cookiecutter.is_encoder_decoder_model == "False" -%}
+{% else -%}
+    "{{cookiecutter.camelcase_modelname}}Encoder",
+    "{{cookiecutter.camelcase_modelname}}Decoder",
+{% endif -%}
+# End.
+
+# Below: "models to ignore for not tested"
+# Replace with:
+{% if cookiecutter.is_encoder_decoder_model == "False" -%}
+{% else -%}
+    "{{cookiecutter.camelcase_modelname}}Encoder",  # Building part of bigger (tested) model.
+    "{{cookiecutter.camelcase_modelname}}Decoder",  # Building part of bigger (tested) model.
+{% endif -%}
+# End.
diff --git a/utils/check_repo.py b/utils/check_repo.py
index 17f2a0d8..5fd890a3 100644
--- a/utils/check_repo.py
+++ b/utils/check_repo.py
@@ -29,6 +29,7 @@ PATH_TO_DOC = "docs/source"
 # Update this list for models that are not tested with a comment explaining the reason it should not be.
 # Being in this list is an exception and should **not** be the rule.
 IGNORE_NON_TESTED = [
+    # models to ignore for not tested
     "BartDecoder",  # Building part of bigger (tested) model.
     "BartEncoder",  # Building part of bigger (tested) model.
     "BertLMHeadModel",  # Needs to be setup as decoder.
@@ -62,6 +63,7 @@ TEST_FILES_WITH_NO_COMMON_TESTS = [
 # Update this list for models that are not in any of the auto MODEL_XXX_MAPPING. Being in this list is an exception and
 # should **not** be the rule.
 IGNORE_NON_AUTO_CONFIGURED = [
+    # models to ignore for model xxx mapping
     "BartDecoder",
     "BartEncoder",
     "DPRContextEncoder",