diff --git a/roles/pc_application-caffeine/tasks/main.yml b/roles/pc_application-caffeine/tasks/main.yml
index c8b53c1d..2dc201ee 100644
--- a/roles/pc_application-caffeine/tasks/main.yml
+++ b/roles/pc_application-caffeine/tasks/main.yml
@@ -7,10 +7,10 @@
 
 - name: Create autostart directory if it doesn't exist
   file:
-    path: "{{ ansible_env.HOME }}/.config/autostart"
+    path: "{{auto_start_directory}}"
     state: directory
 
 - name: Copy caffeine.desktop file to autostart directory
   template:
     src: caffeine.desktop.j2
-    dest: "{{ ansible_env.HOME }}/.config/autostart/caffeine.desktop"
+    dest: "{{auto_start_directory}}caffeine.desktop"
diff --git a/roles/pc_application-caffeine/templates/caffeine.desktop.j2 b/roles/pc_application-caffeine/templates/caffeine.desktop.j2
index 843196ae..0f3b53dc 100644
--- a/roles/pc_application-caffeine/templates/caffeine.desktop.j2
+++ b/roles/pc_application-caffeine/templates/caffeine.desktop.j2
@@ -7,4 +7,4 @@ X-GNOME-Autostart-enabled=true
 Name[en_US]=caffeine
 Name=caffeine
 Comment[en_US]=
-Comment=
+Comment=
\ No newline at end of file
diff --git a/roles/pc_application-caffeine/vars/main.yml b/roles/pc_application-caffeine/vars/main.yml
new file mode 100644
index 00000000..0dfc9601
--- /dev/null
+++ b/roles/pc_application-caffeine/vars/main.yml
@@ -0,0 +1 @@
+auto_start_directory: "/home/{{client_username}}/.config/autostart/" 
\ No newline at end of file