diff --git a/playbooks/infra-prod/setup-keys.yaml b/playbooks/infra-prod/setup-keys.yaml
index 5fc23ff..f6712ad 100644
--- a/playbooks/infra-prod/setup-keys.yaml
+++ b/playbooks/infra-prod/setup-keys.yaml
@@ -12,11 +12,11 @@
         ansible_port: 22
         # Port 19885 is firewalled
         zuul_console_disabled: true
-        # Note this is the only host in the bastion group.  The playbooks
-        # are written to refer to "bastion[0]" rather than the hostname
-        # directly, so we can swap the hostname more easily.
+        # Playbooks are written to refer to "prod_bastion[0]" rather
+        # than the hostname directly, so we can swap the bridge
+        # hostname more easily.
         groups:
-          - bastion
+          - prod_bastion
 
     - name: Add bridge.o.o hostkey to known hosts
       known_hosts:
diff --git a/playbooks/infra-prod/setup-src.yaml b/playbooks/infra-prod/setup-src.yaml
index 1738140..d9537f4 100644
--- a/playbooks/infra-prod/setup-src.yaml
+++ b/playbooks/infra-prod/setup-src.yaml
@@ -1,4 +1,4 @@
-- hosts: bridge01.opendev.org
+- hosts: prod_bastion[0]
   tasks:
     - name: "Make sure a manual maintenance isn't going on"
       wait_for: