diff --git a/tiles/src/main/java/com/protomaps/basemap/layers/Roads.java b/tiles/src/main/java/com/protomaps/basemap/layers/Roads.java
index 57a7e537..24adb5f3 100644
--- a/tiles/src/main/java/com/protomaps/basemap/layers/Roads.java
+++ b/tiles/src/main/java/com/protomaps/basemap/layers/Roads.java
@@ -199,17 +199,20 @@ public Roads(CountryCoder countryCoder) {
           trunk
           trunk_link
         """),
-      use("minZoom", 7)
+      use("minZoom", 7),
+      use("kind", "major_road")
     ),
     rule(
       with("_country", "US"),
       with("_r_network_US:US"),
-      use("minZoom", 6)
+      use("minZoom", 6),
+      use("kind", "major_road")
     ),
     rule(
       with("_country", "US"),
       with("_r_network_US:I"),
-      use("minZoom", 3)
+      use("minZoom", 3),
+      use("kind", "highway")
     )
   )).index();
 
diff --git a/tiles/src/test/java/com/protomaps/basemap/layers/RoadsTest.java b/tiles/src/test/java/com/protomaps/basemap/layers/RoadsTest.java
index 024a19f9..3cfb4445 100644
--- a/tiles/src/test/java/com/protomaps/basemap/layers/RoadsTest.java
+++ b/tiles/src/test/java/com/protomaps/basemap/layers/RoadsTest.java
@@ -201,7 +201,7 @@ void testHighways(String highway, String kind, String kindDetail, int genericMin
 
     // US
     assertFeatures(12,
-      List.of(Map.of("kind", kind,
+      List.of(Map.of("kind", highway.startsWith("motorway") ? "major_road" : kind,
         "kind_detail", kindDetail,
         "_minzoom", usMinZoom
       )),
@@ -213,7 +213,7 @@ void testHighways(String highway, String kind, String kindDetail, int genericMin
 
     // US with relation US:US
     assertFeatures(12,
-      List.of(Map.of("kind", kind,
+      List.of(Map.of("kind", "major_road",
         "kind_detail", kindDetail,
         "_minzoom", 6
       )),
@@ -225,7 +225,7 @@ void testHighways(String highway, String kind, String kindDetail, int genericMin
 
     // US with relation US:I
     assertFeatures(12,
-      List.of(Map.of("kind", kind,
+      List.of(Map.of("kind", "highway",
         "kind_detail", kindDetail,
         "_minzoom", 3
       )),