diff --git a/roles/easyredmine/tasks/firewall.yml b/roles/easyredmine/tasks/firewall.yml
index 639647b..2e53b1b 100644
--- a/roles/easyredmine/tasks/firewall.yml
+++ b/roles/easyredmine/tasks/firewall.yml
@@ -26,12 +26,14 @@
     - 128.91.49.0/24
   sudo: yes
   notify: restart firewalld
+  when: is_production_vm == True
 
 - firewalld: service=ssh
              permanent=true
              state=disabled
   sudo: yes
   notify: restart firewalld
+  when: is_production_vm == True
 
 - name: restart firewalld
   service: name=firewalld
diff --git a/roles/easyredmine/tasks/main.yml b/roles/easyredmine/tasks/main.yml
index 0804d90..fc8ae36 100644
--- a/roles/easyredmine/tasks/main.yml
+++ b/roles/easyredmine/tasks/main.yml
@@ -3,7 +3,6 @@
 - include: system.yml tags=system
 
 - include: firewall.yml tags=firewall
-  when: is_production_vm == True
 
 - include: database.yml tags=database
   when: do_database_management == True