diff --git a/roles/pve-nginx-redirector/handlers/main.yml b/roles/pve-nginx-redirector/handlers/main.yml
index 44975c4..8ee23da 100644
--- a/roles/pve-nginx-redirector/handlers/main.yml
+++ b/roles/pve-nginx-redirector/handlers/main.yml
@@ -2,3 +2,7 @@
 
 - name: Restart nginx
   service: name=nginx state=restarted
+
+- name: Systemd reload
+  systemd:
+    daemon_reload: yes
diff --git a/roles/pve-nginx-redirector/tasks/main.yml b/roles/pve-nginx-redirector/tasks/main.yml
index 2a1143d..ff84ff1 100644
--- a/roles/pve-nginx-redirector/tasks/main.yml
+++ b/roles/pve-nginx-redirector/tasks/main.yml
@@ -1,10 +1,29 @@
 ---
 
-- name: Check if nginx is installed
-  stat: path=/etc/nginx
-  register: nginx
+- name: Stat nginx_binary
+  stat: path=/usr/sbin/nginx
+  register: nginx_binary
+
+- name: Install nginx-light
+  apt: name=nginx-light state=present
+  when: nginx_binary.stat.exists == False
+
+- name: Stat nginx local service file
+  stat: path=/etc/systemd/system/nginx.service
+  register: nginx_service
+
+- name: Make custom nginx.service
+  command: cp /lib/systemd/system/nginx.service /etc/systemd/system/nginx.service
+  when: nginx_service.stat.exists == False
+
+- name: Configuring nginx to start after pve populated its fuse-mounts
+  lineinfile:
+    path: /etc/systemd/system/nginx.service
+    regexp: '^After='
+    line: 'After=pve-guests.service'
+    insertafter: '^\[Unit\]'
+  notify: Systemd reload
 
 - name: Configuring nginx pve redirector 80 -> 443 -> 8006
   template: src=redirect.j2 dest=/etc/nginx/sites-enabled/redirect mode=0644
   notify: Restart nginx
-  when: nginx.stat.exists == True