diff --git a/bundles/bird/metadata.py b/bundles/bird/metadata.py
index 43d6af4..bc6be9a 100644
--- a/bundles/bird/metadata.py
+++ b/bundles/bird/metadata.py
@@ -24,7 +24,7 @@ defaults = {
     },
     'sysctl': {
         'options': {
-            'net.ipv4.ip_forward': '1',
+            'net.ipv4.conf.all.forwarding': '1',
             'net.ipv6.conf.all.forwarding': '1',
         },
     },
diff --git a/nodes/home/nas.py b/nodes/home/nas.py
index 8832b6e..20e2679 100644
--- a/nodes/home/nas.py
+++ b/nodes/home/nas.py
@@ -192,12 +192,6 @@ nodes['home.nas'] = {
                 #'/dev/disk/by-id/ata-TS64GSSD370_B807810527',
             },
         },
-        'sysctl': {
-            'options': {
-                # XXX find out if this is really needed
-                'net.ipv4.ip_forward': '1',
-            },
-        },
         'systemd-networkd': {
             'bridges': {
                 'br0': {
diff --git a/nodes/htz-cloud/miniserver.py b/nodes/htz-cloud/miniserver.py
index 73c7b2b..cda134f 100644
--- a/nodes/htz-cloud/miniserver.py
+++ b/nodes/htz-cloud/miniserver.py
@@ -220,7 +220,7 @@ nodes['htz-cloud.miniserver'] = {
         'sysctl': {
             'options': {
                 # XXX find out if this is really needed
-                'net.ipv4.ip_forward': '1',
+                'net.ipv4.conf.all.forwarding': '1',
                 'net.ipv6.conf.all.forwarding': '1',
             },
         },
diff --git a/nodes/kunsi-p14s.py b/nodes/kunsi-p14s.py
index 017c1ed..0bad208 100644
--- a/nodes/kunsi-p14s.py
+++ b/nodes/kunsi-p14s.py
@@ -156,7 +156,7 @@ nodes['kunsi-p14s'] = {
         },
         'sysctl': {
             'options': {
-                'net.ipv4.ip_forward': '1',
+                'net.ipv4.conf.all.forwarding': '1',
             },
         },
         'systemd-networkd': {