diff --git a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
index e39ec5be98..e62fb5390a 100644
--- a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
@@ -24,6 +24,10 @@ clouds:
   openstackci_vexxhost_username: user
   openstackci_vexxhost_password: password
   openstackci_vexxhost_project_name: project
+  openstackci_citycloud_username: user
+  openstackci_citycloud_password: password
+  openstackzuul_citycloud_username: user
+  openstackzuul_citycloud_password: password
   openstackci_linaro_london_username: user
   openstackci_linaro_london_password: password
   openstackci_linaro_london_project_name: project
@@ -52,3 +56,15 @@ clouds:
   opendevci_airship_password: password
   opendevzuul_airship_username: user
   opendevzuul_airship_password: password
+  opendevci_osuosl_username: user
+  opendevci_osuosl_password: password
+  opendevci_osuosl_project_id: project
+  opendevzuul_osuosl_username: user
+  opendevzuul_osuosl_password: password
+  opendevzuul_osuosl_project_id: project
+  opendevci_inmotion_username: user
+  opendevci_inmotion_password: password
+  opendevci_inmotion_project_id: project
+  opendevzuul_inmotion_username: user
+  opendevzuul_inmotion_password: password
+  opendevzuul_inmotion_project_id: project
diff --git a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2
index 55c77c8f5d..dfcfcec145 100644
--- a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2
+++ b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2
@@ -1,73 +1,3 @@
-# Necessary for fake clouds.yaml to be written
-clouds:
-  openstackci_internap_username: user
-  openstackci_internap_password: password
-  openstackci_internap_project_name: project
-  openstackjenkins_internap_username: user
-  openstackjenkins_internap_password: password
-  openstackjenkins_internap_project_name: project
-  openstackci_ovh_username: user
-  openstackci_ovh_password: password
-  openstackci_ovh_project_name: project
-  openstackci_rax_username: user
-  openstackci_rax_password: password
-  openstackci_rax_project_id: project
-  openstackjenkins_rax_username: user
-  openstackjenkins_rax_password: password
-  openstackjenkins_rax_project_id: project
-  openstackjenkins_ovh_username: user
-  openstackjenkins_ovh_password: password
-  openstackjenkins_ovh_project_name: project
-  openstackjenkins_vexxhost_username: user
-  openstackjenkins_vexxhost_password: password
-  openstackjenkins_vexxhost_project_name: project
-  openstackci_vexxhost_username: user
-  openstackci_vexxhost_password: password
-  openstackci_vexxhost_project_name: project
-  openstackci_citycloud_username: user
-  openstackci_citycloud_password: password
-  openstackzuul_citycloud_username: user
-  openstackzuul_citycloud_password: password
-  openstackci_linaro_london_username: user
-  openstackci_linaro_london_password: password
-  openstackci_linaro_london_project_name: project
-  openstackzuul_linaro_london_username: user
-  openstackzuul_linaro_london_password: password
-  openstackzuul_linaro_london_project_name: project
-  openstackci_linaro_us_username: user
-  openstackci_linaro_us_password: password
-  openstackci_linaro_us_project_name: project
-  openstackzuul_linaro_us_username: user
-  openstackzuul_linaro_us_password: password
-  openstackzuul_linaro_us_project_name: project
-  openstackci_limestone_username: user
-  openstackci_limestone_password: password
-  openstackci_limestone_project_name: project
-  openstackzuul_limestone_username: user
-  openstackzuul_limestone_password: password
-  openstackzuul_limestone_project_name: project
-  openstackci_packethost_username: user
-  openstackci_packethost_password: password
-  openstackci_packethost_project_name: project
-  openstackzuul_packethost_username: user
-  openstackzuul_packethost_password: password
-  openstackzuul_packethost_project_name: project
-  opendevci_airship_username: user
-  opendevci_airship_password: password
-  opendevzuul_airship_username: user
-  opendevzuul_airship_password: password
-  opendevci_osuosl_username: user
-  opendevci_osuosl_password: password
-  opendevci_osuosl_project_id: project
-  opendevzuul_osuosl_username: user
-  opendevzuul_osuosl_password: password
-  opendevzuul_osuosl_project_id: project
-  opendevci_inmotion_username: user
-  opendevci_inmotion_password: password
-  opendevci_inmotion_project_id: project
-  opendevzuul_inmotion_username: user
-  opendevzuul_inmotion_password: password
-  opendevzuul_inmotion_project_id: project
 gitea_kube_key: Z2l0ZWFfazhzX2tleQ==
 
 ansible_cron_disable_job: true