diff --git a/data/presets.yaml b/data/presets.yaml
index c3531a254..aa1b17b88 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1541,7 +1541,7 @@ en:
         name: Courthouse
         terms: '<translate with synonyms or related terms for ''Courthouse'', separated by commas>'
       amenity/coworking_space:
-        # office=coworking
+        # amenity=coworking_space
         name: Coworking Space
       amenity/crematorium:
         # amenity=crematorium
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4bb0a7141..3c043a244 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -507,7 +507,7 @@
                 "area"
             ],
             "tags": {
-                "office": "coworking"
+                "amenity": "coworking_space"
             },
             "name": "Coworking Space",
             "searchable": false
diff --git a/data/presets/presets/amenity/_coworking_space.json b/data/presets/presets/amenity/_coworking_space.json
index 876080d71..41a7006ff 100644
--- a/data/presets/presets/amenity/_coworking_space.json
+++ b/data/presets/presets/amenity/_coworking_space.json
@@ -13,7 +13,7 @@
         "area"
     ],
     "tags": {
-        "office": "coworking"
+        "amenity": "coworking_space"
     },
     "name": "Coworking Space",
     "searchable": false
diff --git a/data/taginfo.json b/data/taginfo.json
index ae078eeff..3ac19b3ec 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -128,8 +128,8 @@
             "value": "terminal"
         },
         {
-            "key": "office",
-            "value": "coworking"
+            "key": "amenity",
+            "value": "coworking_space"
         },
         {
             "key": "amenity",