diff --git a/kconfigs/workflows/Kconfig b/kconfigs/workflows/Kconfig
index 1b583094f..001f31a9b 100644
--- a/kconfigs/workflows/Kconfig
+++ b/kconfigs/workflows/Kconfig
@@ -74,6 +74,7 @@ endif # WORKFLOW_LINUX_PACKAGED
 
 config WORKFLOWS_TESTS
 	bool "Enable selection of test workflows"
+	depends on !BOOTLINUX_BUILDER
 	default n
 
 if WORKFLOWS_TESTS
diff --git a/playbooks/roles/gen_hosts/templates/builder.j2 b/playbooks/roles/gen_hosts/templates/builder.j2
deleted file mode 100644
index 164201dc5..000000000
--- a/playbooks/roles/gen_hosts/templates/builder.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-[all]
-localhost ansible_connection=local
-{{ kdevops_hosts_prefix }}-builder
-[all:vars]
-ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
-
-[baseline]
-{{ kdevops_hosts_prefix }}-builder
-[baseline:vars]
-ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
-
-[dev]
-[dev:vars]
-ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
-
-[service]
-[service:vars]
-ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
diff --git a/playbooks/roles/gen_hosts/templates/workflows/linux.j2 b/playbooks/roles/gen_hosts/templates/workflows/linux.j2
index 6a1459d87..63032ada2 100644
--- a/playbooks/roles/gen_hosts/templates/workflows/linux.j2
+++ b/playbooks/roles/gen_hosts/templates/workflows/linux.j2
@@ -1,12 +1,12 @@
 {# Template for the kernel builder workflow #}
 [all]
 localhost ansible_connection=local
-{{ kdevops_hosts_prefix }}-builder
+{{ kdevops_host_prefix }}-builder
 [all:vars]
 ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"
 
 [baseline]
-{{ kdevops_hosts_prefix }}-builder
+{{ kdevops_host_prefix }}-builder
 [baseline:vars]
 ansible_python_interpreter =  "{{ kdevops_python_interpreter }}"