diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml
index 690fe9deca..ad488d142b 100644
--- a/inventory/service/groups.yaml
+++ b/inventory/service/groups.yaml
@@ -72,8 +72,13 @@ groups:
     - health[0-9]*.openstack.org
   jvb:
     - jvb[0-9]*.opendev.org
-  kdc:
-    - kdc[0-9]*.open*.org
+  kerberos-kdc:
+    - kdc03.openstack.org
+    - kdc04.openstack.org
+  kerberos-kdc-primary:
+    - kdc03.openstack.org
+  kerberos-kdc-replica:
+    - kdc04.openstack.org
   letsencrypt:
     - codesearch[0-9]*.opendev.org
     - etherpad[0-9]*.opendev.org
@@ -130,7 +135,6 @@ groups:
     - ethercalc[0-9]*.open*.org
     - firehose[0-9]*.open*.org
     - health[0-9]*.openstack.org
-    - kdc[0-9]*.open*.org
     - lists*.katacontainers.io
     - lists*.open*.org
     - logstash-worker[0-9]*.open*.org
@@ -161,7 +165,6 @@ groups:
     - ethercalc[0-9]*.open*.org
     - firehose[0-9]*.open*.org
     - health[0-9]*.openstack.org
-    - kdc[0-9]*.open*.org
     - lists*.katacontainers.io
     - lists*.open*.org
     - lists-dev[0-9]*.open*.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 79e6942088..70c17f29e7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -458,22 +458,6 @@ node /^openstackid-dev\d*\.openstack\.org$/ {
   }
 }
 
-# Node-OS: xenial
-node /^kdc03\.open.*\.org$/ {
-  class { 'openstack_project::server': }
-
-  class { 'openstack_project::kdc': }
-}
-
-# Node-OS: xenial
-node /^kdc04\.open.*\.org$/ {
-  class { 'openstack_project::server': }
-
-  class { 'openstack_project::kdc':
-    slave => true,
-  }
-}
-
 # Node-OS: xenial
 node /^ask\d*\.open.*\.org$/ {
 
diff --git a/modules/openstack_project/manifests/kdc.pp b/modules/openstack_project/manifests/kdc.pp
deleted file mode 100644
index e2cbc4d6f3..0000000000
--- a/modules/openstack_project/manifests/kdc.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# kerberos kdc servers
-class openstack_project::kdc (
-  $slave = false,
-) {
-  class { 'kerberos::server':
-    realm        => 'OPENSTACK.ORG',
-    kdcs         => [
-      'kdc03.openstack.org',
-      'kdc04.openstack.org',
-    ],
-    admin_server => 'kdc.openstack.org',
-    slaves       => [
-      'kdc04.openstack.org',
-    ],
-    slave        => $slave,
-  }
-}