diff --git a/inventory/builders b/inventory/builders
index f8e25c5ae2..6b480107de 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -401,10 +401,9 @@ buildvm-ppc64le-30.rdu3.fedoraproject.org
 buildvm-ppc64le-31.rdu3.fedoraproject.org
 buildvm-ppc64le-32.rdu3.fedoraproject.org
 
-[bkernel]
-buildhw-x86-01.rdu3.fedoraproject.org
-
 [secureboot]
+buildhw-x86-01.rdu3.fedoraproject.org
+buildhw-a64-01.rdu3.fedoraproject.org
 buildhw-x86-02.rdu3.fedoraproject.org
 buildhw-a64-02.rdu3.fedoraproject.org
 
@@ -467,7 +466,7 @@ buildvm
 buildvm_aarch64
 buildvm_ppc64le
 buildvm_s390x
-bkernel
+secureboot
 
 [builders_stg:children]
 buildhw_ppc64le_stg
diff --git a/inventory/inventory b/inventory/inventory
index dbc8188f06..f3911d4b9f 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -817,7 +817,7 @@ colo_virt
 value
 staging
 builders
-bkernel
+secureboot
 buildvmhost
 
 [groupc]
diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml
index 72f828c52e..674a00acb9 100644
--- a/playbooks/groups/buildhw.yml
+++ b/playbooks/groups/buildhw.yml
@@ -1,10 +1,10 @@
 ---
 - import_playbook: "/srv/web/infra/ansible/playbooks/include/happy_birthday.yml"
   vars:
-    myhosts: "buildhw:bkernel:buildhw_stg"
+    myhosts: "buildhw:buildhw_stg"
 
 - name: make koji builder(s) on raw hw
-  hosts: buildhw:bkernel:buildhw_stg
+  hosts: buildhw:buildhw_stg
   remote_user: root
   gather_facts: true
 
@@ -67,18 +67,14 @@
 
   - koji_builder
 
-  - role: bkernel
-    when: "'bkernel' in group_names"
-
   - role: siguldry/pesign_bridge
     when: inventory_hostname.startswith(('buildhw-x86-02','buildhw-a64-02'))
 
-  - { role: linux-system-roles.nbde_client, when: "inventory_hostname.startswith(('bkernel', 'buildhw'))" }
-  - { role: serial-console, when: "inventory_hostname.startswith(('bkernel', 'buildhw-x86'))" }
+  - { role: linux-system-roles.nbde_client, when: "inventory_hostname.startswith(('buildhw'))" }
+  - { role: serial-console, when: "inventory_hostname.startswith(('buildhw-x86'))" }
   - hosts
   - ipa/client
   - role: sudo
-    when: not inventory_hostname.startswith(('bkernel', 'buildhw-x86-01.rdu3'))
 
   - role: keytab/service
     kt_location: /etc/kojid/kojid.keytab
diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index eaaf9be035..554d448d9d 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -33,7 +33,6 @@
     }
     - ipa/client
     - role: sudo
-      when: not inventory_hostname.startswith('bkernel') and env == 'production'
     - koji_builder
     - role: nfs/client
       mnt_dir: '/mnt/koji/ostree'
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 559ef516f4..71cf409754 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -46,7 +46,7 @@
   - rootpw
   - base
   when:
-    - not inventory_hostname.startswith(('buildvm-','buildhw-','bkernel','compose'))
+    - not inventory_hostname.startswith(('buildvm-','buildhw-','compose'))
     - not inventory_hostname.startswith('copr')
 
 - name: Add ansible root key
diff --git a/roles/bkernel/files/history_off.sh b/roles/bkernel/files/history_off.sh
deleted file mode 100644
index be7ee75a3e..0000000000
--- a/roles/bkernel/files/history_off.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-unset HISTFILE
-set HISTSIZE=0
diff --git a/roles/bkernel/files/pesign-users b/roles/bkernel/files/pesign-users
deleted file mode 100644
index 649d673d6c..0000000000
--- a/roles/bkernel/files/pesign-users
+++ /dev/null
@@ -1,2 +0,0 @@
-kojibuilder
-pesign
diff --git a/roles/bkernel/tasks/main.yml b/roles/bkernel/tasks/main.yml
deleted file mode 100644
index 850962b108..0000000000
--- a/roles/bkernel/tasks/main.yml
+++ /dev/null
@@ -1,70 +0,0 @@
----
-- name: Add pkgs for bkernel boxes
-  ansible.builtin.package:
-    state: present
-    name:
-    - pesign
-    - ccid
-    - pcsc-lite
-    - pcsc-lite-libs
-    - opensc
-    - nss-tools
-  tags:
-  - bkernel
-
-- name: Enable pcscd
-  service: name=pcscd state=started enabled=true
-  tags:
-  - bkernel
-
-- name: Setup opensc in pcscd
-  ansible.builtin.shell: modutil -dbdir /etc/pki/pesign -list | grep -q OpenSC ||  modutil -force -dbdir /etc/pki/pesign -add opensc -libfile /usr/lib64/pkcs11/opensc-pkcs11.so
-  check_mode: no
-  changed_when: "1 != 1"
-  tags:
-  - bkernel
-
-- name: Setup pesign users config
-  ansible.builtin.copy: src=pesign-users dest=/etc/pesign/users mode=0600 owner=root group=root
-  tags:
-  - bkernel
-
-- name: Enable pesign
-  service: name=pesign state=started enabled=true
-  tags:
-  - bkernel
-
-- name: /var/run/pesign directory perms (kojibuilder)
-  acl: path=/var/run/pesign entity=kojibuilder etype=user permissions=rwx recursive=true state=present
-  tags:
-  - bkernel
-
-- name: /var/run/pesign directory perms (pesign)
-  acl: path=/var/run/pesign default=true entity=pesign etype=group permissions=rwx recursive=true state=present
-  tags:
-  - bkernel
-
-- name: /var/run/pesign socket perms (kojibuilder)
-  acl: path=/var/run/pesign/socket entity=kojibuilder etype=user permissions=rwx recursive=true state=present
-  tags:
-  - bkernel
-
-- name: /var/run/pesign socket perms (pesign)
-  acl: path=/var/run/pesign/socket default=true entity=pesign etype=group permissions=rwx recursive=true state=present
-  tags:
-  - bkernel
-
-- name: When you awake you will remember nothing
-  ansible.builtin.copy: src=history_off.sh dest=/etc/profile.d/history_off.sh mode=0644
-  tags:
-  - bkernel
-
-- name: Mock site-defaults.cfg
-  ansible.builtin.template:
-    src: bkernel-site-defaults.cfg
-    dest: /etc/mock/site-defaults.cfg
-    mode: "0644"
-    owner: root
-    group: mock
-  tags:
-  - bkernel
diff --git a/roles/bkernel/templates/bkernel-site-defaults.cfg b/roles/bkernel/templates/bkernel-site-defaults.cfg
deleted file mode 100644
index f48419dd96..0000000000
--- a/roles/bkernel/templates/bkernel-site-defaults.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# mount the pesign socket into the chroot
-config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/var/run/pesign', '/var/run/pesign' ))
-config_opts['nspawn_args'] += ['--bind=/var/run/pesign']
-config_opts['plugin_conf']['package_state_enable'] = False
-config_opts['macros']['%bugurl'] = 'https://bugz.fedoraproject.org/%name'
-#config_opts['nosync'] = True
-#config_opts['nosync_force'] = True
-config_opts['dnf_common_opts'] = ['--setopt=install_weak_deps=0']
-config_opts['environment']['LANG'] = 'C.UTF-8'
-config_opts['use_bootstrap'] = False
-config_opts['dnf_warning'] = False
-
-# dnf group install with '--allowerasing' is still to be released:
-# https://github.com/rpm-software-management/dnf5/pull/1174
-config_opts["dnf5_avoid_opts"] = {
-    "group": ["--allowerasing"],
-}
-
-config_opts['plugin_conf']['rpmautospec_enable'] = True
-config_opts['plugin_conf']['rpmautospec_opts'] = {
-    'requires': ['rpmautospec'],
-    'cmd_base': ['/usr/bin/rpmautospec', 'process-distgit'],
-}
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index a7ca34ae7e..b6344b32a0 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -226,7 +226,7 @@
 
 - name: Mock site-defaults.cfg
   ansible.builtin.template: src=builders/site-defaults.cfg dest=/etc/mock/site-defaults.cfg mode=0644 owner=root group=mock
-  when: not inventory_hostname.startswith(('bkernel'))
+  when: "'secureboot' not in group_names"
   tags:
   - koji_builder
   - site-defaults