diff --git a/ansible/dev-tools.yml b/ansible/dev-tools.yml
new file mode 100644
index 000000000..5e7bd85b5
--- /dev/null
+++ b/ansible/dev-tools.yml
@@ -0,0 +1,5 @@
+---
+- name: Ensure development tools are installed
+  hosts: seed:controllers
+  roles:
+    - role: dev-tools
diff --git a/ansible/kolla-host.yml b/ansible/kolla-host.yml
index 7fdd2d8d0..f105eab74 100644
--- a/ansible/kolla-host.yml
+++ b/ansible/kolla-host.yml
@@ -1,10 +1,4 @@
 ---
-- name: Ensure Kolla hosts are configured
-  hosts: seed:controllers
-  roles:
-    - role: kolla-host
-      kolla_authorized_key: "{{ lookup('file', ssh_public_key_path) }}"
-
 - name: Ensure Kolla host services are configured
   hosts: controllers
   tasks:
diff --git a/ansible/roles/dev-tools/defaults/main.yml b/ansible/roles/dev-tools/defaults/main.yml
new file mode 100644
index 000000000..ad072f4fa
--- /dev/null
+++ b/ansible/roles/dev-tools/defaults/main.yml
@@ -0,0 +1,8 @@
+---
+# List of default packages to install.
+dev_tools_packages_default:
+  - tcpdump
+  - vim
+
+# List of packages to install.
+dev_tools_packages: "{{ dev_tools_packages_default }}"
diff --git a/ansible/roles/dev-tools/tasks/main.yml b/ansible/roles/dev-tools/tasks/main.yml
new file mode 100644
index 000000000..25b1e6d6f
--- /dev/null
+++ b/ansible/roles/dev-tools/tasks/main.yml
@@ -0,0 +1,7 @@
+---
+- name: Ensure required packages are installed
+  yum:
+    name: "{{ item }}"
+    state: installed
+  become: True
+  with_items: "{{ dev_tools_packages }}"
diff --git a/ansible/roles/kolla-host/defaults/main.yml b/ansible/roles/kolla-host/defaults/main.yml
deleted file mode 100644
index cdeda3486..000000000
--- a/ansible/roles/kolla-host/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# SSH public key to be authorized by the Kolla host.
-kolla_authorized_key:
diff --git a/ansible/roles/kolla-host/tasks/main.yml b/ansible/roles/kolla-host/tasks/main.yml
deleted file mode 100644
index 46834d808..000000000
--- a/ansible/roles/kolla-host/tasks/main.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: Ensure required packages are installed
-  yum:
-    name: "{{ item }}"
-    state: installed
-  become: True
-  with_items:
-    - vim
-
-- name: Ensure Kolla user has authorized our SSH key
-  authorized_key:
-    user: kolla
-    key: "{{ kolla_authorized_key }}"
-  become: True
diff --git a/kayobe/cli/commands.py b/kayobe/cli/commands.py
index 2cf657dda..e41e18956 100644
--- a/kayobe/cli/commands.py
+++ b/kayobe/cli/commands.py
@@ -147,7 +147,7 @@ class SeedHostConfigure(KollaAnsibleMixin, KayobeAnsibleMixin, Command):
                                            var_name="kayobe_ansible_user")
         playbooks = _build_playbook_list(
             "ip-allocation", "ssh-known-host", "kayobe-ansible-user",
-             "disable-selinux", "network", "ntp", "lvm")
+            "dev-tools", "disable-selinux", "network", "ntp", "lvm")
         ansible.run_playbooks(parsed_args, playbooks, limit="seed")
         kolla_ansible.run_seed(parsed_args, "bootstrap-servers",
                                extra_vars={"ansible_user": ansible_user})
@@ -244,7 +244,7 @@ class OvercloudHostConfigure(KollaAnsibleMixin, KayobeAnsibleMixin, Command):
                                            var_name="kayobe_ansible_user")
         playbooks = _build_playbook_list(
             "ip-allocation", "ssh-known-host", "kayobe-ansible-user",
-            "disable-selinux", "network", "ntp", "lvm")
+            "dev-tools", "disable-selinux", "network", "ntp", "lvm")
         ansible.run_playbooks(parsed_args, playbooks, limit="controllers")
         kolla_ansible.run_overcloud(parsed_args, "bootstrap-servers",
                                     extra_vars={"ansible_user": ansible_user})