diff --git a/protocols/cymru.conf b/protocols/cymru.conf
new file mode 100644
index 0000000..8e138c6
--- /dev/null
+++ b/protocols/cymru.conf
@@ -0,0 +1,68 @@
+ipv4 table cymru_v4;
+ipv6 table cymru_v6;
+
+filter cymru_bogons_import {
+	bgp_community.add((65332,888));
+	bgp_community.add(wk_no_export);
+
+	dest = RTD_BLACKHOLE;
+	accept;
+}
+
+template bgp cymru {
+	local as my_ripe_asn;
+	neighbor as 65332;
+
+	multihop 255;
+	password pw_cymru;
+}
+
+template bgp cymru_v4_tmpl from cymru {
+	local 31.47.232.66;
+
+	ipv4 {
+		table cymru_v4;
+
+		import filter cymru_bogons_import;
+		export none;
+	};
+}
+
+template bgp cymru_v6_tmpl from cymru {
+	local 2a09:11c0:200::1:1;
+
+	ipv6 {
+		table cymru_v6;
+
+		import filter cymru_bogons_import;
+		export none;
+	};
+}
+
+protocol bgp cymru_v4_1 from cymru_v4_tmpl {
+	description "Cymru Bogons S1 (v4)";
+
+	neighbor 38.229.6.20;
+
+	disabled yes;
+}
+
+protocol bgp cymru_v4_2 from cymru_v4_tmpl {
+	description "Cymru Bogons S2 (v4)";
+
+	neighbor 38.229.46.20;
+
+	disabled yes;
+}
+
+protocol bgp cymru_v6_1 from cymru_v6_tmpl {
+	description "Cymru Bogons S1 (v6)";
+
+	neighbor  2620:0:6B0:FF00::20;
+}
+
+protocol bgp cymru_v6_2 from cymru_v6_tmpl {
+	description "Cymru Bogons S2 (v6)";
+
+	neighbor 2620:0:6B0:8000::20;
+}
diff --git a/protocols/cymru.conf_ b/protocols/cymru.conf_
deleted file mode 100644
index be4c7a7..0000000
--- a/protocols/cymru.conf_
+++ /dev/null
@@ -1,53 +0,0 @@
-filter cymru_bogons_import {
-	bgp_community.add((65332,888));
-	dest = RTD_BLACKHOLE;
-	accept;
-}
-
-filter cymru_bogons_export {
-	reject;
-}
-
-protocol bgp bgp_cymru_v4_1 {
-	description "Cymru Bogons RS1";
-	import filter cymru_bogons_import;
-	export filter cymru_bogons_export;
-	multihop 255;
-	password "pass_here";
-	local as my_asn;
-	neighbor 38.229.66.20 as 65332;
-	source address IPv4_here;
-}
-
-protocol bgp bgp_cymru_v4_2 {
-	description "Cymru Bogons RS2";
-	import filter cymru_bogons_import;
-	export filter cymru_bogons_export;
-	multihop 255;
-	password "pass_here";
-	local as my_ripe_asn;
-	neighbor 193.231.140.82 as 65332;
-	source address IPv4_here;
-}
-
-protocol bgp bgp_cymru_v6_1 {
-	description "Cymru Bogons RS1 v6";
-	import filter cymru_bogons_import;
-	export filter cymru_bogons_export;
-	multihop 255;
-	password "pass_here";
-	local as my_ripe_asn;
-	neighbor 2620:0:6B0::26E5:4207 as 65332;
-	source address IPv6_here;
-}
-
-protocol bgp bgp_cymru_v6_2 {
-	description "Cymru Bogons RS2 v6";
-	import filter cymru_bogons_import;
-	export filter cymru_bogons_export;
-	multihop 255;
-	password "pass_here";
-	local as my_asn;
-	neighbor 2001:B30:1000:19::2 as 65332;
-	source address IPv6_here;
-}