diff --git a/gerrit/client/init.yml b/gerrit/client/init.yml
index 0edd17e..7dd6c77 100644
--- a/gerrit/client/init.yml
+++ b/gerrit/client/init.yml
@@ -20,6 +20,10 @@
         protocol: http
         password: ${_param:gerrit_admin_password}
         key: ${_param:gerrit_admin_private_key}
+      user:
+        admin:
+          fullname: Administrator
+          ssh_key: ${_param:gerrit_admin_public_key}
       group:
         Event Streaming Users:
           description: Event Streaming Users
diff --git a/openldap/client/groups/admins.yml b/openldap/client/groups/admins.yml
index 86abb8f..36eac5f 100644
--- a/openldap/client/groups/admins.yml
+++ b/openldap/client/groups/admins.yml
@@ -10,11 +10,11 @@
               attr:
                 description: Administrators
                 gidNumber: 20001
+                memberUid:
+                  - admin
               classes:
                 - posixGroup
                 - top
-              # TODO: Cannot set member attributes in our LDAP yet
+              # TODO: Cannot set memberOf attributes in our LDAP yet
               # member:
               #   - cn=admin,ou=people
-              memberUid:
-                - cn=admin,ou=people