diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1948153f4..511660d76 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -121,6 +121,9 @@ jobs:
       - image: quay.io/haskell_works/ghc-8.4.3
     steps:
       - checkout
+      - run:
+          name: Install zlib
+          command: apt-get update && apt-get install -y zlib1g-dev
       - run:
           name: Sync submodules
           command: git submodule sync --recursive
@@ -129,7 +132,7 @@ jobs:
           command: git submodule update --recursive --init
       - restore-cache:
           keys:
-            - cabal-02
+            - cabal-01
       - run:
           name: Update
           command: cabal new-update
@@ -140,7 +143,7 @@ jobs:
           name: Build
           command: cabal new-build -j2
       - save_cache:
-          key: cabal-02
+          key: cabal-01
           paths:
             - ~/.cabal
 
diff --git a/cabal.project b/cabal.project
index 5aae70757..f0c29c885 100644
--- a/cabal.project
+++ b/cabal.project
@@ -3,6 +3,7 @@ packages:
          ./hie-plugin-api/
 
          ./submodules/HaRe
+         ./submodules/cabal-helper/
          ./submodules/ghc-mod/
          ./submodules/ghc-mod/core/
          ./submodules/haskell-lsp/
diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal
index 4aabeb8f5..d3b6b6cf0 100644
--- a/haskell-ide-engine.cabal
+++ b/haskell-ide-engine.cabal
@@ -53,7 +53,7 @@ library
                      , brittany
                      , bytestring
                      , Cabal
-                     , cabal-helper >= 0.8.1.0
+                     , cabal-helper >= 0.8.0.4
                      , containers
                      , data-default
                      , directory
diff --git a/stack-8.2.1.yaml b/stack-8.2.1.yaml
index 74f669c1b..e5d3026d2 100644
--- a/stack-8.2.1.yaml
+++ b/stack-8.2.1.yaml
@@ -7,6 +7,10 @@ packages:
     ./submodules/HaRe
   extra-dep: true
 
+- location:
+    ./submodules/cabal-helper
+  extra-dep: true
+
 - location:
     ./submodules/ghc-mod
   extra-dep: true
@@ -24,7 +28,6 @@ packages:
 extra-deps:
 - brittany-0.11.0.0
 - butcher-1.3.1.1
-- cabal-helper-0.8.1.0
 - cabal-plan-0.3.0.0
 - constrained-dynamic-0.1.0.0
 - czipwith-1.0.1.0
@@ -34,10 +37,10 @@ extra-deps:
 - lsp-test-0.2.1.0
 - hlint-2.0.11
 # - hlint-2.1.8
-- hsimport-0.8.6
 - sorted-list-0.2.1.0
 - syz-0.2.0.0
 - yaml-0.8.32
+- hsimport-0.8.6
 
 flags:
   haskell-ide-engine:
diff --git a/stack-8.2.2.yaml b/stack-8.2.2.yaml
index cc65e5693..bcac96d43 100644
--- a/stack-8.2.2.yaml
+++ b/stack-8.2.2.yaml
@@ -1,4 +1,4 @@
-resolver: lts-11.18 # lts-11.x is the last one for GHC 8.2.2
+resolver: lts-11.22 # lts-11.x is the last one for GHC 8.2.2
 packages:
 - .
 - hie-plugin-api
@@ -7,6 +7,10 @@ packages:
     ./submodules/HaRe
   extra-dep: true
 
+- location:
+    ./submodules/cabal-helper
+  extra-dep: true
+
 - location:
     ./submodules/ghc-mod
   extra-dep: true
@@ -24,9 +28,7 @@ packages:
 extra-deps:
 - brittany-0.11.0.0
 - butcher-1.3.1.1
-- cabal-helper-0.8.1.0
 - cabal-plan-0.3.0.0
-- conduit-parse-0.2.1.0
 - constrained-dynamic-0.1.0.0
 - czipwith-1.0.1.0
 - haddock-api-2.18.1
@@ -35,6 +37,7 @@ extra-deps:
 - lsp-test-0.2.1.0
 - sorted-list-0.2.1.0
 - syz-0.2.0.0
+- conduit-parse-0.2.1.0
 
 flags:
   haskell-ide-engine:
diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml
index af7003c12..3b32f184f 100644
--- a/stack-8.4.2.yaml
+++ b/stack-8.4.2.yaml
@@ -7,6 +7,10 @@ packages:
     ./submodules/HaRe
   extra-dep: true
 
+- location:
+    ./submodules/cabal-helper
+  extra-dep: true
+
 - location:
     ./submodules/ghc-mod
   extra-dep: true
@@ -24,7 +28,6 @@ packages:
 extra-deps:
 - base-compat-0.9.3
 - brittany-0.11.0.0
-- cabal-helper-0.8.1.0
 - cabal-plan-0.3.0.0
 - constrained-dynamic-0.1.0.0
 - haddock-api-2.20.0
diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml
index 0ee8673e9..590d3d6d4 100644
--- a/stack-8.4.3.yaml
+++ b/stack-8.4.3.yaml
@@ -7,6 +7,10 @@ packages:
     ./submodules/HaRe
   extra-dep: true
 
+- location:
+    ./submodules/cabal-helper
+  extra-dep: true
+
 - location:
     ./submodules/ghc-mod
   extra-dep: true
@@ -22,8 +26,8 @@ packages:
     - haskell-lsp-types
 
 extra-deps:
+- apply-refact-0.5.0.0
 - base-compat-0.9.3
-- cabal-helper-0.8.1.0
 - cabal-plan-0.3.0.0
 - constrained-dynamic-0.1.0.0
 - haddock-api-2.20.0
diff --git a/stack.yaml b/stack.yaml
index 462252f08..34f37a08e 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2018-07-26 # GHC 8.4.3
+resolver: nightly-2018-07-09 # GHC 8.4.3
 packages:
 - .
 - hie-plugin-api
@@ -7,6 +7,10 @@ packages:
     ./submodules/HaRe
   extra-dep: true
 
+- location:
+    ./submodules/cabal-helper
+  extra-dep: true
+
 - location:
     ./submodules/ghc-mod
   extra-dep: true
@@ -22,22 +26,16 @@ packages:
     - haskell-lsp-types
 
 extra-deps:
-- aeson-1.3.1.1
 - apply-refact-0.5.0.0
 - base-compat-0.9.3
-- brittany-0.11.0.0
-- cabal-helper-0.8.1.0
 - cabal-plan-0.3.0.0
 - constrained-dynamic-0.1.0.0
-- ekg-0.4.0.15
-- ekg-json-0.1.0.6
-- ghc-exactprint-0.5.6.1
 - haddock-api-2.20.0
+- haddock-library-1.6.0
 - hsimport-0.8.6
 - lsp-test-0.2.1.0
 - syz-0.2.0.0
 - temporary-1.2.1.1
-- yaml-0.8.32
 
 flags:
   haskell-ide-engine: