diff --git a/playbooks/gateways.yml b/playbooks/gateways.yml
index 79dbfc0..163d615 100755
--- a/playbooks/gateways.yml
+++ b/playbooks/gateways.yml
@@ -7,7 +7,7 @@
   - server-apt-repos
   - server-basic
   - users
-  - system-sysctl-gateway
+  - system-sysctl
   - git-repos
   - service-haveged
   - service-ntpd
diff --git a/roles/system-sysctl-gateway/README.md b/roles/system-sysctl-gateway/README.md
deleted file mode 100644
index 3570115..0000000
--- a/roles/system-sysctl-gateway/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Ansible role system-sysctl-gateway
-Diese Ansible role setzt Freifunk Gateway spezifische sysctl-Parameter.
-
-## Benötigte Variablen
-- List `sysctl_settings_gateway` (Rollen-Variable)
-
-```
-sysctl_settings_gateway:
-  - name:	# sysctl-Parameter
-    value:      # zu setzender Wert
-...
-```
diff --git a/roles/system-sysctl/README.md b/roles/system-sysctl/README.md
new file mode 100644
index 0000000..45dc59e
--- /dev/null
+++ b/roles/system-sysctl/README.md
@@ -0,0 +1,12 @@
+# Ansible role system-sysctl
+Diese Ansible role setzt Freifunk spezifische sysctl-Parameter.
+
+## Benötigte Variablen
+- List `sysctl_settings` (Rollen-Variable)
+
+```
+sysctl_settings:
+  - name:	# sysctl-Parameter
+    value:      # zu setzender Wert
+...
+```
diff --git a/roles/system-sysctl-gateway/tasks/main.yml b/roles/system-sysctl/tasks/main.yml
similarity index 84%
rename from roles/system-sysctl-gateway/tasks/main.yml
rename to roles/system-sysctl/tasks/main.yml
index 9dadc68..b156b00 100644
--- a/roles/system-sysctl-gateway/tasks/main.yml
+++ b/roles/system-sysctl/tasks/main.yml
@@ -1,10 +1,10 @@
 ---
-- name: set freifunk gateway sysctl settings
+- name: set freifunk sysctl settings
   sysctl:
     name: "{{ item.name }}"
     value: "{{ item.value }}"
     state: present
-  with_items: "{{ sysctl_settings_gateway }}"
+  with_items: "{{ sysctl_settings }}"
 
 - name: create systemd override dir for systemd-sysctl.service
   file:
diff --git a/roles/system-sysctl-gateway/templates/systemd_sysctl_service_overrides.j2 b/roles/system-sysctl/templates/systemd_sysctl_service_overrides.j2
similarity index 100%
rename from roles/system-sysctl-gateway/templates/systemd_sysctl_service_overrides.j2
rename to roles/system-sysctl/templates/systemd_sysctl_service_overrides.j2
diff --git a/roles/system-sysctl-gateway/vars/main.yml b/roles/system-sysctl/vars/main.yml
similarity index 94%
rename from roles/system-sysctl-gateway/vars/main.yml
rename to roles/system-sysctl/vars/main.yml
index 77211d4..2453b5b 100644
--- a/roles/system-sysctl-gateway/vars/main.yml
+++ b/roles/system-sysctl/vars/main.yml
@@ -1,5 +1,5 @@
 ---
-sysctl_settings_gateway:
+sysctl_settings:
   - name: net.ipv4.neigh.default.gc_thresh1
     value: 1024
   - name: net.ipv4.neigh.default.gc_thresh2