diff --git a/features/accelerometer.yml b/features/accelerometer.yml
index 883a7f4e02e..682390c634e 100644
--- a/features/accelerometer.yml
+++ b/features/accelerometer.yml
@@ -18,3 +18,16 @@ compat_features:
   - api.LinearAccelerationSensor.LinearAccelerationSensor
   - api.Permissions.permission_accelerometer
   - http.headers.Permissions-Policy.accelerometer
+# Enable when overlapping keys are allowed, https://github.com/web-platform-dx/web-features/issues/1173
+#  - api.Sensor
+#  - api.Sensor.activate_event
+#  - api.Sensor.activated
+#  - api.Sensor.error_event
+#  - api.Sensor.hasReading
+#  - api.Sensor.reading_event
+#  - api.Sensor.start
+#  - api.Sensor.stop
+#  - api.Sensor.timestamp
+#  - api.SensorErrorEvent
+#  - api.SensorErrorEvent.SensorErrorEvent
+#  - api.SensorErrorEvent.error
diff --git a/features/ambient-light.yml b/features/ambient-light.yml
index 80b02bc7ff0..bc0b0b083ec 100644
--- a/features/ambient-light.yml
+++ b/features/ambient-light.yml
@@ -9,3 +9,16 @@ compat_features:
   - api.Permissions.permission_ambient-light-sensor
   - html.elements.iframe.allow.ambient-light-sensor
   - http.headers.Permissions-Policy.ambient-light-sensor
+# Enable when overlapping keys are allowed, https://github.com/web-platform-dx/web-features/issues/1173
+#  - api.Sensor
+#  - api.Sensor.activate_event
+#  - api.Sensor.activated
+#  - api.Sensor.error_event
+#  - api.Sensor.hasReading
+#  - api.Sensor.reading_event
+#  - api.Sensor.start
+#  - api.Sensor.stop
+#  - api.Sensor.timestamp
+#  - api.SensorErrorEvent
+#  - api.SensorErrorEvent.SensorErrorEvent
+#  - api.SensorErrorEvent.error
diff --git a/features/draft/spec/generic-sensor.yml b/features/draft/spec/generic-sensor.yml
deleted file mode 100644
index d58b396309a..00000000000
--- a/features/draft/spec/generic-sensor.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-draft_date: 2024-11-27
-name: Generic Sensor API
-description: TODO
-spec: https://w3c.github.io/sensors/
-compat_features:
-  - api.Sensor
-  - api.Sensor.activate_event
-  - api.Sensor.activated
-  - api.Sensor.error_event
-  - api.Sensor.hasReading
-  - api.Sensor.reading_event
-  - api.Sensor.start
-  - api.Sensor.stop
-  - api.Sensor.timestamp
-  - api.SensorErrorEvent
-  - api.SensorErrorEvent.SensorErrorEvent
-  - api.SensorErrorEvent.error
-  - html.elements.iframe.allow.accelerometer
-  - html.elements.iframe.allow.magnetometer
-  - http.headers.Permissions-Policy.magnetometer
-
-# The following features in the spec are already part of web-features:
-# - Ambient light sensor:
-#   - html.elements.iframe.allow.ambient-light-sensor
-#   - http.headers.Permissions-Policy.ambient-light-sensor
-# - Gyroscope:
-#   - html.elements.iframe.allow.gyroscope
-#   - http.headers.Permissions-Policy.gyroscope
-# - Accelerometer:
-#   - http.headers.Permissions-Policy.accelerometer
-# - Virtual sensors:
-#   - webdriver.commands.CreateVirtualSensor
-#   - webdriver.commands.DeleteVirtualSensor
-#   - webdriver.commands.GetVirtualSensorInformation
-#   - webdriver.commands.UpdateVirtualSensorReading
diff --git a/features/draft/spec/generic-sensor.yml.dist b/features/draft/spec/generic-sensor.yml.dist
deleted file mode 100644
index 8014e3ba5af..00000000000
--- a/features/draft/spec/generic-sensor.yml.dist
+++ /dev/null
@@ -1,43 +0,0 @@
-# Generated from: generic-sensor.yml
-# Do not edit this file by hand. Edit the source file instead!
-
-status:
-  baseline: false
-  support:
-    chrome: "88"
-    chrome_android: "88"
-    edge: "88"
-compat_features:
-  # baseline: false
-  # support:
-  #   chrome: "66"
-  #   chrome_android: "66"
-  #   edge: "79"
-  - html.elements.iframe.allow.accelerometer
-  - html.elements.iframe.allow.magnetometer
-
-  # baseline: false
-  # support:
-  #   chrome: "67"
-  #   chrome_android: "67"
-  #   edge: "79"
-  - api.Sensor
-  - api.Sensor.activate_event
-  - api.Sensor.activated
-  - api.Sensor.error_event
-  - api.Sensor.hasReading
-  - api.Sensor.reading_event
-  - api.Sensor.start
-  - api.Sensor.stop
-  - api.Sensor.timestamp
-  - api.SensorErrorEvent
-  - api.SensorErrorEvent.SensorErrorEvent
-  - api.SensorErrorEvent.error
-
-  # ⬇️ Same status as overall feature ⬇️
-  # baseline: false
-  # support:
-  #   chrome: "88"
-  #   chrome_android: "88"
-  #   edge: "88"
-  - http.headers.Permissions-Policy.magnetometer
diff --git a/features/gyroscope.yml b/features/gyroscope.yml
index 240de483bbf..3fca269fa0a 100644
--- a/features/gyroscope.yml
+++ b/features/gyroscope.yml
@@ -13,3 +13,16 @@ compat_features:
   - api.Permissions.permission_gyroscope
   - html.elements.iframe.allow.gyroscope
   - http.headers.Permissions-Policy.gyroscope
+# Enable when overlapping keys are allowed, https://github.com/web-platform-dx/web-features/issues/1173
+#  - api.Sensor
+#  - api.Sensor.activate_event
+#  - api.Sensor.activated
+#  - api.Sensor.error_event
+#  - api.Sensor.hasReading
+#  - api.Sensor.reading_event
+#  - api.Sensor.start
+#  - api.Sensor.stop
+#  - api.Sensor.timestamp
+#  - api.SensorErrorEvent
+#  - api.SensorErrorEvent.SensorErrorEvent
+#  - api.SensorErrorEvent.error
diff --git a/features/orientation-sensor.yml b/features/orientation-sensor.yml
index cf83d428375..64523350fae 100644
--- a/features/orientation-sensor.yml
+++ b/features/orientation-sensor.yml
@@ -12,3 +12,15 @@ compat_features:
   - api.AbsoluteOrientationSensor.AbsoluteOrientationSensor
   - api.RelativeOrientationSensor
   - api.RelativeOrientationSensor.RelativeOrientationSensor
+  - api.Sensor
+  - api.Sensor.activate_event
+  - api.Sensor.activated
+  - api.Sensor.error_event
+  - api.Sensor.hasReading
+  - api.Sensor.reading_event
+  - api.Sensor.start
+  - api.Sensor.stop
+  - api.Sensor.timestamp
+  - api.SensorErrorEvent
+  - api.SensorErrorEvent.SensorErrorEvent
+  - api.SensorErrorEvent.error
diff --git a/features/orientation-sensor.yml.dist b/features/orientation-sensor.yml.dist
index a01a6a1e891..86615b538d4 100644
--- a/features/orientation-sensor.yml.dist
+++ b/features/orientation-sensor.yml.dist
@@ -15,3 +15,15 @@ compat_features:
   - api.OrientationSensor.quaternion
   - api.RelativeOrientationSensor
   - api.RelativeOrientationSensor.RelativeOrientationSensor
+  - api.Sensor
+  - api.Sensor.activate_event
+  - api.Sensor.activated
+  - api.Sensor.error_event
+  - api.Sensor.hasReading
+  - api.Sensor.reading_event
+  - api.Sensor.start
+  - api.Sensor.stop
+  - api.Sensor.timestamp
+  - api.SensorErrorEvent
+  - api.SensorErrorEvent.SensorErrorEvent
+  - api.SensorErrorEvent.error