diff --git a/ansible/event-fetch-generate.sh b/ansible/event-fetch-generate.sh
index c9d17c9..986c1f2 100755
--- a/ansible/event-fetch-generate.sh
+++ b/ansible/event-fetch-generate.sh
@@ -3,4 +3,4 @@
 set -e
 
 echo "Fetching event inventory from Ambrose's infrastructure"
-ssh saguaro /usr/local/bin/wireguard-negotiator dump -i wg1 | go run event-generate.go opentech > event
+ssh -p 222 root@fd11:f055:a514::1 /usr/local/bin/wireguard-negotiator dump -i wg1 | go run event-generate.go opentech > event
diff --git a/ansible/recorders-obs.yml b/ansible/recorders-obs.yml
new file mode 100644
index 0000000..132fefb
--- /dev/null
+++ b/ansible/recorders-obs.yml
@@ -0,0 +1,7 @@
+---
+
+- hosts: recorders
+  roles:
+    - role: recorder
+      tags: obs
+
diff --git a/ansible/recorders.yml b/ansible/recorders.yml
index b12f86c..797f3cd 100644
--- a/ansible/recorders.yml
+++ b/ansible/recorders.yml
@@ -9,8 +9,7 @@
 - hosts: recorders
   roles:
     - role: recorder
-
-- hosts: audio_source
-  roles:
-    - role: audio_source
+      tags:
+        - base
+        - obs
 
diff --git a/ansible/roles/recorder/tasks/main.yml b/ansible/roles/recorder/tasks/main.yml
index 1fda27d..07a597b 100644
--- a/ansible/roles/recorder/tasks/main.yml
+++ b/ansible/roles/recorder/tasks/main.yml
@@ -1,7 +1,11 @@
 ---
 - include: user.yml
+  tags: base
 - include: packages.yml
+  tags: base
 - include: artwork.yml
+  tags: base
 - include: obs.yml
-- include: audio_source.yml
+  tags: obs
 - include: textfile.yml
+  tags: base
diff --git a/ansible/roles/recorder/templates/obs-studio/basic/scenes/event_id.json.j2 b/ansible/roles/recorder/templates/obs-studio/basic/scenes/event_id.json.j2
index 59c92b2..c3bac0f 100644
--- a/ansible/roles/recorder/templates/obs-studio/basic/scenes/event_id.json.j2
+++ b/ansible/roles/recorder/templates/obs-studio/basic/scenes/event_id.json.j2
@@ -1011,11 +1011,11 @@
 {% if room_type == "setup1" %}
                 "device_id": "/dev/v4l/by-path/pci-0000:00:14.0-usb-0:2:1.0-video-index0",{# X230 LEFT FRONT PORT #}
 {% elif room_type == "setup2" %}
-                "device_id": "/dev/v4l/by-id/usb-{{ webcam_name }}-video-index0",
+                "device_id": "/dev/v4l/by-id/{{ webcam_name }}-video-index0",
 {% elif room_type == "setup3" %}
-                "device_id": "/dev/v4l/by-id/usb-{{ webcam_name }}-video-index0",
+                "device_id": "/dev/v4l/by-id/{{ webcam_name }}-video-index0",
 {% else %}
-                "device_id": "/dev/v4l/by-id/usb-{{ webcam_name }}-video-index0",
+                "device_id": "/dev/v4l/by-id/{{ webcam_name }}-video-index0",
 {% endif %}
                 "framerate": 65566,
                 "input": 0,