diff --git a/data/deprecated.json b/data/deprecated.json
index 828bc8251..b1702d01c 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -1988,5 +1988,25 @@
   {
     "old": {"industrial": "brickworks"},
     "replace": {"industrial": "brickyard"}
+  },
+  {
+    "old": {"cycleway": "yes"},
+    "replace": {"cycleway:both": "yes"}
+  },
+  {
+    "old": {"cycleway": "no"},
+    "replace": {"cycleway:both": "no"}
+  },
+  {
+    "old": {"cycleway": "separate"},
+    "replace": {"cycleway:both": "separate"}
+  },
+  {
+    "old": {"cycleway": "track"},
+    "replace": {"cycleway:both": "track"}
+  },
+  {
+    "old": {"cycleway": "lane"},
+    "replace": {"cycleway:both": "lane"}
   }
 ]
diff --git a/data/fields/cycleway.json b/data/fields/cycleway.json
index 372e929d7..f701c7282 100644
--- a/data/fields/cycleway.json
+++ b/data/fields/cycleway.json
@@ -1,5 +1,5 @@
 {
-    "key": "cycleway",
+    "key": "cycleway:both",
     "keys": [
         "cycleway:left",
         "cycleway:right"
diff --git a/data/presets/highway/living_street.json b/data/presets/highway/living_street.json
index de43f1d4a..ab39d1311 100644
--- a/data/presets/highway/living_street.json
+++ b/data/presets/highway/living_street.json
@@ -2,6 +2,7 @@
     "icon": "iD-highway-living-street",
     "fields": [
         "name",
+        "cycleway",
         "oneway",
         "maxspeed",
         "lanes",
@@ -14,7 +15,6 @@
         "covered_no",
         "bicycle_road",
         "cyclestreet-BE-NL",
-        "cycleway",
         "flood_prone",
         "junction_line",
         "lit",
diff --git a/data/presets/highway/primary.json b/data/presets/highway/primary.json
index 0b269dbd2..6c9cdb874 100644
--- a/data/presets/highway/primary.json
+++ b/data/presets/highway/primary.json
@@ -2,6 +2,7 @@
     "icon": "iD-highway-primary",
     "fields": [
         "name",
+        "cycleway",
         "oneway",
         "maxspeed",
         "lanes",
@@ -14,7 +15,6 @@
         "bridge/ref",
         "charge_toll",
         "covered_no",
-        "cycleway",
         "expressway-US",
         "flood_prone",
         "incline",
diff --git a/data/presets/highway/primary_link.json b/data/presets/highway/primary_link.json
index 82fbb450f..9929255f4 100644
--- a/data/presets/highway/primary_link.json
+++ b/data/presets/highway/primary_link.json
@@ -2,6 +2,7 @@
     "name": "Primary Link",
     "icon": "iD-highway-primary-link",
     "fields": [
+        "cycleway",
         "destination_oneway",
         "destination/ref_oneway",
         "oneway",
@@ -15,7 +16,6 @@
         "bridge/ref",
         "charge_toll",
         "covered_no",
-        "cycleway",
         "destination/symbol_oneway",
         "flood_prone",
         "incline",
diff --git a/data/presets/highway/residential.json b/data/presets/highway/residential.json
index ee990b523..493f406e8 100644
--- a/data/presets/highway/residential.json
+++ b/data/presets/highway/residential.json
@@ -2,6 +2,7 @@
     "icon": "iD-highway-residential",
     "fields": [
         "name",
+        "cycleway",
         "oneway",
         "maxspeed",
         "lanes",
@@ -12,7 +13,6 @@
     "moreFields": [
         "bridge/ref",
         "covered_no",
-        "cycleway",
         "bicycle_road",
         "cyclestreet-BE-NL",
         "flood_prone",