diff --git a/openstreetmap-carto.lua b/openstreetmap-carto.lua
index a645caed5a..46f1a7471f 100644
--- a/openstreetmap-carto.lua
+++ b/openstreetmap-carto.lua
@@ -46,6 +46,7 @@ local linestring_values = {
     man_made = {breakwater = true, cutline = true, embankment = true, groyne = true, pipeline = true},
     natural = {cliff = true, earth_bank = true, tree_row = true, ridge = true, arete = true},
     power = {cable = true, line = true, minor_line = true},
+    roller_coaster = {track = true},
     tourism = {yes = true},
     waterway = {canal = true, derelict_canal = true, ditch = true, drain = true, river = true, stream = true, tidal_channel = true, wadi = true, weir = true}
 }
@@ -227,9 +228,6 @@ local roads_info = {
         construction    = {z = 400, roads = false},
         platform        = {z = 90,  roads = false},
     },
-    roller_coaster = {
-        track           = {z = 300, roads = true},
-    },
     aeroway = {
         runway          = {z = 60,  roads = false},
         taxiway         = {z = 50,  roads = false},
diff --git a/openstreetmap-carto.style b/openstreetmap-carto.style
index 3006ab096a..0a30add22d 100644
--- a/openstreetmap-carto.style
+++ b/openstreetmap-carto.style
@@ -41,7 +41,6 @@ node,way   railway      text         linear
 node,way   ref          text         linear
 node,way   religion     text         linear
 way        route        text         linear
-way        roller_coaster      text  linear
 way        service      text         linear
 node,way   shop         text         polygon
 way        surface      text         linear
diff --git a/project.mml b/project.mml
index 75813f69b6..92bca8c726 100644
--- a/project.mml
+++ b/project.mml
@@ -1014,11 +1014,10 @@ Layer:
         (SELECT
             way,
             roller_coaster,
-            CASE WHEN (tunnel = 'yes' OR tunnel = 'building_passage' OR covered = 'yes') THEN 'yes' ELSE 'no' END AS tunnel,
-            name
-          FROM planet_osm_line l
+            CASE WHEN (tunnel = 'yes' OR tunnel = 'building_passage' OR covered = 'yes') THEN 'yes' ELSE 'no' END AS tunnel
+          FROM planet_osm_line
           ORDER BY
-            COALESCE(layer, 0) -- put top layered track first
+            COALESCE(layer, 0) -- put bottom layered track first
         ) AS roller_coaster
     properties:
       minzoom: 11
@@ -1977,9 +1976,9 @@ Layer:
             way,
             roller_coaster,
             name
-          FROM planet_osm_line l
+          FROM planet_osm_line
           ORDER BY
-            COALESCE(layer, 0) -- put top layered track first
+            COALESCE(layer, 0) DESC -- put top layered track first
         ) AS roller_coaster_text_name
     properties:
       minzoom: 11