diff --git a/playbooks/manufacturers_s76.yml b/playbooks/manufacturers_s76.yml
new file mode 100644
index 0000000..37a2990
--- /dev/null
+++ b/playbooks/manufacturers_s76.yml
@@ -0,0 +1,20 @@
+#!/usr/bin/env ansible-playbook
+# vim:ft=ansible:
+---
+- hosts: manufacturers_s76
+  tasks:
+    - name: configure system76 for apt
+      block:
+        - name: ensure system76 repo
+          apt_repository: repo="ppa:system76-dev/stable"
+        - name: ensure system76 packages
+          apt:
+            name:
+              - firmware-manager
+              - kamoso
+              - system76-acpi-dkms
+              - system76-dkms
+              - system76-firmware
+              - system76-io-dkms
+              - system76-power
+      when: ansible_pkg_mgr == "apt"
diff --git a/roles/desktop/tasks/packages.yml b/roles/desktop/tasks/packages.yml
index 694ced4..cbeed7e 100644
--- a/roles/desktop/tasks/packages.yml
+++ b/roles/desktop/tasks/packages.yml
@@ -28,23 +28,6 @@
       loop: "{{ desktop_apt_debs + desktop_apt_debs_extra }}"
       # Ignoring errors here is important because this task fails on package backdates
       ignore_errors: yes
-      # System76-specific config
-      # Kinda out of the spirit of the role but whatever
-    - name: configure system76 machines
-      block:
-        - name: configure system76 repo
-          apt_repository: repo="ppa:system76-dev/stable"
-        - name: configure system76-specific packages
-          apt:
-            name:
-              - firmware-manager
-              - kamoso
-              - system76-acpi-dkms
-              - system76-dkms
-              - system76-firmware
-              - system76-io-dkms
-              - system76-power
-      when: ansible_system_vendor == "System76"
   when: ansible_pkg_mgr == "apt"
 - name: configure portage
   block:
diff --git a/site.yml b/site.yml
index 452ef52..8d404cf 100755
--- a/site.yml
+++ b/site.yml
@@ -39,6 +39,7 @@
       tags: [ sshd, common ]
   # Manufacturer configuration
 - import_playbook: playbooks/manufacturers_raspi.yml
+- import_playbook: playbooks/manufacturers_s76.yml
   # Tags for fundamental services
 - import_playbook: playbooks/tags_zerotier.yml
 - import_playbook: playbooks/tags_snmp.yml