diff --git a/README.md b/README.md
index 7984e9a7..3633cfee 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # We are Nmstate!
 A declarative network manager API for hosts.
 
-[![Test Status](https://travis-ci.com/nmstate/nmstate.png?branch=master)](https://travis-ci.com/nmstate/nmstate)
-[![Coverage Status](https://coveralls.io/repos/github/nmstate/nmstate/badge.svg?branch=master)](https://coveralls.io/github/nmstate/nmstate?branch=master)
+[![Test Status](https://travis-ci.com/nmstate/nmstate.png?branch=base)](https://travis-ci.com/nmstate/nmstate)
+[![Coverage Status](https://coveralls.io/repos/github/nmstate/nmstate/badge.svg?branch=base)](https://coveralls.io/github/nmstate/nmstate?branch=base)
 [![PyPI version](https://badge.fury.io/py/nmstate.svg)](https://badge.fury.io/py/nmstate)
 [![Fedora Rawhide version](https://img.shields.io/badge/dynamic/json.svg?label=Fedora%20Rawhide&url=https%3A%2F%2Fapps.fedoraproject.org%2Fmdapi%2Frawhide%2Fpkg%2Fnmstate&query=%24.version&colorB=blue)](https://apps.fedoraproject.org/packages/nmstate)
 [![Code Style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/python/black)
@@ -11,7 +11,7 @@ A declarative network manager API for hosts.
 Copr build status, all repos are built for Fedora 31+ and RHEL/CentOS/EPEL 8:
 
 * Latest release: [![Latest release Copr build status](https://copr.fedorainfracloud.org/coprs/nmstate/nmstate/package/nmstate/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/nmstate/nmstate/package/nmstate/)
-* Git master: [![Git master Copr build status](https://copr.fedorainfracloud.org/coprs/nmstate/nmstate-git/package/nmstate/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/nmstate/nmstate-git/package/nmstate/)
+* Git base: [![Git base Copr build status](https://copr.fedorainfracloud.org/coprs/nmstate/nmstate-git/package/nmstate/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/nmstate/nmstate-git/package/nmstate/)
 * Latest 0.2 release: [![Latest 0.2 release Copr build status](https://copr.fedorainfracloud.org/coprs/nmstate/nmstate-0.2/package/nmstate/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/nmstate/nmstate-0.2/package/nmstate/)
 * Git nmstate-0.2: [![Git nmstate-0.2 Copr build status](https://copr.fedorainfracloud.org/coprs/nmstate/nmstate-0.2-git/package/nmstate/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/nmstate/nmstate-0.2-git/package/nmstate/)
 * Latest 0.3 release: [![Latest 0.3 release Copr build status](https://copr.fedorainfracloud.org/coprs/nmstate/nmstate-0.3/package/nmstate/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/nmstate/nmstate-0.3/package/nmstate/)
diff --git a/automation/README.md b/automation/README.md
index 03e93dd0..2c6dc746 100644
--- a/automation/README.md
+++ b/automation/README.md
@@ -92,7 +92,7 @@ podman tag local/fedora-nmstate-dev docker.io/nmstate/fedora-nmstate-dev:latest
 ```
 
 ### Push local image to the docker hub
-The container images are automatically rebuilt for new commits to the master
+The container images are automatically rebuilt for new commits to the base
 branch or new tags. Therefore updates to the Docker Hub images should always
 happen with a pull request that is merged to ensure that the change is
 persistent. If this is not feasible, a new build could be pushed as follow to
@@ -109,4 +109,4 @@ podman push nmstate/fedora-nmstate-dev:latest \
     docker://docker.io/nmstate/fedora-nmstate-dev:latest
 ```
 
-It will be overwritten after the next commit to master, though.
+It will be overwritten after the next commit to base, though.
diff --git a/automation/tests-container-utils.sh b/automation/tests-container-utils.sh
index 0bfa0bef..a593cf67 100644
--- a/automation/tests-container-utils.sh
+++ b/automation/tests-container-utils.sh
@@ -28,7 +28,7 @@ function is_file_changed {
     if [ -n "$TRAVIS_BRANCH" ]; then
         git diff --exit-code --name-only upstream/$TRAVIS_BRANCH -- $1
     else
-        git diff -exit-code --name-only upstream/master -- $1
+        git diff -exit-code --name-only upstream/base -- $1
     fi
 
     if [ $? -eq 0 ];then
diff --git a/packaging/README-dockerhub.md b/packaging/README-dockerhub.md
index b4b7f614..b0d6b64f 100644
--- a/packaging/README-dockerhub.md
+++ b/packaging/README-dockerhub.md
@@ -1,6 +1,6 @@
 ## Docker Hub
 
-The images are automatically rebuilt on new GIT tags or pushes to the master branch:
+The images are automatically rebuilt on new GIT tags or pushes to the base branch:
 
 `Dockerfile.fedora-nmstate-dev` by https://cloud.docker.com/u/nmstate/repository/docker/nmstate/fedora-nmstate-dev
 
@@ -15,7 +15,7 @@ Autotest: Off
 Repository Links: Off
 Build rules:
 Branch:
-Source:master
+Source:base
 Docker Tag:latest
 Dockerfile location:Dockerfile.fedora-nmstate-dev
 Build Context:/packaging
@@ -32,7 +32,7 @@ Build Caching:off
 
 ## Manual Building
 
-The Nmstate user image builds the master master branch by default. To specify a
+The Nmstate user image builds the base branch by default. To specify a
 different commit or tag, specify the `SOURCE_COMMIT` build argument:
 
 ```shell