diff --git a/README.rst b/README.rst
index 788035797d..68972b3cf0 100644
--- a/README.rst
+++ b/README.rst
@@ -1,14 +1,9 @@
-========================
-Team and repository tags
-========================
-
-.. image:: https://governance.openstack.org/tc/badges/tempest.svg
-
-.. Change things from this point on
-
+==============================================
 Tempest - The OpenStack Integration Test Suite
 ==============================================
 
+.. image:: https://governance.openstack.org/tc/badges/tempest.svg
+
 This is a set of integration tests to be run against a live OpenStack
 cluster. Tempest has batteries of tests for OpenStack API validation,
 scenarios, and other specific tests useful in validating an OpenStack
diff --git a/doc/source/overview.rst b/doc/source/overview.rst
index 315255d39e..ee6ea5ebae 100644
--- a/doc/source/overview.rst
+++ b/doc/source/overview.rst
@@ -9,16 +9,9 @@ cluster. Tempest has batteries of tests for OpenStack API validation,
 scenarios, and other specific tests useful in validating an OpenStack
 deployment.
 
-Team and repository tags
-------------------------
-
-.. image:: https://governance.openstack.org/tc/badges/tempest.svg
-    :target: https://governance.openstack.org/tc/reference/tags/index.html
-
-.. Change things from this point on
-
 Design Principles
 -----------------
+
 Tempest Design Principles that we strive to live by.
 
 - Tempest should be able to run against any OpenStack cloud, be it a
@@ -135,6 +128,7 @@ as it is simpler, and quicker to work with.
 
 Library
 -------
+
 Tempest exposes a library interface. This interface is a stable interface and
 should be backwards compatible (including backwards compatibility with the
 old tempest-lib package, with the exception of the import). If you plan to
@@ -148,6 +142,7 @@ For more details refer to the `library documentation
 
 Release Versioning
 ------------------
+
 `Tempest Release Notes <https://docs.openstack.org/releasenotes/tempest>`_
 shows what changes have been released on each version.