diff --git a/deployment/cephadm/ceph-base.yaml b/deployment/cephadm/ceph-base.yaml
index 277a7c6b16..f93177ad82 100644
--- a/deployment/cephadm/ceph-base.yaml
+++ b/deployment/cephadm/ceph-base.yaml
@@ -579,18 +579,6 @@ outputs:
                             ms_client_mode: secure
                       - {get_attr: [DefaultCephConfigOverrides, value, vars]}
                 cephadm_extra_vars: {get_attr: [CephAdmVars, value, vars]}
-                ceph_admin_extra_vars:  # user creation
-                  tripleo_admin_generate_key: false
-                  distribute_private_key: true
-                  tripleo_admin_user: ceph-admin
-                  ssh_servers: "{{ groups['ceph_mon'] |
-                                   union(groups['ceph_osd']|default([])) |
-                                   union(groups['ceph_mgr']|default([])) |
-                                   union(groups['ceph_rgw']|default([])) |
-                                   union(groups['ceph_mds']|default([])) |
-                                   union(groups['ceph_nfs']|default([])) |
-                                   union(groups['ceph_rbdmirror']|default([])) |
-                                   unique }}"
             - name: Prepare cephadm user and keys
               include_role:
                 name: tripleo_run_cephadm