diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index ad2779bc6c..1da6456d28 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -213,12 +213,17 @@
 
 - name: Create exports file
   template: src=exports.j2 dest=/etc/exports.d/openqa.exports owner=root group=root mode=0644
+  register: exportsfile
   tags:
   - config
 
 - name: Enable and start NFS server
   service: name=nfs-server enabled=yes state=started
 
+- name: Refresh exports
+  command: exportfs -r
+  when: exportsfile is changed
+
 - name: Set up Apache config
   template: src=openqa.conf.httpd.j2 dest=/etc/httpd/conf.d/openqa.conf owner=root group=root mode=0644
   notify:
diff --git a/roles/openqa/worker/tasks/nfs-client.yml b/roles/openqa/worker/tasks/nfs-client.yml
index b49b5ec9a6..1e52f48952 100644
--- a/roles/openqa/worker/tasks/nfs-client.yml
+++ b/roles/openqa/worker/tasks/nfs-client.yml
@@ -14,6 +14,7 @@
 
 - name: Create mount unit
   template: src=var-lib-openqa-share.mount.j2 dest=/etc/systemd/system/var-lib-openqa-share.mount owner=root group=root mode=0644
+  register: sharemount
   tags:
   - config
 
@@ -22,3 +23,7 @@
   with_items:
   - var-lib-openqa-share.mount
   - remote-fs.target
+
+- name: Restart mount if unit changed
+  systemd: name=var-lib-openqa-share.mount state=started daemon_reload=yes
+  when: sharemount is changed