diff --git a/doc/user/zebra.rst b/doc/user/zebra.rst
index ef3a619853..f700d36086 100644
--- a/doc/user/zebra.rst
+++ b/doc/user/zebra.rst
@@ -1133,10 +1133,8 @@ kernel.
    - any,
    - babel,
    - bgp,
-   - connected,
    - eigrp,
    - isis,
-   - kernel,
    - nhrp,
    - openfabric,
    - ospf,
diff --git a/lib/route_types.pl b/lib/route_types.pl
index c75a866964..834cb822d2 100755
--- a/lib/route_types.pl
+++ b/lib/route_types.pl
@@ -127,9 +127,12 @@ printf "#define SHOW_ROUTE_V6_HEADER \\\n%s\n", codelist(@protosv6);
 print "\n";
 
 sub collect {
-	my ($daemon, $ipv4, $ipv6, $any) = @_;
+	my ($daemon, $ipv4, $ipv6, $any, $ip_prot) = @_;
 	my (@names, @help) = ((), ());
 	for my $p (@protos) {
+		next if ($ip_prot == 1 && $daemon eq "zebra" && $protodetail{$p}->{"cname"} eq "kernel");
+		next if ($ip_prot == 1 && $daemon eq "zebra" && $protodetail{$p}->{"cname"} eq "connected");
+		next if ($ip_prot == 1 && $daemon eq "zebra" && $protodetail{$p}->{"cname"} eq "local");
 		next if ($protodetail{$p}->{"daemon"} eq $daemon && $daemon ne "zebra");
 		next if ($protodetail{$p}->{"restrict2"} ne "" && 
 		         $protodetail{$p}->{"restrict2"} ne $daemon);
@@ -151,24 +154,24 @@ for my $daemon (sort keys %daemons) {
 	next unless ($daemons{$daemon}->{"ipv4"} || $daemons{$daemon}->{"ipv6"});
 	printf "/* %s */\n", $daemon;
 	if ($daemons{$daemon}->{"ipv4"} && $daemons{$daemon}->{"ipv6"}) {
-		my ($names, $help) = collect($daemon, 1, 1, 0);
+		my ($names, $help) = collect($daemon, 1, 1, 0, 0);
 		printf "#define FRR_REDIST_STR_%s \\\n  %s\n", uc $daemon, $names;
 		printf "#define FRR_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
 
-		($names, $help) = collect($daemon, 1, 0, 0);
+		($names, $help) = collect($daemon, 1, 0, 0, 0);
 		printf "#define FRR_IP_REDIST_STR_%s \\\n  %s\n", uc $daemon, $names;
 		printf "#define FRR_IP_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
 
-		($names, $help) = collect($daemon, 0, 1, 0);
+		($names, $help) = collect($daemon, 0, 1, 0, 0);
 		printf "#define FRR_IP6_REDIST_STR_%s \\\n  %s\n", uc $daemon, $names;
 		printf "#define FRR_IP6_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
 
 		if ($daemon eq "zebra") {
-			($names, $help) = collect($daemon, 1, 0, 1);
+			($names, $help) = collect($daemon, 1, 0, 1, 1);
 			printf "#define FRR_IP_PROTOCOL_MAP_STR_%s \\\n  %s\n", uc $daemon, $names;
 			printf "#define FRR_IP_PROTOCOL_MAP_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
 
-			($names, $help) = collect($daemon, 0, 1, 1);
+			($names, $help) = collect($daemon, 0, 1, 1, 1);
 			printf "#define FRR_IP6_PROTOCOL_MAP_STR_%s \\\n  %s\n", uc $daemon, $names;
 			printf "#define FRR_IP6_PROTOCOL_MAP_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
 		}
diff --git a/zebra/zebra_cli.c b/zebra/zebra_cli.c
index ca53eb2eb3..bb79928326 100644
--- a/zebra/zebra_cli.c
+++ b/zebra/zebra_cli.c
@@ -1983,6 +1983,10 @@ static void lib_vrf_zebra_ipv6_router_id_cli_write(struct vty *vty,
 	vty_out(vty, "ipv6 router-id %s\n", id);
 }
 
+/*
+ * Both the v4 and v6 version of this command are now limiting the
+ * usage of System route types from being considered here at all
+ */
 DEFPY_YANG (ip_protocol,
        ip_protocol_cmd,
        "[no] ip protocol " FRR_IP_PROTOCOL_MAP_STR_ZEBRA