diff --git a/common/files/lldpd b/baremetal/files/lldpd
similarity index 100%
rename from common/files/lldpd
rename to baremetal/files/lldpd
diff --git a/baremetal/tasks/lldpd.yml b/baremetal/tasks/lldpd.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d00ef784f19de7abc4ff9f24e264f4f97a9830bf
--- /dev/null
+++ b/baremetal/tasks/lldpd.yml
@@ -0,0 +1,23 @@
+---
+# file: roles/baremetal/tasks/software.yml
+
+- name: ensure lldpd is installed
+  apt: state=latest name=lldpd
+  tags:
+    - lldpd
+    - packages
+
+- name: ensure lldpd is configured
+  copy: src=lldpd dest=/etc/default/lldpd owner=root group=root mode=0644
+  notify:
+    - restart lldpd
+  tags:
+    - lldpd
+    - config
+
+- name: ensure lldpd is enabled and running
+  service: name=lldpd state=running enabled=yes
+  tags:
+    - lldpd
+    - service
+
diff --git a/common/tasks/software.yml b/common/tasks/software.yml
index b004de2ae1be6661aab46bffa9026ce9694bf468..42f1eb713fa0fb6bad601791c89fba9f6d349911 100644
--- a/common/tasks/software.yml
+++ b/common/tasks/software.yml
@@ -25,26 +25,6 @@
   tags:
     - packages
 
-- name: ensure lldpd is installed
-  apt: state=latest name=lldpd
-  tags:
-    - lldpd
-    - packages
-
-- name: ensure lldpd is configured
-  copy: src=lldpd dest=/etc/default/lldpd owner=root group=root mode=0644
-  notify:
-    - restart lldpd
-  tags:
-    - lldpd
-    - config
-
-- name: ensure lldpd is enabled and running
-  service: name=lldpd state=running enabled=yes
-  tags:
-    - lldpd
-    - service
-
 - name: ensure we got ourselves protected from sleepiness
   apt: name=molly-guard state=latest
   tags: