diff --git a/install/stack.yaml b/install/stack.yaml
index 23026bccea..58618c5ad3 100644
--- a/install/stack.yaml
+++ b/install/stack.yaml
@@ -1,13 +1,14 @@
-resolver: lts-14.27 # Last 8.6.5 
+# keep synced with ../stack.yaml to minimise rebuilding
+resolver: lts-18.18
 
 packages:
   - .
 
-extra-deps:
-  - cabal-install-parsers-0.3.0.1
-  - Cabal-3.2.0.0
-  - binary-instances-1.0.0.1
-  - lukko-0.1.1.2
+# extra-deps:
+#   - cabal-install-parsers-0.3.0.1
+#   - Cabal-3.2.0.0
+#   - binary-instances-1.0.0.1
+#   - lukko-0.1.1.2
 
 flags:
   hls-install:
diff --git a/stack-8.10.6.yaml b/stack-8.10.6.yaml
index 4832965575..72997d470d 100644
--- a/stack-8.10.6.yaml
+++ b/stack-8.10.6.yaml
@@ -1,3 +1,6 @@
+# Build plan for GHC 8.10.6.
+# Like stack-8.10.7.yaml but with an older resolver.
+
 resolver: lts-18.8
 
 packages:
diff --git a/stack-8.10.7.yaml b/stack-8.10.7.yaml
index 24779b9462..da23ae692a 100644
--- a/stack-8.10.7.yaml
+++ b/stack-8.10.7.yaml
@@ -1,4 +1,8 @@
-resolver: lts-18.16
+# Build plan for GHC 8.10.7. 
+# stack-8.10.7.yaml is for install script, stack.yaml is for default builds, keep these identical.
+# https://github.com/haskell/haskell-language-server/issues/2491
+
+resolver: lts-18.18
 
 packages:
   - .
diff --git a/stack.yaml b/stack.yaml
index 428c80404b..da23ae692a 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,8 @@
-resolver: lts-18.10
+# Build plan for GHC 8.10.7. 
+# stack-8.10.7.yaml is for install script, stack.yaml is for default builds, keep these identical.
+# https://github.com/haskell/haskell-language-server/issues/2491
+
+resolver: lts-18.18
 
 packages:
   - .
@@ -17,8 +21,8 @@ packages:
   - ./plugins/hls-hlint-plugin
   - ./plugins/hls-retrie-plugin
   - ./plugins/hls-splice-plugin
-  - ./plugins/hls-qualify-imported-names-plugin
   - ./plugins/hls-tactics-plugin
+  - ./plugins/hls-qualify-imported-names-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
   - ./plugins/hls-floskell-plugin
@@ -52,8 +56,6 @@ extra-deps:
   - stm-containers-1.2@sha256:a887f2e7692b7cf20e0b081e2d66e21076e2bd4b57016ec59c484edfa2d29397,3244
   - stm-hamt-1.2.0.6@sha256:fba86ccb4b45c5706c19b0e1315ba63dcac3b5d71de945ec001ba921fae80061,3972
 
-
-
   # Enable these when supported by all formatters
   # - ghc-lib-9.0.1.20210324@sha256:c8b9a2541ea3424c8d0e4f80584477d0f35be03f4a47d931152042d5f446c5fc,19279
   # - ghc-lib-parser-9.0.1.20210324@sha256:fb680f78d4ab08b5d089a05bda3b84ad857e5edcc2e4ca7c188c0207d369af80