diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index 620754daa9..1c132a9551 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -227,9 +227,6 @@ ipa_server: ipa01.phx2.fedoraproject.org
 ipa_realm: FEDORAPROJECT.ORG
 ipa_admin_password: "{{ ipa_prod_admin_password }}"
 
-# Remove after freeze, when we can move all builders
-krb_builder: False
-
 # Normal default sshd port is 22
 sshd_port: 22
 
diff --git a/inventory/group_vars/buildaarch64 b/inventory/group_vars/buildaarch64
index 49e750fd4d..a878d1e3f8 100644
--- a/inventory/group_vars/buildaarch64
+++ b/inventory/group_vars/buildaarch64
@@ -4,8 +4,6 @@ fas_client_groups: sysadmin-releng,sysadmin-secondary
 sudoers: "{{ private }}/files/sudo/buildsecondary-sudoers"
 gw: 10.5.78.254
 
-krb_builder: False
-
 kojipkgs_url: armpkgs.fedoraproject.org
 kojihub_url: arm.koji.fedoraproject.org/kojihub
 kojihub_scheme: https
diff --git a/inventory/group_vars/buildarm b/inventory/group_vars/buildarm
index 9cc51445f8..49df5710c5 100644
--- a/inventory/group_vars/buildarm
+++ b/inventory/group_vars/buildarm
@@ -3,8 +3,6 @@ fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 ansible_ifcfg_blacklist: true
 
-krb_builder: True
-
 koji_server_url: "https://koji.fedoraproject.org/kojihub"
 koji_weburl: "https:/koji.fedoraproject.org/koji"
 koji_topurl: "https://kojipkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/buildhw b/inventory/group_vars/buildhw
index bb42592473..112e90133d 100644
--- a/inventory/group_vars/buildhw
+++ b/inventory/group_vars/buildhw
@@ -4,8 +4,6 @@ fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 freezes: true
 
-krb_builder: true
-
 koji_hub_nfs: "fedora_koji"
 koji_server_url: "https://koji.fedoraproject.org/kojihub"
 koji_weburl: "https://koji.fedoraproject.org/koji"
diff --git a/inventory/group_vars/buildppc b/inventory/group_vars/buildppc
index 597655f044..c01797ef64 100644
--- a/inventory/group_vars/buildppc
+++ b/inventory/group_vars/buildppc
@@ -13,8 +13,6 @@ dns: 10.5.126.21
 main_bridge: br1
 virt_install_command: "{{ virt_install_command_one_nic }} --graphics none"
 
-krb_builder: True
-
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 host_group: kojibuilder
diff --git a/inventory/group_vars/buildppcle b/inventory/group_vars/buildppcle
index 4bfbad03d5..6303466562 100644
--- a/inventory/group_vars/buildppcle
+++ b/inventory/group_vars/buildppcle
@@ -13,8 +13,6 @@ dns: 10.5.126.21
 main_bridge: br1
 virt_install_command: "{{ virt_install_command_one_nic }} --graphics none"
 
-krb_builder: True
-
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 host_group: kojibuilder
diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm
index 40563148a5..e5a7040b6d 100644
--- a/inventory/group_vars/buildvm
+++ b/inventory/group_vars/buildvm
@@ -13,8 +13,6 @@ eth1_gw: 10.5.127.254
 dns: 10.5.126.21
 virt_install_command: "{{ virt_install_command_two_nic }}"
 
-krb_builder: True
-
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 host_group: kojibuilder
diff --git a/inventory/group_vars/buildvm-aarch64 b/inventory/group_vars/buildvm-aarch64
index 54a2ce17c0..da29e15826 100644
--- a/inventory/group_vars/buildvm-aarch64
+++ b/inventory/group_vars/buildvm-aarch64
@@ -18,8 +18,6 @@ main_bridge: br1
 nfs_bridge: br0
 virt_install_command: "{{ virt_install_command_aarch64_two_nic }}"
 
-krb_builder: True
-
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 host_group: kojibuilder
diff --git a/inventory/group_vars/buildvm-ppc64 b/inventory/group_vars/buildvm-ppc64
index 449dd5ed5d..b5f7d78ed6 100644
--- a/inventory/group_vars/buildvm-ppc64
+++ b/inventory/group_vars/buildvm-ppc64
@@ -25,7 +25,6 @@ host_group: kojibuilder
 fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 
-krb_builder: True
 koji_hub_nfs: "fedora_koji"
 koji_server_url: "https://koji.fedoraproject.org/kojihub"
 koji_weburl: "https://koji.fedoraproject.org/koji"
diff --git a/inventory/group_vars/buildvm-ppc64le b/inventory/group_vars/buildvm-ppc64le
index 035b84ffdb..874daf2f32 100644
--- a/inventory/group_vars/buildvm-ppc64le
+++ b/inventory/group_vars/buildvm-ppc64le
@@ -24,7 +24,6 @@ host_group: kojibuilder
 fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 
-krb_builder: True
 koji_hub_nfs: "fedora_koji"
 koji_server_url: "https://koji.fedoraproject.org/kojihub"
 koji_weburl: "https://koji.fedoraproject.org/koji"
diff --git a/inventory/group_vars/buildvm-s390 b/inventory/group_vars/buildvm-s390
index b005212349..d567561ad9 100644
--- a/inventory/group_vars/buildvm-s390
+++ b/inventory/group_vars/buildvm-s390
@@ -4,8 +4,6 @@ host_group: kojibuilder
 fas_client_groups: sysadmin-releng,sysadmin-secondary
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 
-krb_builder: False
-
 koji_hub_nfs: "fedora_s390/data"
 koji_server_url: "https://s390.koji.fedoraproject.org/kojihub"
 koji_weburl: "https://s390.koji.fedoraproject.org/koji"
diff --git a/inventory/group_vars/buildvm-stg b/inventory/group_vars/buildvm-stg
index e82c7cf228..9e0fef4402 100644
--- a/inventory/group_vars/buildvm-stg
+++ b/inventory/group_vars/buildvm-stg
@@ -11,8 +11,6 @@ nm: 255.255.255.0
 gw: 10.5.126.254
 dns: 10.5.126.21
 
-krb_builder: False
-
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 host_group: kojibuilder
diff --git a/inventory/group_vars/buildvmhost b/inventory/group_vars/buildvmhost
index 4227167472..6de2950c1d 100644
--- a/inventory/group_vars/buildvmhost
+++ b/inventory/group_vars/buildvmhost
@@ -4,8 +4,6 @@ nrpe_procs_crit: 1000
 virthost: true
 nested: True
 
-krb_builder: False
-
 # These variables are pushed into /etc/system_identification by the base role.
 # Groups and individual hosts should ovveride them with specific info.
 # See http://infrastructure.fedoraproject.org/csi/security-policy/
diff --git a/inventory/host_vars/arm01-builder22.arm.fedoraproject.org b/inventory/host_vars/arm01-builder22.arm.fedoraproject.org
index c40565a657..a8c3f820ea 100644
--- a/inventory/host_vars/arm01-builder22.arm.fedoraproject.org
+++ b/inventory/host_vars/arm01-builder22.arm.fedoraproject.org
@@ -4,5 +4,4 @@ koji_weburl: "https://koji.stg.fedoraproject.org/koji"
 koji_topurl: "https://kojipkgs.stg.fedoraproject.org/"
 datacenter: staging
 koji_hub_nfs: "fedora_koji"
-krb_builder: true
 freezes: false
diff --git a/inventory/host_vars/arm01-builder23.arm.fedoraproject.org b/inventory/host_vars/arm01-builder23.arm.fedoraproject.org
index c40565a657..a8c3f820ea 100644
--- a/inventory/host_vars/arm01-builder23.arm.fedoraproject.org
+++ b/inventory/host_vars/arm01-builder23.arm.fedoraproject.org
@@ -4,5 +4,4 @@ koji_weburl: "https://koji.stg.fedoraproject.org/koji"
 koji_topurl: "https://kojipkgs.stg.fedoraproject.org/"
 datacenter: staging
 koji_hub_nfs: "fedora_koji"
-krb_builder: true
 freezes: false
diff --git a/inventory/host_vars/buildvm-aarch64-01.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-01.arm.fedoraproject.org
index 2373c821a0..cd38f867d4 100644
--- a/inventory/host_vars/buildvm-aarch64-01.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-aarch64-01.arm.fedoraproject.org
@@ -2,4 +2,3 @@
 vmhost: aarch64-c01n1.arm.fedoraproject.org
 eth0_ip: 10.5.129.151
 eth1_ip: 10.5.127.32
-krb_builder: True