@@ -27,34 +27,45 @@ package repositories.
 
 ## Repository Configuration
 
-The Terraform packages are signed using a private key controlled by HashiCorp,
-so in most situations the first step would be to configure your system to trust
-that HashiCorp key for package authentication. For example:
+The Terraform packages are signed using a private key controlled by HashiCorp, so you must configure your system to trust that HashiCorp key for package authentication.
 
-```bash
-wget -qO - terraform.gpg https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/terraform-archive-keyring.gpg
-```
+To configure your repository:
 
-After registering the key, you can add the official HashiCorp repository to
-your system:
+1. Download the signing key to a new keyring.
 
-```bash
-echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/terraform-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/terraform.list
-```
+   ```bash
+   $ wget -O- https://apt.releases.hashicorp.com/gpg | \
+       gpg --dearmor | \
+       sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg
 
-The above command line uses the following sub-shell commands:
+1. Verify the key's fingerprint.
 
-* `dpkg --print-architecture` to determine your system's primary APT
-  architecture/ABI, such as `amd64`.
-* `lsb_release -cs` to find the distribution release codename for your current
-  system, such as `buster`, `groovy`, or `sid`.
+   ```bash
+   $ gpg --no-default-keyring \
+       --keyring /usr/share/keyrings/hashicorp-archive-keyring.gpg \
+       --fingerprint
+   ```
+   The fingerprint must match `E8A0 32E0 94D8 EB4E A189 D270 DA41 8C88 A321 9F7B`. You can also verify the key on [Security at HashiCorp](https://www.hashicorp.com/security) under **Linux Package Checksum Verification**.
 
-To install Terraform from the new repository:
+1. Add the official HashiCorp repository to your system. The `lsb_release -cs` command finds the distribution release codename for your current system, such as `buster`, `groovy`, or `sid`.
 
-```bash
-sudo apt update
-sudo apt install terraform
-```
+   ```bash
+   $ echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] \
+       https://apt.releases.hashicorp.com $(lsb_release -cs) main" | \
+       sudo tee /etc/apt/sources.list.d/hashicorp.list
+   ```
+
+1. Download the package information from HashiCorp.
+
+  ```bash
+  $ sudo apt update
+  ```
+
+1. Install Terraform from the new repository.
+
+   ```bash
+   $ sudo apt install terraform
+   ```
 
 ## Supported Architectures