diff --git a/config/general_config/featureset036.yml b/config/general_config/featureset036.yml
index 7c97cda18..a48238dc4 100644
--- a/config/general_config/featureset036.yml
+++ b/config/general_config/featureset036.yml
@@ -63,7 +63,7 @@ container_registry_file: >-
   {%- endif -%}
 
 # Adjust user to CI
-overcloud_ssh_user: "tripleo-admin"
+overcloud_ssh_user: "zuul"
 
 # Workaround for deploying newton from queen.
 overcloud_prep_post_hook_script: |
diff --git a/config/general_config/featureset037.yml b/config/general_config/featureset037.yml
index cfdff029c..ba74b89d9 100644
--- a/config/general_config/featureset037.yml
+++ b/config/general_config/featureset037.yml
@@ -25,7 +25,7 @@ tripleo_upgrade_debug: true
 tripleo_upgrade_converge_plan_only: true
 tripleo_ci: true
 use_oooq: true
-overcloud_ssh_user: "tripleo-admin"
+overcloud_ssh_user: "zuul"
 
 network_isolation: false
 enable_pacemaker: false
diff --git a/config/general_config/featureset040.yml b/config/general_config/featureset040.yml
index b4abfc58c..5761ce656 100644
--- a/config/general_config/featureset040.yml
+++ b/config/general_config/featureset040.yml
@@ -43,7 +43,7 @@ container_registry_file: >-
 tripleo_ci: true
 use_oooq: true
 tripleo_upgrade_debug: true
-overcloud_ssh_user: "tripleo-admin"
+overcloud_ssh_user: "zuul"
 # Mandatory for deployed_servers
 tripleo_upgrade_validations_non_fatal: true
 # Reduce CI wall time
diff --git a/config/general_config/featureset051.yml b/config/general_config/featureset051.yml
index d79df4181..7a1c6429e 100644
--- a/config/general_config/featureset051.yml
+++ b/config/general_config/featureset051.yml
@@ -47,7 +47,7 @@ container_registry_file: >-
 tripleo_ci: true
 use_oooq: true
 tripleo_upgrade_debug: true
-overcloud_ssh_user: "tripleo-admin"
+overcloud_ssh_user: "zuul"
 # Mandatory for deployed_servers
 tripleo_upgrade_validations_non_fatal: true
 # Reduce CI wall time