diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst
index a26b8781..fa774edb 100644
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@@ -11,3 +11,5 @@ TripleO Contributor Guide
   check_gates
   dlrn-promoter-overview
   stages-overview
+
+.. include:: ./squads.rst
diff --git a/doc/source/contributor/squads.rst b/doc/source/contributor/squads.rst
new file mode 100644
index 00000000..ab76dcad
--- /dev/null
+++ b/doc/source/contributor/squads.rst
@@ -0,0 +1,48 @@
+Squads
+------
+
+Work in TripleO is divided in Squads. For more information the `project policy
+<https://specs.openstack.org/openstack/tripleo-specs/specs/policy/squads.html>`_.
+
+The list tends to be dynamic over the cycles, depending on which topics
+the team is working on. The list below is subject to change as squads change.
+
++-------------------------------+----------------------------------------------------------------------------+
+| Squad                         | Description                                                                |
++===============================+============================================================================+
+| CI                            | Group of people focusing on Continuous Integration tooling and system      |
+|                               | https://etherpad.openstack.org/p/tripleo-ci-squad-meeting                  |
++-------------------------------+----------------------------------------------------------------------------+
+| UI/CLI                        | Group of people focusing on TripleO UI and CLI                             |
+|                               | https://etherpad.openstack.org/p/tripleo-ui-cli-squad-status               |
++-------------------------------+----------------------------------------------------------------------------+
+| Upgrade                       | Group of people focusing on TripleO upgrades                               |
+|                               | https://etherpad.openstack.org/p/tripleo-upgrade-squad-status              |
++-------------------------------+----------------------------------------------------------------------------+
+| Validations                   | Group of people focusing on TripleO validations tooling                    |
+|                               | https://etherpad.openstack.org/p/tripleo-validations-squad-status          |
++-------------------------------+----------------------------------------------------------------------------+
+| Workflows                     | Group of people focusing on TripleO Workflows                              |
+|                               | https://etherpad.openstack.org/p/tripleo-workflows-squad-status            |
++-------------------------------+----------------------------------------------------------------------------+
+| Containers                    | Group of people focusing on TripleO deployed in containers                 |
+|                               | https://etherpad.openstack.org/p/tripleo-containers-squad-status           |
++-------------------------------+----------------------------------------------------------------------------+
+| Networking                    | Group of people focusing on networking bits in TripleO                     |
+|                               | https://etherpad.openstack.org/p/tripleo-networking-squad-status           |
++-------------------------------+----------------------------------------------------------------------------+
+| Integration                   | Group of people focusing on configuration management (eg: services)        |
+|                               | https://etherpad.openstack.org/p/tripleo-integration-squad-status          |
++-------------------------------+----------------------------------------------------------------------------+
+| Security                      | Group of people focusing on security                                       |
+|                               | https://etherpad.openstack.org/p/tripleo-security-squad                    |
++-------------------------------+----------------------------------------------------------------------------+
+| Edge                          | Group of people focusing on Edge/multi-site/multi-cloud                    |
+|                               | https://etherpad.openstack.org/p/tripleo-edge-squad-status                 |
++-------------------------------+----------------------------------------------------------------------------+
+
+.. note::
+
+  Note about CI: the squad is about working together on the tooling used
+  by OpenStack Infra to test TripleO, though every squad has in charge of
+  maintaining the good shape of their tests.