diff --git a/conformance/prod-nanos.json b/conformance/prod-nanos.json
index 6907e741..b3cf225b 100644
--- a/conformance/prod-nanos.json
+++ b/conformance/prod-nanos.json
@@ -17,8 +17,7 @@
   ],
   "publicKeyAlgAndEncodings": ["cose"],
   "attestationTypes": [
-    "basic_full",
-    "basic_surrogate"
+    "basic_full"
   ],
   "userVerificationDetails": [
     [{
diff --git a/conformance/prod-nanosp.json b/conformance/prod-nanosp.json
index eb832d58..6baf0283 100644
--- a/conformance/prod-nanosp.json
+++ b/conformance/prod-nanosp.json
@@ -17,8 +17,7 @@
   ],
   "publicKeyAlgAndEncodings": ["cose"],
   "attestationTypes": [
-    "basic_full",
-    "basic_surrogate"
+    "basic_full"
   ],
   "userVerificationDetails": [
     [{
diff --git a/conformance/prod-nanox.json b/conformance/prod-nanox.json
index 0671cc90..b4214a4b 100644
--- a/conformance/prod-nanox.json
+++ b/conformance/prod-nanox.json
@@ -17,8 +17,7 @@
   ],
   "publicKeyAlgAndEncodings": ["cose"],
   "attestationTypes": [
-    "basic_full",
-    "basic_surrogate"
+    "basic_full"
   ],
   "userVerificationDetails": [
     [{
diff --git a/conformance/test-nanos.json b/conformance/test-nanos.json
index 9dcd95a9..a31a9ae6 100644
--- a/conformance/test-nanos.json
+++ b/conformance/test-nanos.json
@@ -17,8 +17,7 @@
   ],
   "publicKeyAlgAndEncodings": ["cose"],
   "attestationTypes": [
-    "basic_full",
-    "basic_surrogate"
+    "basic_full"
   ],
   "userVerificationDetails": [
     [{
diff --git a/conformance/test-nanosp.json b/conformance/test-nanosp.json
index 3199e076..755e5ecb 100644
--- a/conformance/test-nanosp.json
+++ b/conformance/test-nanosp.json
@@ -17,8 +17,7 @@
   ],
   "publicKeyAlgAndEncodings": ["cose"],
   "attestationTypes": [
-    "basic_full",
-    "basic_surrogate"
+    "basic_full"
   ],
   "userVerificationDetails": [
     [{
diff --git a/conformance/test-nanox.json b/conformance/test-nanox.json
index f870a790..6a8241a4 100644
--- a/conformance/test-nanox.json
+++ b/conformance/test-nanox.json
@@ -17,8 +17,7 @@
   ],
   "publicKeyAlgAndEncodings": ["cose"],
   "attestationTypes": [
-    "basic_full",
-    "basic_surrogate"
+    "basic_full"
   ],
   "userVerificationDetails": [
     [{