diff --git a/clients/lsp-autotools.el b/clients/lsp-autotools.el
index 242d5304c5..8d0ab3cdae 100644
--- a/clients/lsp-autotools.el
+++ b/clients/lsp-autotools.el
@@ -41,7 +41,7 @@
      makefile-bsdmake-mode
      makefile-imake-mode)
   "List of major mode that work with Autotools."
-  :type '(list symbol)
+  :type '(repeat function)
   :group 'lsp-autotools)
 
 (defun lsp-autotools--download-server (_client callback error-callback update?)
diff --git a/clients/lsp-awk.el b/clients/lsp-awk.el
index 4817bb8a8a..1e37118f21 100644
--- a/clients/lsp-awk.el
+++ b/clients/lsp-awk.el
@@ -36,7 +36,7 @@
   "Command to run the AWK language server."
   :group 'lsp-awk
   :risky t
-  :type '(list string))
+  :type '(repeat string))
 
 (lsp-register-client
  (make-lsp-client
diff --git a/clients/lsp-clojure.el b/clients/lsp-clojure.el
index f089763d26..e37d1f66db 100644
--- a/clients/lsp-clojure.el
+++ b/clients/lsp-clojure.el
@@ -94,7 +94,7 @@
                                           (expand-file-name "~/.gitlibs/libs"))
   "LSP clojure dirs that should be considered library folders."
   :group 'lsp-clojure
-  :type '(list string))
+  :type '(repeat directory))
 
 (defcustom lsp-clojure-test-tree-position-params nil
   "The optional test tree position params.
diff --git a/clients/lsp-cucumber.el b/clients/lsp-cucumber.el
index dde583a5d4..b648e60718 100644
--- a/clients/lsp-cucumber.el
+++ b/clients/lsp-cucumber.el
@@ -41,7 +41,7 @@ This is only for development use."
 (defcustom lsp-cucumber-active-modes
   '( feature-mode)
   "List of major mode that work with Cucumber language server."
-  :type '(list symbol)
+  :type '(repeat function)
   :group 'lsp-cucumber)
 
 (lsp-defcustom lsp-cucumber-features
diff --git a/clients/lsp-eslint.el b/clients/lsp-eslint.el
index b0cb005eb8..f41fd16d6d 100644
--- a/clients/lsp-eslint.el
+++ b/clients/lsp-eslint.el
@@ -176,7 +176,7 @@ workspace (see https://eslint.org/docs/user-guide/command-line-interface)."
 
 (defcustom lsp-eslint-code-action-disable-rule-comment t
   "Controls whether code actions to add a rule-disabling comment should be shown."
-  :type 'bool
+  :type 'boolean
   :package-version '(lsp-mode . "6.3"))
 
 (defcustom lsp-eslint-code-action-disable-rule-comment-location "separateLine"
@@ -193,12 +193,12 @@ Accepts the following values:
 (defcustom lsp-eslint-code-action-show-documentation t
   "Controls whether code actions to show documentation for an ESLint rule should
 be shown."
-  :type 'bool
+  :type 'boolean
   :package-version '(lsp-mode . "8.0.0"))
 
 (defcustom lsp-eslint-warn-on-ignored-files nil
   "Controls whether a warning should be emitted when a file is ignored."
-  :type 'bool
+  :type 'boolean
   :package-version '(lsp-mode . "8.0.0"))
 
 (defcustom lsp-eslint-rules-customizations []
diff --git a/clients/lsp-glsl.el b/clients/lsp-glsl.el
index 51b14a75d7..f319c7fb30 100644
--- a/clients/lsp-glsl.el
+++ b/clients/lsp-glsl.el
@@ -36,7 +36,7 @@
   "Command to run the GLSL language server."
   :group 'lsp-glsl
   :risky t
-  :type '(list string))
+  :type '(repeat string))
 
 (lsp-register-client
  (make-lsp-client
diff --git a/clients/lsp-idris.el b/clients/lsp-idris.el
index 9d400e7ed7..01e2150432 100644
--- a/clients/lsp-idris.el
+++ b/clients/lsp-idris.el
@@ -45,7 +45,9 @@
 (defcustom lsp-idris2-lsp-trace-server "off"
   "Traces the communication between VS Code and the language server."
   :group 'lsp-idris
-  :type '(choice (:tag "off" "messages" "verbose"))
+  :type '(choice (const "off")
+                 (const "messages")
+                 (const "verbose"))
   :package-version '(lsp-mode . "9.0.0"))
 
 (lsp-register-custom-settings
diff --git a/clients/lsp-kotlin.el b/clients/lsp-kotlin.el
index 4f9a05c729..0685759f87 100644
--- a/clients/lsp-kotlin.el
+++ b/clients/lsp-kotlin.el
@@ -50,7 +50,10 @@ executable with `exec-path'."
 
 (defcustom lsp-kotlin-trace-server "off"
   "Traces the communication between VSCode and the Kotlin language server."
-  :type '(choice (:tag "off" "messages" "verbose"))
+  :type '(choice (const "off")
+                 (const "messages")
+                 (const "verbose")
+         )
   :group 'lsp-kotlin
   :package-version '(lsp-mode . "6.1"))
 
diff --git a/clients/lsp-lisp.el b/clients/lsp-lisp.el
index 6b348c0ee8..6c4128037b 100644
--- a/clients/lsp-lisp.el
+++ b/clients/lsp-lisp.el
@@ -34,7 +34,7 @@
 (defcustom lsp-lisp-active-modes
   '( lisp-mode)
   "List of major mode that work with lisp."
-  :type '(list symbol)
+  :type '(repeat function)
   :group 'lsp-lisp)
 
 (defcustom lsp-lisp-alive-port 8006
diff --git a/clients/lsp-lua.el b/clients/lsp-lua.el
index c06bbc5266..234c339361 100644
--- a/clients/lsp-lua.el
+++ b/clients/lsp-lua.el
@@ -137,13 +137,18 @@
 
 (defcustom lsp-lua-color-mode "Semantic"
   "Color mode."
-  :type '(choice (:tag "Grammar" "Semantic"))
+  :type '(choice (const "Grammar")
+                 (const "Semantic"))
   :package-version '(lsp-mode . "8.0.0")
   :group 'lsp-lua-language-server)
 
 (defcustom lsp-lua-completion-call-snippet "Disable"
   "Shows function call snippets."
-  :type '(choice (:tag "Disable" "Both" "Replace"))
+  :type '(choice
+          (const "Disable")
+          (const "Both")
+          (const "Replace")
+          )
   :package-version '(lsp-mode . "8.0.0")
   :group 'lsp-lua-language-server)
 
@@ -165,7 +170,9 @@ fragment.  If it is set to `0`, this feature can be disabled."
 
 (defcustom lsp-lua-completion-keyword-snippet "Replace"
   "Shows keyword syntax snippets."
-  :type '(choice (:tag "Disable" "Both" "Replace"))
+  :type '(choice (const "Disable")
+                 (const "Both")
+                 (const "Replace"))
   :package-version '(lsp-mode . "8.0.0")
   :group 'lsp-lua-language-server)
 
@@ -339,7 +346,8 @@ tolerance for this setting. Please adjust it to the appropriate value."
 (defcustom lsp-lua-runtime-file-encoding "utf8"
   "File encoding.  The `ansi' option is only available under the `Windows'
 platform."
-  :type '(choice (:tag "utf8" "ansi"))
+  :type '(choice (const "utf8")
+                 (const "ansi"))
   :package-version '(lsp-mode . "8.0.0")
   :group 'lsp-lua-language-server)
 
@@ -383,7 +391,13 @@ and the language server will provide special support.
 
 (defcustom lsp-lua-runtime-version "Lua 5.4"
   "Lua runtime version."
-  :type '(choice (:tag "Lua 5.1" "Lua 5.2" "Lua 5.3" "Lua 5.4" "LuaJIT"))
+  :type '(choice
+                  (const "Lua 5.1")
+                  (const "Lua 5.2")
+                  (const "Lua 5.3")
+                  (const "Lua 5.4")
+                  (const "LuaJIT")
+                  )
   :package-version '(lsp-mode . "8.0.0")
   :group 'lsp-lua-language-server)
 
diff --git a/clients/lsp-markdown.el b/clients/lsp-markdown.el
index ff3e9c7bb0..e8859cb72c 100644
--- a/clients/lsp-markdown.el
+++ b/clients/lsp-markdown.el
@@ -59,8 +59,9 @@ For a complete list of plugins, check:
 
 For a complete list of plugins, check:
  https://github.com/unifiedjs/unified-language-server/blob/main/CONFIGURATION.md#re-using-settings"
-  :type '(choice (const "retext-english")
-                 (const "remark-parse"))
+  :type '(choice
+                  (const "retext-english")
+                  (const "remark-parse"))
   :group 'lsp-markdown
   :package-version '(lsp-mode . "8.0.0"))
 
diff --git a/clients/lsp-marksman.el b/clients/lsp-marksman.el
index 0dd5d7a677..564119e2bc 100644
--- a/clients/lsp-marksman.el
+++ b/clients/lsp-marksman.el
@@ -41,7 +41,7 @@
 
 (defcustom lsp-marksman-server-command-args '()
   "Command-line arguments for the marksman lsp server. Not normally Needed."
-  :type '(repeat 'string)
+  :type '(repeat string)
   :group 'lsp-marksman
   :package-version '(lsp-mode . "8.0.0"))
 
diff --git a/clients/lsp-mdx.el b/clients/lsp-mdx.el
index 435318da26..30c37bbc52 100644
--- a/clients/lsp-mdx.el
+++ b/clients/lsp-mdx.el
@@ -40,7 +40,7 @@
 
 (defcustom lsp-mdx-server-command-args '("--stdio")
   "Command-line arguments for the mdx lsp server."
-  :type '(repeat 'string)
+  :type '(repeat string)
   :group 'lsp-mdx
   :package-version '(lsp-mode . "8.0.0"))
 
diff --git a/clients/lsp-perlnavigator.el b/clients/lsp-perlnavigator.el
index 3b7378619b..9097c2de81 100644
--- a/clients/lsp-perlnavigator.el
+++ b/clients/lsp-perlnavigator.el
@@ -63,33 +63,40 @@ default to ~/.perlcriticrc. (no aliases, .bat files or ~/)."
   :group 'lsp-perlnavigator
   :package-version '(lsp-mode . "9.0.0"))
 
+(defconst lsp-perlnavigator--log-level-type
+  '(choice  (const "error")
+    (const "warning")
+    (const "info")
+    (const "hint")
+    (const "none")
+    ))
 (defcustom lsp-perlnavigator-severity5 "warning"
   "Editor Diagnostic severity level for Critic severity 5."
-  :type '(choice (:tag "error" "warning" "info" "hint" "none"))
+  :type lsp-perlnavigator--log-level-type
   :group 'lsp-perlnavigator
   :package-version '(lsp-mode . "9.0.0"))
 
 (defcustom lsp-perlnavigator-severity4 "info"
   "Editor Diagnostic severity level for Critic severity 4."
-  :type '(choice (:tag "error" "warning" "info" "hint" "none"))
+  :type lsp-perlnavigator--log-level-type
   :group 'lsp-perlnavigator
   :package-version '(lsp-mode . "9.0.0"))
 
 (defcustom lsp-perlnavigator-severity3 "hint"
   "Editor Diagnostic severity level for Critic severity 3."
-  :type '(choice (:tag "error" "warning" "info" "hint" "none"))
+  :type lsp-perlnavigator--log-level-type
   :group 'lsp-perlnavigator
   :package-version '(lsp-mode . "9.0.0"))
 
 (defcustom lsp-perlnavigator-severity2 "hint"
   "Editor Diagnostic severity level for Critic severity 2."
-  :type '(choice (:tag "error" "warning" "info" "hint" "none"))
+  :type lsp-perlnavigator--log-level-type
   :group 'lsp-perlnavigator
   :package-version '(lsp-mode . "9.0.0"))
 
 (defcustom lsp-perlnavigator-severity1 "hint"
   "Editor Diagnostic severity level for Critic severity 1."
-  :type '(choice (:tag "error" "warning" "info" "hint" "none"))
+  :type lsp-perlnavigator--log-level-type
   :group 'lsp-perlnavigator
   :package-version '(lsp-mode . "9.0.0"))
 
@@ -107,7 +114,11 @@ default to ~/.perlcriticrc. (no aliases, .bat files or ~/)."
 
 (defcustom lsp-perlnavigator-trace-server "messages"
   "Traces the communication between VS Code and the language server."
-  :type '(choice (:tag "off" "messages" "verbose"))
+  :type '(choice
+           (const "off")
+           (const "messages")
+           (const "verbose")
+          )
   :group 'lsp-perlnavigator
   :package-version '(lsp-mode . "9.0.0"))
 
diff --git a/clients/lsp-php.el b/clients/lsp-php.el
index 0d542d943e..36f8d51b49 100644
--- a/clients/lsp-php.el
+++ b/clients/lsp-php.el
@@ -219,7 +219,11 @@ definitions are found in excluded files/folders."
 (lsp-defcustom lsp-intelephense-trace-server "off"
   "Traces the communication between VSCode and the intelephense
 language server."
-  :type '(choice (:tag "off" "messages" "verbose"))
+  :type '(choice
+          (const "off")
+          (const "messages")
+          (const "verbose")
+          )
   :group 'lsp-intelephense
   :package-version '(lsp-mode . "6.1")
   :lsp-path "intelephense.trace.server")
@@ -440,7 +444,7 @@ already present."
   "Alist mapping extension names to `composer' packages.
 These extensions can be installed using
 `lsp-phpactor-install-extension'."
-  :type '(alist :key-type "string" :value-type "string")
+  :type '(alist :key-type string :value-type string)
   :group 'lsp-phpactor)
 
 (defun lsp-phpactor-install-extension (extension)
diff --git a/clients/lsp-pls.el b/clients/lsp-pls.el
index 5faf869704..99def68db9 100644
--- a/clients/lsp-pls.el
+++ b/clients/lsp-pls.el
@@ -45,7 +45,7 @@
 
 (defcustom lsp-pls-arguments nil
   "Additional arguments needed to execute PLS."
-  :type '(repeat 'string)
+  :type '(repeat string)
   :group 'lsp-pls
   :package-version '(lsp-mode . "9.0.0"))
 
@@ -58,7 +58,7 @@ Defaults to the workspace root when not configured."
 
 (defcustom lsp-pls-include nil
   "Paths to be added to your @INC."
-  :type '(repeat 'string)
+  :type '(repeat string)
   :group 'lsp-pls
   :package-version '(lsp-mode . "9.0.0"))
 
@@ -99,7 +99,7 @@ By default, the perl used to run PLS will be used."
   "Additional arguments to pass to Perl when syntax checking.
 This is useful if there is a BEGIN block in your code that
 changes behavior depending on the contents of @ARGV."
-  :type '(repeat 'string)
+  :type '(repeat string)
   :group 'lsp-pls
   :package-version '(lsp-mode . "9.0.0"))
 
diff --git a/clients/lsp-prolog.el b/clients/lsp-prolog.el
index fdf0e21fc7..416aa20686 100644
--- a/clients/lsp-prolog.el
+++ b/clients/lsp-prolog.el
@@ -40,7 +40,7 @@
   "The prolog-lsp server command."
   :group 'lsp-prolog
   :risky t
-  :type '(list string))
+  :type '(repeat string))
 
 (lsp-register-client
  (make-lsp-client
diff --git a/clients/lsp-purescript.el b/clients/lsp-purescript.el
index 331b73a4a9..155762bbca 100644
--- a/clients/lsp-purescript.el
+++ b/clients/lsp-purescript.el
@@ -68,7 +68,12 @@ Passed to the IDE server for source locations."
 (lsp-defcustom lsp-purescript-formatter "purty"
   "Tool to use to for formatting.
 Must be installed and on PATH (or npm installed with addNpmPath set)"
-  :type '(choice (:tag none purty purs-tidy pose))
+  :type '(choice
+          (const "none")
+          (const "purty")
+          (const "purs-tidy")
+          (const "pose")
+          )
   :group 'lsp-purescript
   :package-version '(lsp-mode . "9.0.0")
   :lsp-path "purescript.formatter")
diff --git a/clients/lsp-pwsh.el b/clients/lsp-pwsh.el
index 292aa3b201..d2d4712a07 100644
--- a/clients/lsp-pwsh.el
+++ b/clients/lsp-pwsh.el
@@ -40,11 +40,14 @@
 ;; PowerShell vscode flags
 (defcustom lsp-pwsh-help-completion "BlockComment"
   "Controls the comment-based help completion behavior triggered by typing '##'.
-Set the generated help style with 'BlockComment' or 'LineComment'.
-Disable the feature with 'Disabled'."
+Set the generated help style with \='BlockComment\=' or \='LineComment\='.
+Disable the feature with \='Disabled\='."
   :type
   '(choice
-    (:tag "Disabled" "BlockComment" "LineComment"))
+    (const "Disabled")
+    (const "BlockComment")
+    (const "LineComment")
+   )
   :group 'lsp-pwsh
   :package-version '(lsp-mode . "6.2"))
 
@@ -85,7 +88,11 @@ Sets in a way that is compatible with PowerShell syntax.
 For more information about the brace styles please refer to https://github.com/PoshCode/PowerShellPracticeAndStyle/issues/81."
   :type
   '(choice
-    (:tag "Custom" "Allman" "OTBS" "Stroustrup"))
+    (const "Custom")
+    (const "Allman")
+    (const "OTBS")
+    (const "Stroustrup")
+    )
   :group 'lsp-pwsh
   :package-version '(lsp-mode . "6.2"))
 
@@ -111,7 +118,10 @@ For more information about the brace styles please refer to https://github.com/P
   "Multi-line pipeline style settings."
   :type
   '(choice
-    (:tag "IncreaseIndentationForFirstPipeline" "IncreaseIndentationAfterEveryPipeline" "NoIndentation"))
+    (const "IncreaseIndentationForFirstPipeline")
+    (const "IncreaseIndentationAfterEveryPipeline")
+    (const "NoIndentation")
+    )
   :group 'lsp-pwsh
   :package-version '(lsp-mode . "6.2"))
 
@@ -173,10 +183,16 @@ associated conditional expression."
 
 (defcustom lsp-pwsh-developer-editor-services-log-level "Normal"
   "Sets the log level for the PowerShell Editor Services host executable.
-Valid values are 'Diagnostic', 'Verbose', 'Normal', 'Warning', and 'Error'"
+Valid values are \='Diagnostic\=', \='Verbose\=', \='Normal\=',
+ \='Warning\=', and \='Error\='"
   :type
   '(choice
-    (:tag "Diagnostic" "Verbose" "Normal" "Warning" "Error"))
+    (const "Diagnostic")
+    (const "Verbose")
+    (const "Normal")
+    (const "Warning")
+    (const "Error")
+    )
   :group 'lsp-pwsh
   :package-version '(lsp-mode . "6.2"))
 
diff --git a/clients/lsp-pyls.el b/clients/lsp-pyls.el
index 392820f117..c8f6644bdc 100644
--- a/clients/lsp-pyls.el
+++ b/clients/lsp-pyls.el
@@ -217,7 +217,8 @@ opening bracket's line."
 (defcustom lsp-pyls-plugins-pydocstyle-convention nil
   "Choose the basic list of checked errors by specifying an
 existing convention."
-  :type '(choice (:tag "pep257" "numpy"))
+  :type '(choice (const "pep257")
+                 (const "numpy"))
   :group 'lsp-pyls
   :package-version '(lsp-mode . "6.1"))
 
diff --git a/clients/lsp-pylsp.el b/clients/lsp-pylsp.el
index 2406caad8f..f5ba58f653 100644
--- a/clients/lsp-pylsp.el
+++ b/clients/lsp-pylsp.el
@@ -178,7 +178,8 @@ opening bracket's line."
 (defcustom lsp-pylsp-plugins-pydocstyle-convention nil
   "Choose the basic list of checked errors by specifying an
 existing convention."
-  :type '(choice (:tag "pep257" "numpy"))
+  :type '(choice (const "pep257")
+                 (const "numpy"))
   :group 'lsp-pylsp)
 
 (defcustom lsp-pylsp-plugins-pydocstyle-add-ignore nil
diff --git a/clients/lsp-remark.el b/clients/lsp-remark.el
index d092c779b3..83e44458f7 100644
--- a/clients/lsp-remark.el
+++ b/clients/lsp-remark.el
@@ -41,7 +41,7 @@
 
 (defcustom lsp-remark-server-command-args '("--stdio")
   "Command-line arguments for the markdown lsp server."
-  :type '(repeat 'string)
+  :type '(repeat string)
   :group 'lsp-remark
   :package-version '(lsp-mode . "9.0.0"))
 
diff --git a/clients/lsp-rf.el b/clients/lsp-rf.el
index 7dfb2b607d..ef13f8480e 100644
--- a/clients/lsp-rf.el
+++ b/clients/lsp-rf.el
@@ -34,7 +34,7 @@
 (defcustom lsp-rf-language-server-start-command '("~/.nvm/versions/node/v9.11.2/bin/node" "~/.vscode/extensions/tomiturtiainen.rf-intellisense-2.8.0/server/server.js")
   "Path to the server.js file of the rf-intellisense server.
 Accepts a list of strings (path/to/interpreter path/to/server.js)"
-  :type '(list string)
+  :type '(repeat string)
   :group 'lsp-rf)
 
 (defcustom lsp-rf-language-server-include-paths []
@@ -93,14 +93,14 @@ Glob patterns as strings are accepted (eg. *bad.robot between double quotes)"
 
 (defun parse-rf-language-server-include-path-regex (vector)
   "Creates regexp to select files from workspace directory."
-  (let ((globs (if (eq vector [])
+  (let ((globs (if (equal vector [])
                         ["*.robot" "*.resource"]
                       vector)))
     (parse-rf-language-server-globs-to-regex globs)))
 
 (defun parse-rf-language-server-exclude-paths (seq)
   "Creates regexp to select files from workspace directory."
-  (if (eq lsp-rf-language-server-exclude-paths [])
+  (if (equal lsp-rf-language-server-exclude-paths [])
       seq
   (cl-delete-if (lambda (x) (string-match-p
                              (parse-rf-language-server-globs-to-regex
diff --git a/clients/lsp-roslyn.el b/clients/lsp-roslyn.el
index 72fe35cdce..3e050cc7bb 100644
--- a/clients/lsp-roslyn.el
+++ b/clients/lsp-roslyn.el
@@ -59,7 +59,14 @@ Unused on other platforms.")
 
 (defcustom lsp-roslyn-server-log-level "Information"
   "Log level for the Roslyn language server."
-  :type '(choice (:tag "None" "Trace" "Debug" "Information" "Warning" "Error" "Critical"))
+  :type '(choice (const "None")
+          (const "Trace")
+          (const "Debug")
+          (const "Information")
+          (const "Warning")
+          (const "Error")
+          (const "Critical")
+           )
   :package-version '(lsp-mode . "8.0.0")
   :group 'lsp-roslyn)
 
@@ -129,6 +136,7 @@ Gotten from https://dev.azure.com/azure-public/vside/_artifacts/feed/vs-impl/NuG
          :name process-name
          :remote lsp-roslyn--pipe-name
          :sentinel sentinel
+         :service lsp--tcp-server-port
          :filter filter
          :noquery t)))))
 
diff --git a/clients/lsp-rust.el b/clients/lsp-rust.el
index a81c37e0eb..85f17b9d7a 100644
--- a/clients/lsp-rust.el
+++ b/clients/lsp-rust.el
@@ -57,7 +57,7 @@
 (defcustom lsp-rust-server 'rust-analyzer
   "Choose LSP server."
   :type '(choice (const :tag "rls" rls)
-                 (const :tag "rust-analyzer" rust-analyzer))
+          (const :tag "rust-analyzer" rust-analyzer))
   :group 'lsp-rust
   :package-version '(lsp-mode . "6.2"))
 
@@ -760,10 +760,10 @@ them with `crate' or the crate name they refer to."
 (defcustom lsp-rust-analyzer-import-granularity "crate"
   "How imports should be grouped into use statements."
   :type '(choice
-          (const "crate" :doc "Merge imports from the same crate into a single use statement. This kind of nesting is only supported in Rust versions later than 1.24.")
-          (const "module" :doc "Merge imports from the same module into a single use statement.")
-          (const "item" :doc "Don’t merge imports at all, creating one import per item.")
-          (const "preserve" :doc "Do not change the granularity of any imports. For auto-import this has the same effect as `\"item\"'"))
+          (const :tag "Merge imports from the same crate into a single use statement. This kind of nesting is only supported in Rust versions later than 1.24." "crate" )
+          (const :tag "Merge imports from the same module into a single use statement." "module" )
+          (const :tag "Don’t merge imports at all, creating one import per item." "item" )
+          (const :tag "Do not change the granularity of any imports. For auto-import this has the same effect as `\"item\"'" "preserve" ))
   :group 'lsp-rust-analyzer
   :package-version '(lsp-mode . "8.0.0"))
 
diff --git a/clients/lsp-solargraph.el b/clients/lsp-solargraph.el
index 24e6590b30..32a10f4d0d 100644
--- a/clients/lsp-solargraph.el
+++ b/clients/lsp-solargraph.el
@@ -98,7 +98,9 @@
 
 (defcustom lsp-solargraph-log-level "warn"
   "Level of debug info to log. `warn` is least and `debug` is most."
-  :type '(choice (const :tag "warn" "info" "debug"))
+  :type '(choice (const "warn")
+                 (const "info")
+                 (const "debug"))
   :group 'lsp-solargraph
   :package-version '(lsp-mode . "6.1"))
 
diff --git a/clients/lsp-wgsl.el b/clients/lsp-wgsl.el
index 71378554ec..2f2a9bca13 100644
--- a/clients/lsp-wgsl.el
+++ b/clients/lsp-wgsl.el
@@ -105,7 +105,7 @@
 
 (defcustom lsp-wgsl-shaderdefs []
   "Defines that should be valid for preprocessor operations like ifdef,
-e.g, ['USE_TYPES', 'DEBUG']"
+  e.g, [\='USE_TYPES\=',\='DEBUG\=']"
   :type 'lsp-string-vector
   :group 'lsp-wgsl
   :package-version '(lsp-mode . "9.0.0"))
diff --git a/clients/lsp-xml.el b/clients/lsp-xml.el
index 7c904f05b3..4c7629a35e 100644
--- a/clients/lsp-xml.el
+++ b/clients/lsp-xml.el
@@ -231,7 +231,11 @@ This only affects the experimental formatter."
 (defcustom lsp-xml-validation-no-grammar "hint"
   "The message severity when a document has no associated
   grammar."
-  :type '(choice (:tag "ignore" "hint" "info" "warning" "error"))
+  :type '(choice  (const "ignore")
+                  (const "hint")
+                  (const "info")
+                  (const "warning")
+                  (const "error"))
   :group 'lsp-xml
   :package-version '(lsp-mode . "6.1"))
 
diff --git a/clients/lsp-yaml.el b/clients/lsp-yaml.el
index 2012da216a..d842a0e432 100644
--- a/clients/lsp-yaml.el
+++ b/clients/lsp-yaml.el
@@ -172,6 +172,13 @@ Limited for performance reasons."
                                         (lsp-package-ensure 'yaml-language-server
                                                             callback error-callback))))
 
+(defconst lsp--yaml-schema-extension-type
+      '(list
+       (cons 'name  string)
+       (cons 'description string)
+       (cons 'url string)
+       (cons 'fileMatch (repeat string))))
+
 (defcustom lsp-yaml-schema-extensions '(((name . "Kubernetes v1.30.3")
                                           (description . "Kubernetes v1.30.3 manifest schema definition")
                                           (url . "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.30.3-standalone-strict/all.json")
@@ -179,7 +186,7 @@ Limited for performance reasons."
   "User defined schemas that extend default schema store.
 Used in `lsp-yaml--get-supported-schemas' to supplement schemas provided by
 `lsp-yaml-schema-store-uri'."
-  :type  '(list alist)
+  :type  '(repeat lsp--yaml-schema-extension-type)
   :group 'lsp-yaml
   :package-version '(lsp-mode . "9.0.1"))