diff --git a/cabal.project b/cabal.project
index 26b29981e73..60fd8bef917 100644
--- a/cabal.project
+++ b/cabal.project
@@ -28,6 +28,12 @@ package *
   ghc-options: -haddock
   test-show-details: direct
 
+-- ghc-api-compat-8.6
+source-repository-package
+  type: git
+  location: https://github.com/pepeiborra/ghc-api-compat
+  tag: 6546157c7a7e1d323d4bf961768804119450c1aa
+
 write-ghc-environment-files: never
 
 index-state: 2021-05-21T05:01:41Z
diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml
index c3d2ffa67cb..51c1f1b7ed0 100644
--- a/stack-8.10.3.yaml
+++ b/stack-8.10.3.yaml
@@ -36,7 +36,9 @@ extra-deps:
   - data-tree-print-0.1.0.2@rev:2
   - floskell-0.10.4
   - fourmolu-0.3.0.0
-  - ghc-api-compat-8.6
+  - # ghc-api-compat-8.6
+    github: pepeiborra/ghc-api-compat
+    commit: 6546157c7a7e1d323d4bf961768804119450c1aa
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-lib-8.10.4.20210206
diff --git a/stack-8.10.4.yaml b/stack-8.10.4.yaml
index 7c7f25ddebe..887287a7ad9 100644
--- a/stack-8.10.4.yaml
+++ b/stack-8.10.4.yaml
@@ -36,7 +36,9 @@ extra-deps:
   - data-tree-print-0.1.0.2@rev:2
   - floskell-0.10.4
   - fourmolu-0.3.0.0
-  - ghc-api-compat-8.6
+  - # ghc-api-compat-8.6
+    github: pepeiborra/ghc-api-compat
+    commit: 6546157c7a7e1d323d4bf961768804119450c1aa
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - heapsize-0.3.0
diff --git a/stack-8.10.5.yaml b/stack-8.10.5.yaml
index 5526f7423e9..3a91eaf944c 100644
--- a/stack-8.10.5.yaml
+++ b/stack-8.10.5.yaml
@@ -89,8 +89,8 @@ flags:
   hls-hlint-plugin:
     hlint33: false
 
-# Because of implicit-hie-cradle-0.3.0.2 and stylish-haskell-0.12.2.0
-allow-newer: true
+# # Because of implicit-hie-cradle-0.3.0.2 and stylish-haskell-0.12.2.0
+# allow-newer: true
 
 nix:
   packages: [ icu libcxx zlib ]
diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml
index 57f52c04280..bb10729fe3b 100644
--- a/stack-8.6.4.yaml
+++ b/stack-8.6.4.yaml
@@ -43,7 +43,9 @@ extra-deps:
   - floskell-0.10.4
   - fourmolu-0.3.0.0
   - fuzzy-0.1.0.0
-  - ghc-api-compat-8.6
+  - # ghc-api-compat-8.6
+    github: pepeiborra/ghc-api-compat
+    commit: 6546157c7a7e1d323d4bf961768804119450c1aa
   - ghc-check-0.5.0.4
   - ghc-events-0.13.0
   - ghc-exactprint-0.6.4
diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
index 257d5c42748..a6025b69f1e 100644
--- a/stack-8.6.5.yaml
+++ b/stack-8.6.5.yaml
@@ -44,7 +44,9 @@ extra-deps:
   - floskell-0.10.4
   - fourmolu-0.3.0.0
   - fuzzy-0.1.0.0
-  - ghc-api-compat-8.6
+  - # ghc-api-compat-8.6
+    github: pepeiborra/ghc-api-compat
+    commit: 6546157c7a7e1d323d4bf961768804119450c1aa
   - ghc-check-0.5.0.4
   - ghc-events-0.13.0
   - ghc-exactprint-0.6.4
diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml
index 06f346efe19..c5f9e450c0c 100644
--- a/stack-8.8.2.yaml
+++ b/stack-8.8.2.yaml
@@ -38,7 +38,9 @@ extra-deps:
   - constrained-dynamic-0.1.0.0
   - floskell-0.10.4
   - fourmolu-0.3.0.0
-  - ghc-api-compat-8.6
+  - # ghc-api-compat-8.6
+    github: pepeiborra/ghc-api-compat
+    commit: 6546157c7a7e1d323d4bf961768804119450c1aa
   - ghc-check-0.5.0.4
   - ghc-events-0.13.0
   - ghc-exactprint-0.6.4
diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml
index 8f706b0099f..873da37237f 100644
--- a/stack-8.8.3.yaml
+++ b/stack-8.8.3.yaml
@@ -38,7 +38,9 @@ extra-deps:
   - constrained-dynamic-0.1.0.0
   - floskell-0.10.4
   - fourmolu-0.3.0.0
-  - ghc-api-compat-8.6
+  - # ghc-api-compat-8.6
+    github: pepeiborra/ghc-api-compat
+    commit: 6546157c7a7e1d323d4bf961768804119450c1aa
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-lib-8.10.4.20210206
diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml
index 1a0fe87220b..4e21ce7ae1f 100644
--- a/stack-8.8.4.yaml
+++ b/stack-8.8.4.yaml
@@ -38,7 +38,9 @@ extra-deps:
   - constrained-dynamic-0.1.0.0
   - floskell-0.10.4
   - fourmolu-0.3.0.0
-  - ghc-api-compat-8.6
+  - # ghc-api-compat-8.6
+    github: pepeiborra/ghc-api-compat
+    commit: 6546157c7a7e1d323d4bf961768804119450c1aa
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-lib-8.10.4.20210206
diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml
index 452167ea1b1..5d0b0b55897 100644
--- a/stack-9.0.1.yaml
+++ b/stack-9.0.1.yaml
@@ -67,8 +67,8 @@ extra-deps:
   commit: 9b1445ab5efcabfad54043fc9b8e50e9d8c5bbf3
 # https://github.com/mpickering/hie-bios/pull/285
 
-- github: hsyl20/ghc-api-compat
-  commit: 6178d75772c7d923918dfffa0b1f503dfb36d0a6
+- github: pepeiborra/ghc-api-compat
+  commit: 6546157c7a7e1d323d4bf961768804119450c1aa
 
 - github: anka-213/th-extras
   commit: 57a97b4df128eb7b360e8ab9c5759392de8d1659