diff --git a/playbooks/infra-prod/setup-keys.yaml b/playbooks/infra-prod/setup-keys.yaml
index f2cc21f..5fc23ff 100644
--- a/playbooks/infra-prod/setup-keys.yaml
+++ b/playbooks/infra-prod/setup-keys.yaml
@@ -1,14 +1,14 @@
 - hosts: localhost
   tasks:
-    - name: Add bridge.o.o to inventory
+    - name: Add bastion to inventory
       add_host:
-        name: bridge.openstack.org
+        name: bridge01.opendev.org
         ansible_python_interpreter: python3
         ansible_user: zuul
         # Without setting ansible_host directly, mirror-workspace-git-repos
         # gets sad because if delegate_to localhost and with add_host that
         # ends up with ansible_host being localhost.
-        ansible_host: bridge.openstack.org
+        ansible_host: bridge01.opendev.org
         ansible_port: 22
         # Port 19885 is firewalled
         zuul_console_disabled: true
@@ -20,6 +20,6 @@
 
     - name: Add bridge.o.o hostkey to known hosts
       known_hosts:
-        name: bridge.openstack.org
-        key: "bridge.openstack.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxRzDkWvvVQtsLTAqAwedRWA84/42KKVdFS0QP8lZFsMpgTXUhjipJ7VcFun5gM87tnt0J71rlN+ospBh0/1wfp2jASEskUyGhXAa5xHjnJN7veUyW+AggEosK/OTunvZgf54p1sQg45Sq/uCjc0Ua0fRMOq2o5z/mgpl6rSjLOlWi9wKA/6axnUbs9w4iD5esyBQ+VcISSJOTqhAo/3UG0NwCU+6Ggwwhg0nl5iCMpQfq4A207IbJ72MkJzlQgW3edsRb5POzdZcGxkTYvVdP3kgHP4Bof3MFFZjBUMz6SuRQyNV5poysMtbtlO0SvgAJNhXr6Vn0GA9XhqFP6+HT"
+        name: bridge01.opendev.org
+        key: "bridge01.opendev.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC2zgQQ0lpnjtST1oINVPo9jTDI0W3IJA+ZSUTsOo6gGzz6M8PN+jyxQ3EQy8H/xPjm2C55yGfaLNzj557P5arI0TkdeNHt4hzRcmpsNUVE4fOtzMblThRSA1ipfhd/DqMUKz1Ofie3hojnhE1ecB86IcdbF9rfJxl0DOuoSQfClJw3kDx5nK+0Ps5lVnSBZ+NUKbnUFizWVjKz6qIe3tZpuHAvuD/S8tM/gJ+3fC7LcssGb+njo5ghhSUl8wasGBXZQuby33mtuX+UBON+h95odanZs3iGMZScPxgchGb4xB3OTyYn0dFG3mnwPuUnrEKluJ/eFXCkM+Q35DMCa+mynco0stt136e2qTrX1jhtcaDerufb7hs2/7zM/q4zbRYKalUhnh0CZshQ3Y1AuwI3ssmwczQpwgTJnceBmmh5xYPDVCGPpAamTPKhl4VSqlfm2Nc56+dcUm0Y6jiQjBhLIbWevq6RWse6K4R39ovPlTN3z037oJxQHsIETrXxHp0="
 
diff --git a/playbooks/infra-prod/setup-src.yaml b/playbooks/infra-prod/setup-src.yaml
index 92391a4..557aa39 100644
--- a/playbooks/infra-prod/setup-src.yaml
+++ b/playbooks/infra-prod/setup-src.yaml
@@ -1,4 +1,4 @@
-- hosts: bridge.openstack.org
+- hosts: bridge01.opendev.org
   tasks:
     - name: "Make sure a manual maintenance isn't going on"
       wait_for: