diff --git a/data/presets.yaml b/data/presets.yaml
index ca26f5bf9..b8bba211d 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2751,7 +2751,7 @@ en:
         # 'terms: pregnancy,childbirth'
         terms: '<translate with synonyms or related terms for ''Midwife'', separated by commas>'
       healthcare/specialist:
-        # healthcare=yes
+        # 'healthcare:speciality=*'
         name: Healthcare Specialist
         # 'terms: special'
         terms: '<translate with synonyms or related terms for ''Healthcare Specialist'', separated by commas>'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index a734efa83..142360f33 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -6104,7 +6104,13 @@
                 "special"
             ],
             "tags": {
-                "healthcare": "yes"
+                "healthcare:speciality": "*"
+            },
+            "addTags": {
+                "healthcare:speciality": "general"
+            },
+            "removeTags": {
+                "healthcare:speciality": "general"
             },
             "name": "Healthcare Specialist"
         },
diff --git a/data/presets/presets/healthcare/specialist.json b/data/presets/presets/healthcare/specialist.json
index 3cb29aeff..2e681677c 100644
--- a/data/presets/presets/healthcare/specialist.json
+++ b/data/presets/presets/healthcare/specialist.json
@@ -17,7 +17,13 @@
         "special"
     ],
     "tags": {
-        "healthcare": "yes"
+        "healthcare:speciality": "*"
+    },
+    "addTags": {
+        "healthcare:speciality": "general"
+    },
+    "removeTags": {
+        "healthcare:speciality": "general"
     },
     "name": "Healthcare Specialist"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index a8ff45e02..1ba570a3d 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1194,8 +1194,7 @@
             "value": "midwife"
         },
         {
-            "key": "healthcare",
-            "value": "yes"
+            "key": "healthcare:speciality"
         },
         {
             "key": "highway",