diff --git a/config/v3_5/types/clevis.go b/config/v3_5/types/clevis.go
index 68887d434..3742633dd 100644
--- a/config/v3_5/types/clevis.go
+++ b/config/v3_5/types/clevis.go
@@ -33,13 +33,7 @@ func (cu ClevisCustom) Validate(c path.ContextPath) (r report.Report) {
 	if util.NilOrEmpty(cu.Pin) && util.NilOrEmpty(cu.Config) && !util.IsTrue(cu.NeedsNetwork) {
 		return
 	}
-	if util.NotEmpty(cu.Pin) {
-		switch *cu.Pin {
-		case "tpm2", "tang", "sss":
-		default:
-			r.AddOnError(c.Append("pin"), errors.ErrUnknownClevisPin)
-		}
-	} else {
+	if util.NilOrEmpty(cu.Pin) {
 		r.AddOnError(c.Append("pin"), errors.ErrClevisPinRequired)
 	}
 	if util.NilOrEmpty(cu.Config) {
diff --git a/config/v3_5/types/clevis_test.go b/config/v3_5/types/clevis_test.go
index f616868cd..81fb3b26e 100644
--- a/config/v3_5/types/clevis_test.go
+++ b/config/v3_5/types/clevis_test.go
@@ -56,7 +56,7 @@ func TestClevisCustomValidate(t *testing.T) {
 				Pin:    util.StrToPtr("z"),
 			},
 			at:  path.New("", "pin"),
-			out: errors.ErrUnknownClevisPin,
+			out: nil,
 		},
 		{
 			in: ClevisCustom{
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 4c0c0e7c5..7fe4e2303 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -22,7 +22,7 @@ Starting with this release, ignition-validate binaries are signed with the
 
 ### Features
 
-- The name for custom clevis pins is not validated by Ignition anymore, enabling the use of arbitrary custom pins _(3.6.0-exp)_
+- The name for custom clevis pins is not validated by Ignition anymore, enabling the use of arbitrary custom pins _(3.5)_
 - Add NVIDIA BlueField provider
 
 ### Bug fixes