diff --git a/docs/admin/installation/hardware.rst b/docs/admin/installation/hardware.rst
index f81f3f8e6..7cc01942b 100644
--- a/docs/admin/installation/hardware.rst
+++ b/docs/admin/installation/hardware.rst
@@ -25,7 +25,7 @@ For an installation of SecureDrop, you must acquire:
   are using a desktop for the *Secure Viewing Station*).
 * A dedicated network firewall with at least 4 NICs.
 * At least 3 ethernet cables.
-* Plenty of USB sticks: 1 drive for the master Tails stick, 1 drive for each
+* Plenty of USB sticks: 1 drive for the Template Tails stick, 1 drive for each
   Secure Viewing Station, 1 drive for each *Transfer Device*, 1 drive for each
   *Export Device*, and 1 drive for each admin and journalist.
 
diff --git a/docs/admin/installation/passphrases.rst b/docs/admin/installation/passphrases.rst
index 0129a806c..12874ce41 100644
--- a/docs/admin/installation/passphrases.rst
+++ b/docs/admin/installation/passphrases.rst
@@ -58,8 +58,8 @@ The journalist will be using the *Journalist Workstation* with Tails to
 connect to the *Journalist Interface*. The tasks performed by the journalist
 will require the following set of passphrases:
 
--  A master passphrase for the persistent volume on the Tails device.
--  A master passphrase for the KeePassXC password manager, which unlocks
+-  A passphrase for the persistent volume on the Tails device.
+-  A passphrase for the KeePassXC password manager, which unlocks
    the passphrase for logging into the *Journalist Interface*.
 
 The journalist will also need to have a two-factor authenticator, such
@@ -77,7 +77,7 @@ The journalist will be using the *Secure Viewing Station* with Tails to
 decrypt and view submitted documents. The tasks performed by the
 journalist will require the following passphrases:
 
--  A master passphrase for the persistent volume on the Tails device.
+-  A passphrase for the persistent volume on the Tails device.
 
 The backup that is created during the installation of SecureDrop is also
 encrypted with the application's GPG key. The backup is stored on the
diff --git a/docs/admin/installation/set_up_admin_tails.rst b/docs/admin/installation/set_up_admin_tails.rst
index 8d115146d..e189a89af 100644
--- a/docs/admin/installation/set_up_admin_tails.rst
+++ b/docs/admin/installation/set_up_admin_tails.rst
@@ -220,7 +220,7 @@ After configuring the password database, restart KeePassXC once to verify
 that you are able to access it as expected.
 
 .. warning:: You will not be able to access your passwords if you
-         forget the master password or the location of the key
+         forget the peristent storage password or the location of the key
          file used to protect the database.
 
 In case you wish to manually create a database, the suggested password fields in
diff --git a/docs/admin/maintenance/decommission.rst b/docs/admin/maintenance/decommission.rst
index 80a6c7392..4f13c98a8 100644
--- a/docs/admin/maintenance/decommission.rst
+++ b/docs/admin/maintenance/decommission.rst
@@ -69,7 +69,7 @@ SecureDrop instance.
    storage called the **LUKS header**) should be sufficient to make any existing
    data on those drives unrecoverable.
 
-   For example, you could use your *primary Tails USB* to launch Gnome Disks,
+   For example, you could use your *Template Tails USB* to launch Gnome Disks,
    insert and identify the USB drive you are trying to erase, and reformat this
    drive with a new, LUKS-encrypted partition, erasing the existing partition
    data.
diff --git a/docs/admin/maintenance/rebuild_admin.rst b/docs/admin/maintenance/rebuild_admin.rst
index 2dad02ef3..fa8fab419 100644
--- a/docs/admin/maintenance/rebuild_admin.rst
+++ b/docs/admin/maintenance/rebuild_admin.rst
@@ -7,7 +7,7 @@ backup exists, it is possible to rebuild one. In order to do so, you'll need
  - physical access to the SecureDrop servers
  - 2 USB sticks:
 
-   - Tails Master USB
+   - Tails Template USB
    - 1 replacement *Admin Workstation* USB (USB3 and 16GB or better recommended)
 
 The process requires experience with the Linux command line and Tails, and