diff --git a/setup_workstation.yml b/setup_workstation.yml
index 016ffc8..265b29e 100644
--- a/setup_workstation.yml
+++ b/setup_workstation.yml
@@ -20,4 +20,4 @@
     - include_tasks: tasks/harden.yml
 
   handlers:
-    - include_tasks: handlers/handlers.yml
+    - include_tasks: handlers/main.yml
diff --git a/tasks/services.yml b/tasks/services.yml
index 54ffa52..40bdc2b 100644
--- a/tasks/services.yml
+++ b/tasks/services.yml
@@ -22,7 +22,7 @@
 
 - name: Enable nfs-server
   service:
-    name: nfs-server
+    name: nfs
     enabled: yes
   when: enable_vagrant_nfs
 
diff --git a/tasks/system.yml b/tasks/system.yml
index 9a52877..c97a983 100644
--- a/tasks/system.yml
+++ b/tasks/system.yml
@@ -29,19 +29,19 @@
     virt_pool:
       command: destroy
       name: default
-    when: ansible_libvirt_pools.default.path is defined 
+    when: ansible_libvirt_pools.default.path is defined
 
   - name: Set default pool to inactive
     virt_pool:
       state: inactive
       name: default
-    when: ansible_libvirt_pools.default.path is defined 
+    when: ansible_libvirt_pools.default.path is defined
 
   - name: Undefine default pool
     virt_pool:
       command: undefine
       name: default
-    when: ansible_libvirt_pools.default.path is defined 
+    when: ansible_libvirt_pools.default.path is defined
 
   - name: Define default pool from template
     virt_pool:
@@ -76,8 +76,10 @@
 
   - name: Allow connections to NFS in the firewall
     firewalld:
+      zone: FedoraWorkstation
       service: "{{ item }}"
       permanent: true
+      immediate: true
       state: enabled
     with_items:
     - nfs