diff --git a/data/presets.yaml b/data/presets.yaml
index 660831fd6..a054dfdc1 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2098,8 +2098,6 @@ en:
       amenity/scrapyard:
         # amenity=scrapyard
         name: Scrap Yard
-        # 'terms: car,junk,metal,salvage,scrap,u-pull-it,vehicle,wreck,yard'
-        terms: '<translate with synonyms or related terms for ''Scrap Yard'', separated by commas>'
       amenity/shelter:
         # amenity=shelter
         name: Shelter
@@ -3310,6 +3308,11 @@ en:
         # landuse=industrial
         name: Industrial Area
         terms: '<translate with synonyms or related terms for ''Industrial Area'', separated by commas>'
+      landuse/industrial/scrap_yard:
+        # industrial=scrap_yard
+        name: Scrap Yard
+        # 'terms: car,junk,metal,salvage,scrap,u-pull-it,vehicle,wreck,yard'
+        terms: '<translate with synonyms or related terms for ''Scrap Yard'', separated by commas>'
       landuse/industrial/slaughterhouse:
         # industrial=slaughterhouse
         name: Slaughterhouse
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 0269b6b88..d4d5eaa4e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -590,6 +590,28 @@
             "name": "Register Office",
             "searchable": false
         },
+        "amenity/scrapyard": {
+            "icon": "car",
+            "fields": [
+                "name",
+                "operator",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "amenity": "scrapyard"
+            },
+            "reference": {
+                "key": "industrial",
+                "value": "scrap_yard"
+            },
+            "name": "Scrap Yard",
+            "searchable": false
+        },
         "amenity/swimming_pool": {
             "icon": "swimming",
             "geometry": [
@@ -2640,38 +2662,6 @@
             },
             "name": "School Grounds"
         },
-        "amenity/scrapyard": {
-            "icon": "car",
-            "fields": [
-                "name",
-                "operator",
-                "address",
-                "opening_hours"
-            ],
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "terms": [
-                "car",
-                "junk",
-                "metal",
-                "salvage",
-                "scrap",
-                "u-pull-it",
-                "vehicle",
-                "wreck",
-                "yard"
-            ],
-            "tags": {
-                "amenity": "scrapyard"
-            },
-            "reference": {
-                "key": "industrial",
-                "value": "scrap_yard"
-            },
-            "name": "Scrap Yard"
-        },
         "amenity/shelter": {
             "icon": "shelter",
             "fields": [
@@ -8157,6 +8147,46 @@
             "matchScore": 0.9,
             "name": "Industrial Area"
         },
+        "landuse/industrial/scrap_yard": {
+            "icon": "car",
+            "fields": [
+                "name",
+                "operator",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "industrial": "scrap_yard"
+            },
+            "addTags": {
+                "landuse": "industrial",
+                "industrial": "scrap_yard"
+            },
+            "removeTags": {
+                "landuse": "industrial",
+                "industrial": "scrap_yard"
+            },
+            "reference": {
+                "key": "industrial",
+                "value": "scrap_yard"
+            },
+            "terms": [
+                "car",
+                "junk",
+                "metal",
+                "salvage",
+                "scrap",
+                "u-pull-it",
+                "vehicle",
+                "wreck",
+                "yard"
+            ],
+            "name": "Scrap Yard"
+        },
         "landuse/industrial/slaughterhouse": {
             "icon": "slaughterhouse",
             "fields": [
@@ -8181,6 +8211,10 @@
                 "landuse": "industrial",
                 "industrial": "slaughterhouse"
             },
+            "reference": {
+                "key": "industrial",
+                "value": "slaughterhouse"
+            },
             "terms": [
                 "abattoir",
                 "beef",
diff --git a/data/presets/presets/amenity/_scrapyard.json b/data/presets/presets/amenity/_scrapyard.json
new file mode 100644
index 000000000..f2780ac79
--- /dev/null
+++ b/data/presets/presets/amenity/_scrapyard.json
@@ -0,0 +1,22 @@
+{
+    "icon": "car",
+    "fields": [
+        "name",
+        "operator",
+        "address",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "scrapyard"
+    },
+    "reference": {
+        "key": "industrial",
+        "value": "scrap_yard"
+    },
+    "name": "Scrap Yard",
+    "searchable": false
+}
diff --git a/data/presets/presets/amenity/scrapyard.json b/data/presets/presets/landuse/industrial/scrap_yard.json
similarity index 68%
rename from data/presets/presets/amenity/scrapyard.json
rename to data/presets/presets/landuse/industrial/scrap_yard.json
index 57fd893a8..d5b63420a 100644
--- a/data/presets/presets/amenity/scrapyard.json
+++ b/data/presets/presets/landuse/industrial/scrap_yard.json
@@ -10,6 +10,21 @@
         "point",
         "area"
     ],
+    "tags": {
+        "industrial": "scrap_yard"
+    },
+    "addTags": {
+        "landuse": "industrial",
+        "industrial": "scrap_yard"
+    },
+    "removeTags": {
+        "landuse": "industrial",
+        "industrial": "scrap_yard"
+    },
+    "reference": {
+        "key": "industrial",
+        "value": "scrap_yard"
+    },
     "terms": [
         "car",
         "junk",
@@ -21,12 +36,5 @@
         "wreck",
         "yard"
     ],
-    "tags": {
-        "amenity": "scrapyard"
-    },
-    "reference": {
-        "key": "industrial",
-        "value": "scrap_yard"
-    },
     "name": "Scrap Yard"
 }
diff --git a/data/presets/presets/landuse/industrial/slaughterhouse.json b/data/presets/presets/landuse/industrial/slaughterhouse.json
index e1e8594d5..a8063da3b 100644
--- a/data/presets/presets/landuse/industrial/slaughterhouse.json
+++ b/data/presets/presets/landuse/industrial/slaughterhouse.json
@@ -22,6 +22,10 @@
         "landuse": "industrial",
         "industrial": "slaughterhouse"
     },
+    "reference": {
+        "key": "industrial",
+        "value": "slaughterhouse"
+    },
     "terms": [
         "abattoir",
         "beef",
diff --git a/data/taginfo.json b/data/taginfo.json
index a9474c862..4867bf11e 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -139,6 +139,10 @@
             "key": "amenity",
             "value": "register_office"
         },
+        {
+            "key": "amenity",
+            "value": "scrapyard"
+        },
         {
             "key": "amenity",
             "value": "swimming_pool"
@@ -479,10 +483,6 @@
             "key": "amenity",
             "value": "school"
         },
-        {
-            "key": "amenity",
-            "value": "scrapyard"
-        },
         {
             "key": "amenity",
             "value": "shelter"
@@ -1570,6 +1570,10 @@
             "key": "landuse",
             "value": "industrial"
         },
+        {
+            "key": "industrial",
+            "value": "scrap_yard"
+        },
         {
             "key": "industrial",
             "value": "slaughterhouse"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index b1fbefd0d..cdcc5d47d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2551,6 +2551,10 @@
                     "name": "Register Office",
                     "terms": ""
                 },
+                "amenity/scrapyard": {
+                    "name": "Scrap Yard",
+                    "terms": ""
+                },
                 "amenity/swimming_pool": {
                     "name": "Swimming Pool",
                     "terms": ""
@@ -2891,10 +2895,6 @@
                     "name": "School Grounds",
                     "terms": "academy,elementary school,middle school,high school"
                 },
-                "amenity/scrapyard": {
-                    "name": "Scrap Yard",
-                    "terms": "car,junk,metal,salvage,scrap,u-pull-it,vehicle,wreck,yard"
-                },
                 "amenity/shelter": {
                     "name": "Shelter",
                     "terms": "lean-to,gazebo,picnic"
@@ -3991,6 +3991,10 @@
                     "name": "Industrial Area",
                     "terms": ""
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Scrap Yard",
+                    "terms": "car,junk,metal,salvage,scrap,u-pull-it,vehicle,wreck,yard"
+                },
                 "landuse/industrial/slaughterhouse": {
                     "name": "Slaughterhouse",
                     "terms": "abattoir,beef,butchery,calf,chicken,cow,killing house,meat,pig,pork,poultry,shambles,stockyard"