diff --git a/roles/bakalari/defaults/main.yaml b/roles/bakalari/defaults/main.yaml
new file mode 100644
index 0000000..4a9b48d
--- /dev/null
+++ b/roles/bakalari/defaults/main.yaml
@@ -0,0 +1,4 @@
+bakalari_desktop_src: bakalari.desktop
+bakalari_desktop_dest: /usr/share/applications/bakalari.desktop
+bakalari_icon_src: bakalari.png
+bakalari_icon_dest: /usr/share/icons/bakalari.png
diff --git a/files/bakalari/bakalari.desktop b/roles/bakalari/files/bakalari.desktop
similarity index 100%
rename from files/bakalari/bakalari.desktop
rename to roles/bakalari/files/bakalari.desktop
diff --git a/files/bakalari/bakalari.png b/roles/bakalari/files/bakalari.png
similarity index 100%
rename from files/bakalari/bakalari.png
rename to roles/bakalari/files/bakalari.png
diff --git a/roles/bakalari/tasks/main.yaml b/roles/bakalari/tasks/main.yaml
new file mode 100644
index 0000000..49c5122
--- /dev/null
+++ b/roles/bakalari/tasks/main.yaml
@@ -0,0 +1,21 @@
+- name: Ensure the applications directory exists
+  file:
+    path: /usr/share/applications
+    state: directory
+
+- name: Ensure the icons directory exists
+  file:
+    path: /usr/share/icons
+    state: directory
+
+- name: Copy Bakaláři desktop shortcut
+  copy:
+    src: bakalari.desktop
+    dest: /usr/share/applications/bakalari.desktop
+    mode: 0644
+
+- name: Copy Bakaláři icon
+  copy:
+    src: bakalari.png
+    dest: /usr/share/icons/bakalari.png
+    mode: 0644
diff --git a/setup.yaml b/setup.yaml
index 67dd4db..fe5ed27 100644
--- a/setup.yaml
+++ b/setup.yaml
@@ -266,9 +266,8 @@
       loop:
         - "files/firefox/uBlock0@raymondhill.net.xpi"
 
+
 - name: Bakaláři
   hosts: teachers
-  tasks:
-    - name: Bakaláři
-      include_role:
-        name: bakalari
+  roles:
+    - bakalari