diff --git a/defaults/main.yml b/defaults/main.yml
index 85344d9..70b5f9d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -43,6 +43,7 @@ koji_web_tls_key: /etc/pki/tls/private/koji.rockylinux.org.key
 # Kojira
 koji_kojira: true
 koji_kojira_user: kojira
+koji_kojira_user_kerb: koji/kojira
 koji_kojira_principal: koji/kojira@ROCKYLINUX.ORG
 koji_kojira_keytab: /etc/koji.keytab
 
diff --git a/tasks/main.yml b/tasks/main.yml
index d9d5d5c..42df33b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -18,17 +18,7 @@
 
 - name: Configure local koji admin
   import_tasks: koji-admin-local.yml
-  when:
-    - koji_admin_client
-    - koji_admin_localuser
-
-# This is specifically if we want the IPA account to also be an account on this
-# system. ymmv.
-- name: Configure ipa koji admin
-  import_tasks: koji-admin-ipa.yml
-  when:
-    - koji_admin_client
-    - not koji_admin_localuser
+  when: koji_admin_client
 
 - name: Configure plugins
   import_tasks: plugins.yml
diff --git a/templates/koji-pgsql.sql.j2 b/templates/koji-pgsql.sql.j2
index 155d0c4..129524d 100644
--- a/templates/koji-pgsql.sql.j2
+++ b/templates/koji-pgsql.sql.j2
@@ -1,5 +1,6 @@
 with user_id as (insert into users (name, status, usertype) values ('{{ koji_admin_user }}', 0, 0) returning id)
 insert into user_krb_principals (user_id, krb_principal) values ((select id from user_id),'{{ koji_admin_principal }}');
 insert into user_perms (user_id, perm_id, creator_id) values (1, 1, 1);
-insert into users (name, status, usertype) values ('{{ koji_kojira_user }}', 0, 0);
+with user_id as (insert into users (name, status, usertype) values ('{{ koji_kojira_user_kerb }}', 0 0) returning id)
+insert into user_krb_principals (user_id, krb_principal) values ((select id from user_id),'{{ koji_kojira_principal }}');
 INSERT INTO user_perms (user_id, perm_id, creator_id) VALUES (2, 10, 1);