diff --git a/data/presets.yaml b/data/presets.yaml
index 70d00e176..20d56fd49 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -910,26 +910,9 @@ en:
       service:
         # service=*
         label: Type
-      service/bicycle/chain_tool:
-        # 'service:bicycle:chain_tool=*'
-        label: Chain Tool
-        options:
-          # 'service:bicycle:chain_tool=no'
-          'no': 'No'
-          # 'service:bicycle:chain_tool=undefined'
-          undefined: Assumed to be No
-          # 'service:bicycle:chain_tool=yes'
-          'yes': 'Yes'
-      service/bicycle/pump:
-        # 'service:bicycle:pump=*'
-        label: Air Pump
-        options:
-          # 'service:bicycle:pump=no'
-          'no': 'No'
-          # 'service:bicycle:pump=undefined'
-          undefined: Assumed to be No
-          # 'service:bicycle:pump=yes'
-          'yes': 'Yes'
+      service/bicycle:
+        # 'service:bicycle:=*'
+        label: Services
       service_rail:
         # service=*
         label: Service Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 1b11e2174..34dd4eb19 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -1222,29 +1222,10 @@
                 "drive-through"
             ]
         },
-        "service/bicycle/chain_tool": {
-            "key": "service:bicycle:chain_tool",
-            "type": "check",
-            "label": "Chain Tool",
-            "strings": {
-                "options": {
-                    "undefined": "Assumed to be No",
-                    "yes": "Yes",
-                    "no": "No"
-                }
-            }
-        },
-        "service/bicycle/pump": {
-            "key": "service:bicycle:pump",
-            "type": "check",
-            "label": "Air Pump",
-            "strings": {
-                "options": {
-                    "undefined": "Assumed to be No",
-                    "yes": "Yes",
-                    "no": "No"
-                }
-            }
+        "service/bicycle": {
+            "key": "service:bicycle:",
+            "type": "multiCombo",
+            "label": "Services"
         },
         "shelter_type": {
             "key": "shelter_type",
diff --git a/data/presets/fields/service/bicycle.json b/data/presets/fields/service/bicycle.json
new file mode 100644
index 000000000..195c81454
--- /dev/null
+++ b/data/presets/fields/service/bicycle.json
@@ -0,0 +1,5 @@
+{
+    "key": "service:bicycle:",
+    "type": "multiCombo",
+    "label": "Services"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index b0e59990b..e26d27ccf 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -653,8 +653,7 @@
                 "brand",
                 "opening_hours",
                 "fee",
-                "service/bicycle/chain_tool",
-                "service/bicycle/pump"
+                "service/bicycle"
             ],
             "geometry": [
                 "point",
@@ -8624,7 +8623,8 @@
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "service/bicycle"
             ],
             "geometry": [
                 "point",
diff --git a/data/presets/presets/amenity/bicycle_repair_station.json b/data/presets/presets/amenity/bicycle_repair_station.json
index f5411582c..717affe47 100644
--- a/data/presets/presets/amenity/bicycle_repair_station.json
+++ b/data/presets/presets/amenity/bicycle_repair_station.json
@@ -5,8 +5,7 @@
         "brand",
         "opening_hours",
         "fee",
-        "service/bicycle/chain_tool",
-        "service/bicycle/pump"
+        "service/bicycle"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/shop/bicycle.json b/data/presets/presets/shop/bicycle.json
index 80a46b8a4..290a3f8c1 100644
--- a/data/presets/presets/shop/bicycle.json
+++ b/data/presets/presets/shop/bicycle.json
@@ -4,7 +4,8 @@
         "operator",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "service/bicycle"
     ],
     "geometry": [
         "point",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 1ecb70639..0e39ccb05 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1409,21 +1409,8 @@
                 "service": {
                     "label": "Type"
                 },
-                "service/bicycle/chain_tool": {
-                    "label": "Chain Tool",
-                    "options": {
-                        "undefined": "Assumed to be No",
-                        "yes": "Yes",
-                        "no": "No"
-                    }
-                },
-                "service/bicycle/pump": {
-                    "label": "Air Pump",
-                    "options": {
-                        "undefined": "Assumed to be No",
-                        "yes": "Yes",
-                        "no": "No"
-                    }
+                "service/bicycle": {
+                    "label": "Services"
                 },
                 "shelter_type": {
                     "label": "Type"