diff --git a/roles/hcloud/templates/firewall-awx.json.j2 b/roles/hcloud/templates/firewall-awx.json.j2
index 1d6ce91..0ddedbd 100644
--- a/roles/hcloud/templates/firewall-awx.json.j2
+++ b/roles/hcloud/templates/firewall-awx.json.j2
@@ -8,11 +8,7 @@
       "protocol": "tcp",
       "port": "32000",
       "source_ips": [
-        "149.233.6.129/32",
-        "212.121.131.106/32",
-        "79.215.1.110/32",
-        "212.86.56.112/32",
-        "159.69.46.214/32"
+        "159.69.46.214/32",
       ],
       "destination_ips": [
       ]
diff --git a/roles/hcloud/templates/firewall-default.json.j2 b/roles/hcloud/templates/firewall-default.json.j2
index 078893f..8e887a0 100644
--- a/roles/hcloud/templates/firewall-default.json.j2
+++ b/roles/hcloud/templates/firewall-default.json.j2
@@ -20,10 +20,10 @@
       "port": "22",
       "source_ips": [
         "149.233.6.129/32",
-        "212.121.131.106/32",
         "162.55.214.230/32",
-        "79.215.1.110/32",
-        "212.86.56.112/32"
+        "212.121.131.106/32",
+        "212.86.56.112/32",
+        "87.141.83.195/32"
       ],
       "destination_ips": [
       ]
@@ -34,10 +34,10 @@
       "port": "80",
       "source_ips": [
         "149.233.6.129/32",
-        "212.121.131.106/32",
         "162.55.214.230/32",
-        "79.215.1.110/32",
-        "212.86.56.112/32"
+        "212.121.131.106/32",
+        "212.86.56.112/32",
+        "87.141.83.195/32"
       ],
       "destination_ips": [
       ]
@@ -48,10 +48,10 @@
       "port": "443",
       "source_ips": [
         "149.233.6.129/32",
-        "212.121.131.106/32",
         "162.55.214.230/32",
-        "79.215.1.110/32",
-        "212.86.56.112/32"
+        "212.121.131.106/32",
+        "212.86.56.112/32",
+        "87.141.83.195/32"
       ],
       "destination_ips": [
       ]
diff --git a/roles/hcloud/templates/firewall-kibana.json.j2 b/roles/hcloud/templates/firewall-kibana.json.j2
index f0bb0da..3401c58 100644
--- a/roles/hcloud/templates/firewall-kibana.json.j2
+++ b/roles/hcloud/templates/firewall-kibana.json.j2
@@ -10,8 +10,31 @@
       "source_ips": [
         "149.233.6.129/32",
         "212.121.131.106/32",
-        "79.215.1.110/32",
-        "212.86.56.112/32"
+        "87.141.83.195/32"
+      ],
+      "destination_ips": [
+      ]
+    },
+    {
+      "direction": "in",
+      "protocol": "tcp",
+      "port": "9200",
+      "source_ips": [
+        "149.233.6.129/32",
+        "212.121.131.106/32",
+        "87.141.83.195/32"
+      ],
+      "destination_ips": [
+      ]
+    },
+    {
+      "direction": "in",
+      "protocol": "tcp",
+      "port": "9300",
+      "source_ips": [
+        "149.233.6.129/32",
+        "212.121.131.106/32",
+        "87.141.83.195/32"
       ],
       "destination_ips": [
       ]
diff --git a/roles/hcloud/templates/firewall-monitoring.json.j2 b/roles/hcloud/templates/firewall-monitoring.json.j2
index 47391e0..887e639 100644
--- a/roles/hcloud/templates/firewall-monitoring.json.j2
+++ b/roles/hcloud/templates/firewall-monitoring.json.j2
@@ -10,8 +10,22 @@
       "source_ips": [
         "149.233.6.129/32",
         "212.121.131.106/32",
-        "79.215.1.110/32",
         "212.86.56.112/32",
+        "87.141.83.195/32",
+        "94.130.97.253/32"
+      ],
+      "destination_ips": [
+      ]
+    },
+    {
+      "direction": "in",
+      "protocol": "tcp",
+      "port": "9001",
+      "source_ips": [
+        "149.233.6.129/32",
+        "212.121.131.106/32",
+        "212.86.56.112/32",
+        "87.141.83.195/32",
         "94.130.97.253/32"
       ],
       "destination_ips": [
@@ -24,8 +38,22 @@
       "source_ips": [
         "149.233.6.129/32",
         "212.121.131.106/32",
-        "79.215.1.110/32",
         "212.86.56.112/32",
+        "87.141.83.195/32",
+        "94.130.97.253/32"
+      ],
+      "destination_ips": [
+      ]
+    },
+    {
+      "direction": "in",
+      "protocol": "tcp",
+      "port": "80",
+      "source_ips": [
+        "149.233.6.129/32",
+        "212.121.131.106/32",
+        "212.86.56.112/32",
+        "87.141.83.195/32",
         "94.130.97.253/32"
       ],
       "destination_ips": [