diff --git a/grafana.yml b/grafana.yml
index 0879265c2..baee99167 100644
--- a/grafana.yml
+++ b/grafana.yml
@@ -15,14 +15,6 @@
     #  ansible.posix.selinux:
     #    policy: targeted
     #    state: permissive
-    - name: Open firewallD
-      ansible.posix.firewalld:
-        service: "{{ item }}"
-        permanent: true
-        state: enabled
-      with_items:
-        - https
-        - http
     - name: Install Dependencies
       become: true
       ansible.builtin.package:
@@ -55,6 +47,8 @@
     - grafana.grafana
   roles:
     ## Starting configuration of the operating system
+    - role: usegalaxy_eu.fw_glxeu_generic
+      become: true
     - role: geerlingguy.repo-epel # Install EPEL repository
       become: true
     - role: usegalaxy_eu.handy.os_setup
diff --git a/requirements.yaml b/requirements.yaml
index 81083f615..33051da34 100644
--- a/requirements.yaml
+++ b/requirements.yaml
@@ -153,3 +153,6 @@ roles:
   - src: https://github.com/usegalaxy-eu/ansible-traefik
     name: usegalaxy_eu.traefik
     version: 2.0.0
+  - src: https://github.com/usegalaxy-eu/ansible-fw-glxeu-generic
+    name: usegalaxy_eu.fw_glxeu_generic
+    version: 1.0.0