diff --git a/roles/webserver/tasks/main.yml b/roles/webserver/tasks/main.yml
index cc1504c..aa8c769 100644
--- a/roles/webserver/tasks/main.yml
+++ b/roles/webserver/tasks/main.yml
@@ -223,6 +223,9 @@
     - uwsgi
     - rh-nginx114-nginx
 
+- name: Populate service facts
+  service_facts:
+
 - name: Open webserver ports on firewall
   firewalld:
     service: '{{ item }}'
@@ -232,4 +235,4 @@
   loop:
     - http
     - https
-  when: vagrant_dir.stat.exists == False
+  when: ansible_facts.services['firewalld.service'] is defined and ansible_facts.services['firewalld.service'].state == 'running'