diff --git a/features/webauthn.yml b/features/webauthn.yml
index bd917f0d6b0..c89e08d3579 100644
--- a/features/webauthn.yml
+++ b/features/webauthn.yml
@@ -15,6 +15,11 @@ compat_features:
   - api.AuthenticatorResponse
   - api.AuthenticatorResponse.clientDataJSON
   - api.CredentialsContainer.create.publicKey_option
+  - api.CredentialsContainer.create.publicKey_option.attestation
+  - api.CredentialsContainer.create.publicKey_option.attestation.direct
+  - api.CredentialsContainer.create.publicKey_option.attestation.enterprise
+  - api.CredentialsContainer.create.publicKey_option.attestation.indirect
+  - api.CredentialsContainer.create.publicKey_option.attestation.none
   - api.CredentialsContainer.create.publicKey_option.extensions
   - api.CredentialsContainer.create.publicKey_option.extensions.appidExclude
   - api.CredentialsContainer.create.publicKey_option.extensions.credProps
diff --git a/features/webauthn.yml.dist b/features/webauthn.yml.dist
index 93cc18e96a3..e01b489b3ee 100644
--- a/features/webauthn.yml.dist
+++ b/features/webauthn.yml.dist
@@ -26,6 +26,9 @@ compat_features:
   #   safari: "13"
   #   safari_ios: "13"
   - api.CredentialsContainer.create.publicKey_option
+  - api.CredentialsContainer.create.publicKey_option.attestation
+  - api.CredentialsContainer.create.publicKey_option.attestation.indirect
+  - api.CredentialsContainer.create.publicKey_option.attestation.none
   - api.CredentialsContainer.create.publicKey_option.extensions
   - api.CredentialsContainer.create.publicKey_option.extensions.appidExclude
   - api.CredentialsContainer.get.publicKey_option
@@ -94,6 +97,17 @@ compat_features:
   #   safari_ios: "15.5"
   - api.PublicKeyCredential.authenticatorAttachment
 
+  # baseline: false
+  # support:
+  #   chrome: "67"
+  #   chrome_android: "70"
+  #   edge: "18"
+  #   firefox: "60"
+  #   safari: "13"
+  #   safari_ios: "13"
+  - api.CredentialsContainer.create.publicKey_option.attestation.direct
+  - api.CredentialsContainer.create.publicKey_option.attestation.enterprise
+
   # baseline: false
   # support:
   #   chrome: "84"