diff --git a/ansible/install-usb-viewer.yml b/ansible/install-usb-viewer.yml
index d965dee..9144fca 100644
--- a/ansible/install-usb-viewer.yml
+++ b/ansible/install-usb-viewer.yml
@@ -4,8 +4,8 @@
   become: true
   tasks:
     - name: Copy systemd services
-      ansible.builtin.copy:
-        src: "{{ vmdb2_config_base_dir }}/{{ item }}"
+      ansible.builtin.template:
+        src: "{{ item }}"
         dest: "/etc/systemd/system/{{ item }}"
         mode: '0644'
       loop:
diff --git a/ansible/remove-wifi-creds.yml b/ansible/remove-wifi-creds.yml
index 80880be..e3184ab 100644
--- a/ansible/remove-wifi-creds.yml
+++ b/ansible/remove-wifi-creds.yml
@@ -4,8 +4,8 @@
   become: true
   tasks:
     - name: Copy wpa_supplicant config
-      ansible.builtin.copy:
-        src: "{{ vmdb2_config_base_dir }}/wpa_supplicant.conf"
+      ansible.builtin.template:
+        src: "wpa_supplicant.conf"
         dest: /etc/wpa_supplicant/wpa_supplicant.conf
         force: true
         mode: '0644'
diff --git a/ansible/templates/serve-usb@.service b/ansible/templates/serve-usb@.service
new file mode 100644
index 0000000..4081b72
--- /dev/null
+++ b/ansible/templates/serve-usb@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Serve USB content
+BindTo=dev-%i.device
+
+[Service]
+ExecStart=/bin/sh -c '/usr/bin/on-usb-drive-mounted.sh /dev/%i'
+ExecStop=/bin/sh -c 'rm /media/usb-butter/'
+RemainAfterExit=yes
\ No newline at end of file
diff --git a/ansible/templates/udisks2-mount@.service b/ansible/templates/udisks2-mount@.service
new file mode 100644
index 0000000..c87a591
--- /dev/null
+++ b/ansible/templates/udisks2-mount@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Mount service
+BindTo=dev-%i.device
+
+[Service]
+ExecStart=/bin/sh -c '/usr/bin/udisksctl mount -b /dev/%i'
+ExecStop=/bin/sh -c '/usr/bin/udisksctl unmount -b /dev/%i'
+RemainAfterExit=yes
\ No newline at end of file
diff --git a/ansible/templates/wpa_supplicant.conf b/ansible/templates/wpa_supplicant.conf
new file mode 100644
index 0000000..5622f2e
--- /dev/null
+++ b/ansible/templates/wpa_supplicant.conf
@@ -0,0 +1,3 @@
+country=US
+ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
+ap_scan=1