diff --git a/features/draft/spec/push-api.yml b/features/draft/spec/push-api.yml
deleted file mode 100644
index 36cecfa4c60..00000000000
--- a/features/draft/spec/push-api.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-draft_date: 2024-09-09
-name: Push API
-description: TODO
-spec: https://w3c.github.io/push-api/
-compat_features:
-  - api.PushManager.subscribe
-  - api.PushManager.supportedContentEncodings_static
-  - api.PushMessageData.bytes
-  - api.PushSubscription.expirationTime
-  - api.PushSubscription.options
-  - api.PushSubscriptionChangeEvent
-  - api.PushSubscriptionChangeEvent.PushSubscriptionChangeEvent
-  - api.PushSubscriptionChangeEvent.newSubscription
-  - api.PushSubscriptionChangeEvent.oldSubscription
-  - api.PushSubscriptionOptions
-  - api.PushSubscriptionOptions.applicationServerKey
-  - api.PushSubscriptionOptions.userVisibleOnly
-  - api.ServiceWorkerGlobalScope.pushsubscriptionchange_event
-  - api.ServiceWorkerRegistration
-
-# The following features in the spec are already part of web-features:
-# - Push messages:
-#   - api.PushEvent
-#   - api.PushEvent.PushEvent
-#   - api.PushEvent.data
-#   - api.PushManager
-#   - api.PushManager.getSubscription
-#   - api.PushManager.permissionState
-#   - api.PushMessageData
-#   - api.PushMessageData.arrayBuffer
-#   - api.PushMessageData.blob
-#   - api.PushMessageData.json
-#   - api.PushMessageData.text
-#   - api.PushSubscription
-#   - api.PushSubscription.endpoint
-#   - api.PushSubscription.getKey
-#   - api.PushSubscription.toJSON
-#   - api.PushSubscription.unsubscribe
-#   - api.ServiceWorkerGlobalScope.push_event
-#   - api.ServiceWorkerRegistration.pushManager
diff --git a/features/draft/spec/push-api.yml.dist b/features/draft/spec/push-api.yml.dist
deleted file mode 100644
index d77b567b41d..00000000000
--- a/features/draft/spec/push-api.yml.dist
+++ /dev/null
@@ -1,103 +0,0 @@
-# Generated from: push-api.yml
-# Do not edit this file by hand. Edit the source file instead!
-
-status:
-  baseline: false
-  support:
-    safari: "18"
-compat_features:
-  # baseline: high
-  # baseline_low_date: 2018-04-30
-  # baseline_high_date: 2020-10-30
-  # support:
-  #   chrome: "40"
-  #   chrome_android: "40"
-  #   edge: "17"
-  #   firefox: "44"
-  #   firefox_android: "44"
-  #   safari: "11.1"
-  #   safari_ios: "11.3"
-  - api.ServiceWorkerRegistration
-
-  # baseline: low
-  # baseline_low_date: 2023-03-27
-  # support:
-  #   chrome: "42"
-  #   chrome_android: "42"
-  #   edge: "17"
-  #   firefox: "44"
-  #   firefox_android: "48"
-  #   safari: "16"
-  #   safari_ios: "16.4"
-  - api.PushManager.subscribe
-
-  # baseline: low
-  # baseline_low_date: 2023-03-27
-  # support:
-  #   chrome: "54"
-  #   chrome_android: "54"
-  #   edge: "17"
-  #   firefox: "44"
-  #   firefox_android: "48"
-  #   safari: "16"
-  #   safari_ios: "16.4"
-  - api.PushSubscription.options
-  - api.PushSubscriptionOptions
-  - api.PushSubscriptionOptions.applicationServerKey
-
-  # baseline: low
-  # baseline_low_date: 2023-03-27
-  # support:
-  #   chrome: "60"
-  #   chrome_android: "60"
-  #   edge: "17"
-  #   firefox: "96"
-  #   firefox_android: "96"
-  #   safari: "16"
-  #   safari_ios: "16.4"
-  - api.PushSubscription.expirationTime
-
-  # baseline: false
-  # support:
-  #   chrome: "54"
-  #   chrome_android: "54"
-  #   edge: "17"
-  #   safari: "16"
-  #   safari_ios: "16.4"
-  - api.PushSubscriptionOptions.userVisibleOnly
-
-  # baseline: false
-  # support:
-  #   chrome: "60"
-  #   chrome_android: "60"
-  #   edge: "17"
-  #   safari: "16"
-  #   safari_ios: "16.4"
-  - api.PushManager.supportedContentEncodings_static
-
-  # baseline: false
-  # support:
-  #   firefox: "128"
-  #   firefox_android: "128"
-  #   safari: "18"
-  #   safari_ios: "18"
-  - api.PushMessageData.bytes
-
-  # baseline: false
-  # support:
-  #   safari: "16"
-  #   safari_ios: "16.4"
-  - api.PushSubscriptionChangeEvent
-  - api.PushSubscriptionChangeEvent.newSubscription
-  - api.PushSubscriptionChangeEvent.oldSubscription
-
-  # baseline: false
-  # support:
-  #   safari: "16.1"
-  #   safari_ios: "16.4"
-  - api.PushSubscriptionChangeEvent.PushSubscriptionChangeEvent
-
-  # baseline: false
-  # support:
-  #   safari: "16"
-  - api.ServiceWorkerGlobalScope.pushsubscriptionchange_event
diff --git a/features/push.yml b/features/push.yml
index 5819a21ae50..fa60ea542a1 100644
--- a/features/push.yml
+++ b/features/push.yml
@@ -2,3 +2,39 @@ name: Push messages
 description: The Push API subscribes to and receives server-initiated messages. Subscribers receive pushed messages in the background, even after periods inactive or offline.
 spec: https://w3c.github.io/push-api/
 caniuse: push-api
+status:
+  compute_from: api.PushMessageData
+compat_features:
+  - api.Permissions.permission_push
+  - api.PushEvent
+  - api.PushEvent.PushEvent
+  - api.PushEvent.data
+  - api.PushManager
+  - api.PushManager.getSubscription
+  - api.PushManager.permissionState
+  - api.PushManager.subscribe
+  - api.PushManager.supportedContentEncodings_static
+  - api.PushMessageData
+  - api.PushMessageData.arrayBuffer
+  - api.PushMessageData.blob
+  - api.PushMessageData.bytes
+  - api.PushMessageData.json
+  - api.PushMessageData.text
+  - api.PushSubscription
+  - api.PushSubscription.endpoint
+  - api.PushSubscription.expirationTime
+  - api.PushSubscription.getKey
+  - api.PushSubscription.options
+  - api.PushSubscription.toJSON
+  - api.PushSubscription.unsubscribe
+  - api.PushSubscriptionChangeEvent
+  - api.PushSubscriptionChangeEvent.PushSubscriptionChangeEvent
+  - api.PushSubscriptionChangeEvent.newSubscription
+  - api.PushSubscriptionChangeEvent.oldSubscription
+  - api.PushSubscriptionOptions
+  - api.PushSubscriptionOptions.applicationServerKey
+  - api.PushSubscriptionOptions.userVisibleOnly
+  - api.ServiceWorkerGlobalScope.push_event
+  - api.ServiceWorkerGlobalScope.pushsubscriptionchange_event
+  - api.ServiceWorkerRegistration
+  - api.ServiceWorkerRegistration.pushManager
diff --git a/features/push.yml.dist b/features/push.yml.dist
index e7b295e37f4..8842880899c 100644
--- a/features/push.yml.dist
+++ b/features/push.yml.dist
@@ -13,6 +13,19 @@ status:
     safari: "16"
     safari_ios: "16.4"
 compat_features:
+  # baseline: high
+  # baseline_low_date: 2018-04-30
+  # baseline_high_date: 2020-10-30
+  # support:
+  #   chrome: "40"
+  #   chrome_android: "40"
+  #   edge: "17"
+  #   firefox: "44"
+  #   firefox_android: "44"
+  #   safari: "11.1"
+  #   safari_ios: "11.3"
+  - api.ServiceWorkerRegistration
+
   # baseline: low
   # baseline_low_date: 2023-03-27
   # support:
@@ -40,6 +53,7 @@ compat_features:
   - api.PushEvent.PushEvent
   - api.PushManager
   - api.PushManager.getSubscription
+  - api.PushManager.subscribe
   - api.PushSubscription
   - api.PushSubscription.endpoint
   - api.PushSubscription.getKey
@@ -86,3 +100,86 @@ compat_features:
   - api.PushMessageData.blob
   - api.PushMessageData.json
   - api.PushMessageData.text
+
+  # baseline: low
+  # baseline_low_date: 2023-03-27
+  # support:
+  #   chrome: "54"
+  #   chrome_android: "54"
+  #   edge: "17"
+  #   firefox: "44"
+  #   firefox_android: "48"
+  #   safari: "16"
+  #   safari_ios: "16.4"
+  - api.PushSubscription.options
+  - api.PushSubscriptionOptions
+  - api.PushSubscriptionOptions.applicationServerKey
+
+  # baseline: low
+  # baseline_low_date: 2023-03-27
+  # support:
+  #   chrome: "60"
+  #   chrome_android: "60"
+  #   edge: "17"
+  #   firefox: "96"
+  #   firefox_android: "96"
+  #   safari: "16"
+  #   safari_ios: "16.4"
+  - api.PushSubscription.expirationTime
+
+  # baseline: low
+  # baseline_low_date: 2023-05-18
+  # support:
+  #   chrome: "43"
+  #   chrome_android: "43"
+  #   edge: "79"
+  #   firefox: "46"
+  #   firefox_android: "46"
+  #   safari: "16.5"
+  #   safari_ios: "16.5"
+  - api.Permissions.permission_push
+
+  # baseline: false
+  # support:
+  #   chrome: "54"
+  #   chrome_android: "54"
+  #   edge: "17"
+  #   safari: "16"
+  #   safari_ios: "16.4"
+  - api.PushSubscriptionOptions.userVisibleOnly
+
+  # baseline: false
+  # support:
+  #   chrome: "60"
+  #   chrome_android: "60"
+  #   edge: "17"
+  #   safari: "16"
+  #   safari_ios: "16.4"
+  - api.PushManager.supportedContentEncodings_static
+
+  # baseline: false
+  # support:
+  #   firefox: "128"
+  #   firefox_android: "128"
+  #   safari: "18"
+  #   safari_ios: "18"
+  - api.PushMessageData.bytes
+
+  # baseline: false
+  # support:
+  #   safari: "16"
+  #   safari_ios: "16.4"
+  - api.PushSubscriptionChangeEvent
+  - api.PushSubscriptionChangeEvent.newSubscription
+  - api.PushSubscriptionChangeEvent.oldSubscription
+
+  # baseline: false
+  # support:
+  #   safari: "16.1"
+  #   safari_ios: "16.4"
+  - api.PushSubscriptionChangeEvent.PushSubscriptionChangeEvent
+
+  # baseline: false
+  # support:
+  #   safari: "16"
+  - api.ServiceWorkerGlobalScope.pushsubscriptionchange_event