diff --git a/inventory/group_vars/bastion b/inventory/group_vars/bastion
index 371b16b727..13570ad727 100644
--- a/inventory/group_vars/bastion
+++ b/inventory/group_vars/bastion
@@ -54,3 +54,7 @@ csi_relationship: |
   - Bastion is the hub for all infrastructure's VPN connections.
   - All incoming SMTP from phx2 and VPN, as well as outgoing SMTP, pass or are filtered here.
   - Bastion does not accept any mail outside phx2/vpn.
+
+# Bastion also gets bastion.fpo
+ssh_hostnames:
+- bastion.fedoraproject.org
diff --git a/inventory/host_vars/pkgs02.phx2.fedoraproject.org b/inventory/host_vars/pkgs02.phx2.fedoraproject.org
index 7ca7f2dfac..aef4e772e2 100644
--- a/inventory/host_vars/pkgs02.phx2.fedoraproject.org
+++ b/inventory/host_vars/pkgs02.phx2.fedoraproject.org
@@ -19,6 +19,9 @@ virt_install_command: "{{ virt_install_command_two_nic }}"
 host_backup_targets: ['/srv']
 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 
+ssh_hostnames:
+- pkgs.fedoraproject.org
+
 additional_host_keytabs:
 - pkgs.fedoraproject.org