diff --git a/roles/linroom/tasks/fri_base.yml b/roles/linroom/tasks/fri_base.yml
index e018b53..9e7d160 100644
--- a/roles/linroom/tasks/fri_base.yml
+++ b/roles/linroom/tasks/fri_base.yml
@@ -53,6 +53,8 @@
       - ttf-mscorefonts-installer
       - libhivex-bin
       - overlayroot
+      - nfs-common
+      - cifs-utils
     state: latest
     update_cache: yes
 
@@ -98,6 +100,51 @@
     src: default_keyboard
     dest: /etc/default/keyboard
 
+- name: Add mount - C
+  mount:
+    boot: true
+    fstype: ntfs3
+    src: UUID=A09E30889E30594C
+    path: /mnt/C
+    state: mounted
+    opts: defaults,nofail
+
+- name: Add mount - D
+  mount:
+    boot: true
+    fstype: ntfs3
+    src: "LABEL=D:"
+    path: /mnt/D
+    state: mounted
+    opts: defaults,nofail
+
+- name: Add mount - F
+  mount:
+    boot: true
+    fstype: ntfs3
+    src: "LABEL=F:"
+    path: /mnt/F
+    state: mounted
+    opts: defaults,nofail
+
+- name: Add mount - partimag
+  mount:
+    boot: true
+    fstype: nfs
+    src: "10.32.254.16:/srv/nfs/clonezilla_images"
+    path: /home/partimag
+    state: mounted
+    opts: defaults,nofail
+
+- name: Add mount - ucilnice_d
+  mount:
+    boot: true
+    fstype: cifs
+    src: "//ucilnicesmb.fri1.uni-lj.si/ucilnice_d"
+    path: /mnt/ucilnice_d
+    state: mounted
+    opts: guest,soft,nofail
+
 - name: Set time to local RTC
   shell: "timedatectl set-local-rtc 1 --adjust-system-clock"
 
diff --git a/roles/winroom/defaults/main.yml b/roles/winroom/defaults/main.yml
new file mode 100644
index 0000000..af90961
--- /dev/null
+++ b/roles/winroom/defaults/main.yml
@@ -0,0 +1,6 @@
+ansible_connection: winrm
+ansible_winrm_transport: ntlm
+ansible_winrm_server_cert_validation: ignore
+ansible_port: 5985
+logon_type: interactive
+installers: \\ucilnicesmb.fri1.uni-lj.si\ucilnice_d\install