diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el
index a24ccf8c8..675add7de 100644
--- a/modules/lang/cc/config.el
+++ b/modules/lang/cc/config.el
@@ -252,7 +252,8 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e
 
 
 (use-package! ccls
-  :when (and (featurep! +lsp) (not (featurep! :tools lsp +eglot)))
+  :when (featurep! +lsp)
+  :unless (featurep! :tools lsp +eglot)
   :after lsp
   :init
   (after! projectile
diff --git a/modules/lang/haskell/+lsp.el b/modules/lang/haskell/+lsp.el
index 4b9009e83..da53d1f33 100644
--- a/modules/lang/haskell/+lsp.el
+++ b/modules/lang/haskell/+lsp.el
@@ -1,7 +1,7 @@
 ;;; lang/haskell/+lsp.el -*- lexical-binding: t; -*-
 
 (use-package! lsp-haskell
-  :after lsp-clients
+  :after lsp-mode
   :preface (add-hook 'haskell-mode-local-vars-hook #'lsp!)
   :config
   (when IS-MAC
diff --git a/modules/lang/java/+lsp.el b/modules/lang/java/+lsp.el
index 28dfe29e3..df19dca51 100644
--- a/modules/lang/java/+lsp.el
+++ b/modules/lang/java/+lsp.el
@@ -2,7 +2,7 @@
 ;;;###if (featurep! +lsp)
 
 (use-package! lsp-java
-  :after lsp-clients
+  :after lsp-mode
   :preface
   (setq lsp-java-workspace-dir (concat doom-etc-dir "java-workspace"))
   (add-hook 'java-mode-local-vars-hook #'lsp!)
diff --git a/modules/lang/julia/config.el b/modules/lang/julia/config.el
index dd2a0ed56..dd0edaf07 100644
--- a/modules/lang/julia/config.el
+++ b/modules/lang/julia/config.el
@@ -67,7 +67,7 @@
 
 (use-package! lsp-julia
   :when (featurep! +lsp)
-  :after lsp-clients
+  :after lsp-mode
   :preface
   (setq lsp-julia-default-environment "~/.julia/environments/v1.0")
   (when (featurep! +lsp)
diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index f5ff76ec3..eb2b4fe13 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -316,11 +316,11 @@ called.")
 
   (use-package! lsp-python-ms
     :unless (featurep! +pyright)
-    :after lsp-clients
+    :after lsp-mode
     :preface
     (after! python
       (setq lsp-python-ms-python-executable-cmd python-shell-interpreter)))
 
   (use-package! lsp-pyright
     :when (featurep! +pyright)
-    :after lsp-clients))
+    :after lsp-mode))