diff --git a/README.md b/README.md
index 772120785..38299f5d1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Foreman Infrastructure
 
-This repo contains puppet modules that are used to manage infrastructure used by the Foreman project. These modules manage many different pieces of software, including Jenkins build slaves, package build machines, the Jenkins frontend, as well as an internal Foreman instance and puppetmaster.
+This repo contains puppet modules that are used to manage infrastructure used by the Foreman project. These modules manage many different pieces of software, including Jenkins build slaves, package build machines, the Jenkins frontend, as well as an internal Foreman instance and puppetserver.
 
 View the [documentation](https://theforeman.github.io/foreman-infra).
 
diff --git a/docs/jenkins.md b/docs/jenkins.md
index de02a71b7..78c6668ae 100644
--- a/docs/jenkins.md
+++ b/docs/jenkins.md
@@ -59,11 +59,11 @@ For Enterprise Linux:
 * Ensure EPEL is configured: [epel-release](https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm)
 * Ensure yum.puppet.com is configured: [puppet7-release](https://yum.puppet.com/puppet7-release-el-7.noarch.rpm)
 * `yum -y install puppet-agent`
-* `echo "server = puppetmaster.theforeman.org" >> /etc/puppetlabs/puppet/puppet.conf`
-* ensure hostname is set node0X.jenkins.<provider\>.theforeman.org where <provider> is osuosl or aws for example and that the record is in DNS
+* `echo "server = puppet.theforeman.org" >> /etc/puppetlabs/puppet/puppet.conf`
+* ensure hostname is set node0X.jenkins.<provider\>.theforeman.org where <provider\> is osuosl or aws for example and that the record is in DNS
 * Make the `puppet` command available: `source /etc/profile.d/puppet-agent.sh`
 * `puppet ssl bootstrap`
-* Sign the certificate on the puppetmaster or via Foreman
+* Sign the certificate on the puppetserver or via Foreman
 * `puppet agent --test`
 * Set the host group to "Builders" in Foreman
 * Run `puppet agent --test` twice (second run is important, due to the rvm module behaviour)
@@ -73,11 +73,11 @@ For Debian:
 
 * Ensure apt.puppet.com is configured: [puppet7-release](https://apt.puppetlabs.com/puppet7-release-bullseye.deb)
 * `apt update && apt install puppet-agent`
-* `echo "server = puppetmaster.theforeman.org" >> /etc/puppetlabs/puppet/puppet.conf`
+* `echo "server = puppet.theforeman.org" >> /etc/puppetlabs/puppet/puppet.conf`
 * Make the `puppet` command available: `source /etc/profile.d/puppet-agent.sh`
-* ensure hostname is set node0X.jenkins.<provider\>.theforeman.org where <provider> is osuosl or aws for example and that the record is in DNS
+* ensure hostname is set node0X.jenkins.<provider\>.theforeman.org where <provider\> is osuosl or aws for example and that the record is in DNS
 * `puppet ssl bootstrap`
-* Sign the certificate on the puppetmaster or via Foreman
+* Sign the certificate on the puppetserver or via Foreman
 * `puppet agent --test`
 * Set the host group to "Builders/Debian" in Foreman
 * Run `puppet agent --test` twice (second run is important, due to the rvm module behaviour)
diff --git a/docs/puppet.md b/docs/puppet.md
index 16220e2ac..494832627 100644
--- a/docs/puppet.md
+++ b/docs/puppet.md
@@ -1,5 +1,8 @@
 # Puppetserver
 
+The puppetserver is hosted on `puppet.theforeman.org`, which is a CNAME to the actual server.
+On the actual server a subjectAltName is configured so both the hostname and service name should work.
+
 | | puppet01.conova.theforeman.org |
 | - | - |
 | type | Libvirt VM |
diff --git a/docs/virt.md b/docs/virt.md
index 9a4c5a47d..7767c4ff8 100644
--- a/docs/virt.md
+++ b/docs/virt.md
@@ -41,7 +41,7 @@ Now bootstrap Puppet:
 dnf install https://yum.puppet.com/puppet7-release-el-8.noarch.rpm
 dnf install puppet-agent
 . /etc/profile.d/puppet-agent.sh
-puppet config set server puppetmaster.theforeman.org
+puppet config set server puppet.theforeman.org
 puppet ssl bootstrap
 puppet agent -t
 ```