diff --git a/bird.conf b/bird.conf
index c10e243..3c587b5 100644
--- a/bird.conf
+++ b/bird.conf
@@ -13,7 +13,7 @@ protocol static {
 }
 
 include "/etc/bird/local4.conf";
-#include "/etc/bird/filter4.conf";
+include "/etc/bird/filter4.conf";
 include "/etc/bird/community_filters.conf";
 
 protocol kernel {
diff --git a/bird6.conf b/bird6.conf
index 03f8eac..809720d 100644
--- a/bird6.conf
+++ b/bird6.conf
@@ -13,7 +13,7 @@ protocol static {
 }
 
 include "/etc/bird/local6.conf";
-#include "/etc/bird/filter6.conf";
+include "/etc/bird/filter6.conf";
 include "/etc/bird/community_filters.conf";
 
 protocol kernel {
diff --git a/filter4.conf b/filter4.conf
new file mode 100644
index 0000000..e229132
--- /dev/null
+++ b/filter4.conf
@@ -0,0 +1,17 @@
+function is_self_net() {
+  return net ~ [172.20.170.192/27+];
+}
+
+function is_valid_network() {
+  return net ~ [
+    172.20.0.0/14{21,29}, # dn42
+    172.20.0.0/24{28,32}, # dn42 Anycast
+    172.21.0.0/24{28,32}, # dn42 Anycast
+    172.22.0.0/24{28,32}, # dn42 Anycast
+    172.23.0.0/24{28,32}, # dn42 Anycast
+    172.31.0.0/16+,       # ChaosVPN
+    10.100.0.0/14+,       # ChaosVPN
+    10.0.0.0/8{15,24}     # Freifunk.net
+  ];
+}
+
diff --git a/filter6.conf b/filter6.conf
new file mode 100644
index 0000000..c7a61d0
--- /dev/null
+++ b/filter6.conf
@@ -0,0 +1,10 @@
+function is_self_net() {
+  return net ~ [fd62:77fb:94bf::/48+];
+}
+
+function is_valid_network() {
+  return net ~ [
+    fd00::/8{44,64} # ULA address space as per RFC 4193
+  ];
+}
+
diff --git a/local4-template.conf b/local4-template.conf
index 1272c33..630c96f 100644
--- a/local4-template.conf
+++ b/local4-template.conf
@@ -1,22 +1,5 @@
-router id 172.20.170.192;
+router id <router id>;
 
 define OWNAS =  4242423934;
-define OWNIP = 172.20.170.192;
+define OWNIP = <router ip>;
 define DN42_REGION = 41;
-
-function is_self_net() {
-  return net ~ [172.20.170.192/27];
-}
-
-function is_valid_network() {
-  return net ~ [
-    172.20.0.0/14{21,29}, # dn42
-    172.20.0.0/24{28,32}, # dn42 Anycast
-    172.21.0.0/24{28,32}, # dn42 Anycast
-    172.22.0.0/24{28,32}, # dn42 Anycast
-    172.23.0.0/24{28,32}, # dn42 Anycast
-    172.31.0.0/16+,       # ChaosVPN
-    10.100.0.0/14+,       # ChaosVPN
-    10.0.0.0/8{15,24}     # Freifunk.net
-  ];
-}
diff --git a/local4.conf b/local4.conf
new file mode 100644
index 0000000..c711dea
--- /dev/null
+++ b/local4.conf
@@ -0,0 +1,5 @@
+router id 172.20.170.192;
+
+define OWNAS =  4242423934;
+define OWNIP = 172.20.170.192;
+define DN42_REGION = 41;
diff --git a/local6-template.conf b/local6-template.conf
index 8a74c8c..bf0ea51 100644
--- a/local6-template.conf
+++ b/local6-template.conf
@@ -1,15 +1,5 @@
-router id 172.20.170.192;
+router id <router id>;
 
 define OWNAS = 4242423934;
-define OWNIP = fd62:77fb:94bf::2300;
+define OWNIP = <router ip>;
 define DN42_REGION = 41;
-
-function is_self_net() {
-  return net ~ [fd62:77fb:94bf::/48+];
-}
-
-function is_valid_network() {
-  return net ~ [
-    fd00::/8{44,64} # ULA address space as per RFC 4193
-  ];
-}
diff --git a/local6.conf b/local6.conf
new file mode 100644
index 0000000..901b040
--- /dev/null
+++ b/local6.conf
@@ -0,0 +1,5 @@
+router id 172.20.170.192;
+
+define OWNAS = 4242423934;
+define OWNIP = fd62:77fb:94bf::2300;
+define DN42_REGION = 41;
diff --git a/ospf4.conf b/ospf4.conf
index 78c79d6..433a956 100644
--- a/ospf4.conf
+++ b/ospf4.conf
@@ -14,14 +14,14 @@ protocol ospf {
 }
 
 filter filter_OSPF {
-        ospf_metric1 = 1000;
+#        ospf_metric1 = 1000;
 	if is_self_net() then accept;
         else reject;
 };
 
 protocol pipe {
-	table T_OSPF4;
-	peer table master;
-	import none;
-	export filter filter_OSPF;
+	peer table T_OSPF4;
+	table master;
+	import filter filter_OSPF;
+	export none;
 }