diff --git a/features/atomics-wait-async.yml b/features/atomics-wait-async.yml
new file mode 100644
index 00000000000..f8557719d3d
--- /dev/null
+++ b/features/atomics-wait-async.yml
@@ -0,0 +1,6 @@
+name: Atomics.waitAsync
+description: The `Atomics.waitAsync()` static method waits for a value in a shared memory location, providing a promise when the expected value is not yet in memory. The `waitAsync()` method is a non-blocking alternative to `Atomics.wait()`.
+spec: https://tc39.es/ecma262/multipage/structured-data.html#sec-atomics.waitasync
+group: javascript
+compat_features:
+  - javascript.builtins.Atomics.waitAsync
diff --git a/features/atomics-wait-async.yml.dist b/features/atomics-wait-async.yml.dist
new file mode 100644
index 00000000000..1397746fff8
--- /dev/null
+++ b/features/atomics-wait-async.yml.dist
@@ -0,0 +1,13 @@
+# Generated from: atomics-wait-async.yml
+# Do not edit this file by hand. Edit the source file instead!
+
+status:
+  baseline: false
+  support:
+    chrome: "87"
+    chrome_android: "89"
+    edge: "87"
+    safari: "16.4"
+    safari_ios: "16.4"
+compat_features:
+  - javascript.builtins.Atomics.waitAsync
diff --git a/features/shared-memory.yml b/features/shared-memory.yml
new file mode 100644
index 00000000000..0617c88ca65
--- /dev/null
+++ b/features/shared-memory.yml
@@ -0,0 +1,27 @@
+name: SharedArrayBuffer and Atomics
+description: The `SharedArrayBuffer` object represents bytes shared between multiple workers and the main thread. The `Atomics` object safely accesses `SharedArrayBuffer` data to make sure predictable values are read and written and that operations are not interrupted.
+caniuse: sharedarraybuffer
+spec:
+  - https://tc39.es/ecma262/multipage/structured-data.html#sec-sharedarraybuffer-objects
+  - https://tc39.es/ecma262/multipage/structured-data.html#sec-atomics-object
+group: javascript
+compat_features:
+  - javascript.builtins.Atomics
+  - javascript.builtins.Atomics.add
+  - javascript.builtins.Atomics.and
+  - javascript.builtins.Atomics.compareExchange
+  - javascript.builtins.Atomics.exchange
+  - javascript.builtins.Atomics.isLockFree
+  - javascript.builtins.Atomics.load
+  - javascript.builtins.Atomics.notify
+  - javascript.builtins.Atomics.or
+  - javascript.builtins.Atomics.store
+  - javascript.builtins.Atomics.sub
+  - javascript.builtins.Atomics.wait
+  - javascript.builtins.Atomics.xor
+  - javascript.builtins.DataView.DataView.sharedarraybuffer_support
+  - javascript.builtins.SharedArrayBuffer
+  - javascript.builtins.SharedArrayBuffer.SharedArrayBuffer
+  - javascript.builtins.SharedArrayBuffer.byteLength
+  - javascript.builtins.SharedArrayBuffer.slice
+  - javascript.builtins.SharedArrayBuffer.@@species
diff --git a/features/shared-memory.yml.dist b/features/shared-memory.yml.dist
new file mode 100644
index 00000000000..01939496f9b
--- /dev/null
+++ b/features/shared-memory.yml.dist
@@ -0,0 +1,59 @@
+# Generated from: shared-memory.yml
+# Do not edit this file by hand. Edit the source file instead!
+
+status:
+  baseline: high
+  baseline_low_date: 2021-12-13
+  baseline_high_date: 2024-06-13
+  support:
+    chrome: "68"
+    chrome_android: "89"
+    edge: "79"
+    firefox: "79"
+    firefox_android: "79"
+    safari: "15.2"
+    safari_ios: "15.2"
+compat_features:
+  # baseline: high
+  # baseline_low_date: 2021-12-13
+  # baseline_high_date: 2024-06-13
+  # support:
+  #   chrome: "68"
+  #   chrome_android: "89"
+  #   edge: "79"
+  #   firefox: "78"
+  #   firefox_android: "79"
+  #   safari: "15.2"
+  #   safari_ios: "15.2"
+  - javascript.builtins.Atomics
+  - javascript.builtins.Atomics.add
+  - javascript.builtins.Atomics.and
+  - javascript.builtins.Atomics.compareExchange
+  - javascript.builtins.Atomics.exchange
+  - javascript.builtins.Atomics.isLockFree
+  - javascript.builtins.Atomics.load
+  - javascript.builtins.Atomics.notify
+  - javascript.builtins.Atomics.or
+  - javascript.builtins.Atomics.store
+  - javascript.builtins.Atomics.sub
+  - javascript.builtins.Atomics.wait
+  - javascript.builtins.Atomics.xor
+
+  # ⬇️ Same status as overall feature ⬇️
+  # baseline: high
+  # baseline_low_date: 2021-12-13
+  # baseline_high_date: 2024-06-13
+  # support:
+  #   chrome: "68"
+  #   chrome_android: "89"
+  #   edge: "79"
+  #   firefox: "79"
+  #   firefox_android: "79"
+  #   safari: "15.2"
+  #   safari_ios: "15.2"
+  - javascript.builtins.DataView.DataView.sharedarraybuffer_support
+  - javascript.builtins.SharedArrayBuffer
+  - javascript.builtins.SharedArrayBuffer.@@species
+  - javascript.builtins.SharedArrayBuffer.SharedArrayBuffer
+  - javascript.builtins.SharedArrayBuffer.byteLength
+  - javascript.builtins.SharedArrayBuffer.slice