diff --git a/README.rst b/README.rst
index 8dce8cfd3f..948a7d98db 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,7 @@
  Using This Repository
 =======================
 
-This repository is for tracking release requests for OpenStack
+This repository is for tracking release requests for official OpenStack
 projects. The releases are managed using groups of "deliverables",
 made up of individual project repositories sharing a Launchpad group
 and a version number history. Many deliverables will only have one
@@ -16,3 +16,7 @@ The repository is managed by the `Release Management team
 
 Refer to `the reference documentation
 <https://releases.openstack.org/reference/>`_ for more details
+
+Deliverables managed by teams not under OpenStack governance should
+follow the `tagging instructions in the infra manual
+<https://docs.openstack.org/infra/manual/drivers.html#tagging-a-release>`__.
diff --git a/openstack_releases/cmds/validate.py b/openstack_releases/cmds/validate.py
index f8f0e05602..08cc275f39 100644
--- a/openstack_releases/cmds/validate.py
+++ b/openstack_releases/cmds/validate.py
@@ -470,8 +470,11 @@ def validate_bugtracker(deliv, context):
 def validate_team(deliv, context):
     "Look for the team name in the governance data."
     if deliv.team not in context.team_data:
-        context.warning('Team %r not in governance data' %
-                        deliv.team)
+        context.warning(
+            'Team {} not in governance data. '
+            'Only official teams should use this repository '
+            'for managing releases. See README.rst for details.'.format(
+                deliv.team))
     else:
         print('owned by team {}'.format(deliv.team))