diff --git a/data/categories.txt b/data/categories.txt
index 56c3dcac85..f5adc7c243 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -13769,8 +13769,7 @@ sk:5Apartmány
 fa:اپارتمان|سوئیت
 mr:सदनिका|फ्लॅट|अपार्टमेंट
 
-# [tourism=resort] is deprecated
-tourism-resort|@category_hotel
+leisure-resort|@category_hotel
 en:Resort
 ru:Дом отдыха
 bg:Курорт
diff --git a/data/editor.config b/data/editor.config
index e5d90afaac..1a7d53f183 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -579,6 +579,9 @@
       <type id="leisure-garden" can_add="no">
         <include group="poi_internet" />
       </type>
+      <type id="leisure-resort">
+        <include group="poi_internet" />
+      </type>
       <type id="leisure-sports_centre">
         <include group="poi_internet" />
       </type>
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 2315165be7..f2cbcb303c 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1197,7 +1197,7 @@ leisure|sports_centre|swimming;[leisure=sports_centre][sport=swimming];x;name;in
 leisure|sports_centre|yoga;[leisure=sports_centre][sport=yoga];x;name;int_name;1108;leisure|sports_centre
 amenity|public_bookcase;1109;
 tourism|apartment;1110;
-tourism|resort;[tourism=resort],[leisure=resort],[leisure=summer_camp];;name;int_name;1111;
+leisure|resort;[leisure=resort],[tourism=resort],[leisure=summer_camp];;name;int_name;1111;
 shop|interior_decoration;1112;
 shop|houseware;1113;
 hwtag|nobicycle;1114;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 713ae23969..8cd06959ba 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -30498,7 +30498,7 @@
     zh-Hans = 野餐地点
     zh-Hant = 野餐
 
-  [type.tourism.resort]
+  [type.leisure.resort]
     en = Resort
     af = Oord
     ar = منتجع
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 45fa8e37a5..d4ca53f38a 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -714,8 +714,8 @@ area|z16-[tourism=guest_house],
 node|z13-[tourism=alpine_hut],
 node|z16-[tourism=wilderness_hut],
 node|z16-[tourism=chalet],
-node|z16-[tourism=resort],
-area|z16-[tourism=resort],
+node|z16-[leisure=resort],
+area|z16-[leisure=resort],
 node|z16-[tourism=motel],
 area|z16-[tourism=motel],
 node|z16-[tourism=apartment],
@@ -730,8 +730,8 @@ node|z16-[tourism=caravan_site],
 
 
 node|z16[tourism=hotel],
-node|z16[tourism=resort],
-area|z16[tourism=resort],
+node|z16[leisure=resort],
+area|z16[leisure=resort],
 node|z16[tourism=motel],
 area|z16[tourism=motel]
 {icon-image: hotel-m.svg;icon-min-distance: 24;}
@@ -752,8 +752,8 @@ node|z16[tourism=chalet],
 node|z17-[tourism=hotel],
 node|z17-[tourism=motel],
 area|z17-[tourism=motel],
-node|z17-[tourism=resort],
-area|z17-[tourism=resort]
+node|z17-[leisure=resort],
+area|z17-[leisure=resort]
 {icon-image: hotel-m.svg;icon-min-distance: 16;}
 node|z17-[tourism=hostel]
 {icon-image: hostel-m.svg;icon-min-distance: 16;}
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index dc03609ee1..08d9a1c42e 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -747,7 +747,7 @@ piste:type-snow_park                                # caption z15- (also has are
 
 amenity-townhall                                    # icon z16- (also has caption(optional) z16-)
 tourism-hotel                                       # icon z16- (also has caption(optional) z16-)
-tourism-resort                                      # icon z16- (also has caption(optional) z16-)
+leisure-resort                                      # icon z16- (also has caption(optional) z16-)
 === 2750
 
 amenity-arts_centre                                 # icon z17- (also has caption(optional) z17-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 703dd448a1..f755e1ac74 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -747,7 +747,7 @@ piste:type-snow_park                                # caption z15- (also has are
 
 amenity-townhall                                    # icon z16- (also has caption(optional) z16-)
 tourism-hotel                                       # icon z16- (also has caption(optional) z16-)
-tourism-resort                                      # icon z16- (also has caption(optional) z16-)
+leisure-resort                                      # icon z16- (also has caption(optional) z16-)
 === 2750
 
 amenity-arts_centre                                 # icon z17- (also has caption(optional) z17-)
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 3a9258895f..1cb9d1168e 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -2491,6 +2491,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"leisure", "pitch"},
     {"leisure", "playground"},
     {"leisure", "recreation_ground"},
+    {"leisure", "resort"},
     {"leisure", "sauna"},
     {"leisure", "slipway"},
     {"leisure", "sports_centre"},
@@ -2700,7 +2701,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"tourism", "motel"},
     {"tourism", "museum"},
     {"tourism", "picnic_site"},
-    {"tourism", "resort"},
     {"tourism", "theme_park"},
     {"tourism", "viewpoint"},
     {"tourism", "wilderness_hut"},