diff --git a/AUTHORS b/AUTHORS
index 195bd3a3..18704f0b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,6 +15,7 @@ Eric Zounes <eric.zounes@puppetlabs.com>
 Florian Baumann <flo@noqqe.de>
 Jan Collijs <jan.collijs@inuits.eu>
 Johan Fleury <jfleury@arcaik.net>
+Johannes Carraro <johannes.carraro@netways.de>
 Jonas Verhofsté <jonas@verhofste.tech>
 Josh Beard <josh@signalboxes.net>
 Joshua Hoblitt <josh@hoblitt.com>
diff --git a/README.md b/README.md
index a4cb94a4..8c43b173 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/Icinga/puppet-icingaweb2.png?branch=master)](https://travis-ci.org/Icinga/puppet-icingaweb2)
+[![Build Status](https://travis-ci.org/Icinga/puppet-icingaweb2.png?branch=main)](https://travis-ci.org/Icinga/puppet-icingaweb2)
 
 # Icinga Web 2 Puppet Module
 
@@ -202,7 +202,7 @@ class {'icingaweb2::module::monitoring':
 
 ## Reference
 
-See [REFERENCE.md](https://github.com/Icinga/puppet-icingaweb2/blob/master/REFERENCE.md)
+See [REFERENCE.md](https://github.com/Icinga/puppet-icingaweb2/blob/main/REFERENCE.md)
 
 ## Development
 
diff --git a/RELEASE.md b/RELEASE.md
index 77f64591..fc51a306 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,6 +1,6 @@
 # Release Workflow
 Before submitting a new release, make sure all relevant pull requests and local branches have been merged to the
-`master` branch. All tests must pass before a release is tagged.
+`main` branch. All tests must pass before a release is tagged.
 
 
 ## 1. Puppet Development Kit
@@ -17,7 +17,7 @@ pdk bundle update
 Update the [AUTHORS] and [.mailmap] file
 
 ``` bash
-git checkout master
+git checkout main
 git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS
 git commit -am "Update AUTHORS"
 ```
@@ -48,7 +48,7 @@ Version numbers are incremented regarding the [SemVer 1.0.0] specification.
 Update the version number in `metadata.json`.
 
 ## 6. Git Tag
-Commit all changes to the `master` branch
+Commit all changes to the `main` branch
 
 ``` bash
 git commit -v -a -m "Release version <VERSION>"