diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 39a2056..b177070 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,8 +1,7 @@
 # Main maintainers
-*                       @ewjoachim @mgu
-
+*                       @ewjoachim
 
 # Documentation
-/docs/                  @ewjoachim @mgu @corbott
-*.rst                   @ewjoachim @mgu @corbott
-*.md                    @ewjoachim @mgu @corbott
+/docs/                  @ewjoachim
+*.rst                   @ewjoachim
+*.md                    @ewjoachim
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 389b880..cc46cb5 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,11 @@
 Closes #<ticket number>
 
-<!-- Please do not remove this, even if you think you don't need it -->
-### Successful PR Checklist:
-<!-- In case of doubt, we're here to help. CONTRIBUTING.md might help too -->
+### Checklist:
+<!-- In case of doubt, we're here to help. CONTRIBUTING.rst might help too -->
 - [ ] Tests
   - [ ] (not applicable?)
 - [ ] Documentation
   - [ ] (not applicable?)
-- [ ] Had a good time contributing?
-- [ ] (Maintainers: add PR labels)
+
+<!-- We hope your contributing experience was great so far. If you would like to
+provide some feedback, please feel free to do so! -->
diff --git a/README.rst b/README.rst
index 418dc49..3a0977f 100644
--- a/README.rst
+++ b/README.rst
@@ -1,32 +1,36 @@
 Sphinx Github Changelog: Build a sphinx changelog from GitHub Releases
 ======================================================================
 
-.. image:: https://badge.fury.io/py/sphinx-github-changelog.svg
+.. image:: https://img.shields.io/pypi/v/sphinx-github-changelog?logo=pypi&logoColor=white
     :target: https://pypi.org/pypi/sphinx-github-changelog
     :alt: Deployed to PyPI
 
-.. image:: https://readthedocs.org/projects/sphinx-github-changelog/badge/?version=latest
-    :target: http://sphinx-github-changelog.readthedocs.io/en/latest/?badge=latest
-    :alt: Documentation Status
+.. image:: https://img.shields.io/pypi/pyversions/sphinx-github-changelog?logo=pypi&logoColor=white
+    :target: https://pypi.org/pypi/sphinx-github-changelog
+    :alt: Deployed to PyPI
 
-.. image:: https://travis-ci.org/peopledoc/sphinx-github-changelog.svg?branch=main
-    :target: https://travis-ci.org/peopledoc/sphinx-github-changelog
-    :alt: Continuous Integration Status
+.. image:: https://img.shields.io/github/stars/ewjoachim/sphinx-github-changelog?logo=github
+    :target: https://github.com/ewjoachim/sphinx-github-changelog/
+    :alt: GitHub Repository
 
-.. image:: https://results.pre-commit.ci/badge/github/ewjoachim/sphinx-github-changelog/main.svg
-    :target: https://results.pre-commit.ci/repo/github/274927215
-    :alt: Pre-commit Status
+.. image:: https://img.shields.io/github/workflow/status/ewjoachim/sphinx-github-changelog/CI?logo=github
+    :target: https://github.com/ewjoachim/sphinx-github-changelog/actions?workflow=CI
+    :alt: Continuous Integration
+
+.. image:: https://img.shields.io/readthedocs/sphinx-github-changelog?logo=read-the-docs&logoColor=white
+    :target: http://sphinx-github-changelog.readthedocs.io/en/latest/?badge=latest
+    :alt: Documentation
 
-.. image:: https://codecov.io/gh/peopledoc/sphinx-github-changelog/branch/main/graph/badge.svg
-    :target: https://codecov.io/gh/peopledoc/sphinx-github-changelog
-    :alt: Coverage Status
+.. image:: https://img.shields.io/codecov/c/github/ewjoachim/sphinx-github-changelog?logo=codecov&logoColor=white
+    :target: https://codecov.io/gh/ewjoachim/sphinx-github-changelog
+    :alt: Coverage
 
-.. image:: https://img.shields.io/badge/License-MIT-green.svg
-    :target: https://github.com/peopledoc/sphinx-github-changelog/blob/main/LICENSE
+.. image:: https://img.shields.io/github/license/ewjoachim/sphinx-github-changelog?logo=open-source-initiative&logoColor=white
+    :target: https://github.com/ewjoachim/sphinx-github-changelog/blob/master/LICENSE
     :alt: MIT License
 
 .. image:: https://img.shields.io/badge/Contributor%20Covenant-v1.4%20adopted-ff69b4.svg
-    :target: CODE_OF_CONDUCT.md
+    :target: https://github.com/ewjoachim/sphinx-github-changelog/blob/master/CODE_OF_CONDUCT.md
     :alt: Contributor Covenant
 
 Sphinx-github-changelog is a Sphinx_ plugin that builds a changelog section based on