diff --git a/.gitignore b/.gitignore
index 6025f5a4b..0ee62cfb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,8 @@ cabal.sandbox.config
 .stack-work
 DATA_DIR
 
+stack*.yaml.lock
+
 # Generated documentation (not exhaustive)
 demos/index-numbers.html
 demos/resourcegrammars.html
diff --git a/stack-ghc7.10.3.yaml b/stack-ghc7.10.3.yaml
index b374243e5..a64e4e614 100644
--- a/stack-ghc7.10.3.yaml
+++ b/stack-ghc7.10.3.yaml
@@ -1,11 +1 @@
 resolver: lts-6.35 # ghc 7.10.3
-
-packages:
-- . # GF, PGF
-- src/runtime/haskell-bind # PGF2 (requires C runtime to be installed)
-
-extra-deps:
-
-flags:
-  gf:
-    server: true
diff --git a/stack-ghc8.0.2.yaml b/stack-ghc8.0.2.yaml
index ee8bd7414..af08206d9 100644
--- a/stack-ghc8.0.2.yaml
+++ b/stack-ghc8.0.2.yaml
@@ -1,11 +1 @@
 resolver: lts-9.21 # ghc 8.0.2
-
-packages:
-- . # GF, PGF
-- src/runtime/haskell-bind # PGF2 (requires C runtime to be installed)
-
-extra-deps:
-
-flags:
-  gf:
-    server: true
diff --git a/stack-ghc8.2.2.yaml b/stack-ghc8.2.2.yaml
index 5b8546ae4..c33c53b33 100644
--- a/stack-ghc8.2.2.yaml
+++ b/stack-ghc8.2.2.yaml
@@ -1,14 +1,6 @@
 resolver: lts-11.22 # ghc 8.2.2
 
-packages:
-- . # GF, PGF
-- src/runtime/haskell-bind # PGF2 (requires C runtime to be installed)
-
 extra-deps:
-- cgi-3001.3.0.2
+- cgi-3001.3.0.3
 - httpd-shed-0.4.0.3
-- time-1.6.0.1 # cgi-3001.3.0.2: time-1.8.0.2 from stack configuration does not match >=1.5 && <1.7
-
-flags:
-  gf:
-    server: true
+- exceptions-0.10.2
diff --git a/stack-ghc8.4.3.yaml b/stack-ghc8.4.3.yaml
deleted file mode 100644
index 07be023df..000000000
--- a/stack-ghc8.4.3.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-resolver: lts-12.14 # ghc 8.4.3
-
-packages:
-- . # GF, PGF
-- src/runtime/haskell-bind # PGF2 (requires C runtime to be installed)
-
-extra-deps:
-- cgi-3001.3.0.3
-
-flags:
-  gf:
-    server: true
diff --git a/stack-ghc8.4.4.yaml b/stack-ghc8.4.4.yaml
new file mode 100644
index 000000000..c1a68e2d5
--- /dev/null
+++ b/stack-ghc8.4.4.yaml
@@ -0,0 +1,4 @@
+resolver: lts-12.26 # ghc 8.4.4
+
+extra-deps:
+- cgi-3001.3.0.3
diff --git a/stack-ghc8.6.2.yaml b/stack-ghc8.6.2.yaml
deleted file mode 100644
index 12eebe0d9..000000000
--- a/stack-ghc8.6.2.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-resolver: nightly-2018-12-04 # ghc 8.6.2
-
-packages:
-- . # GF, PGF
-- src/runtime/haskell-bind # PGF2 (requires C runtime to be installed)
-
-extra-deps:
-- json-0.9.2
-- network-2.6.3.6
-
-flags:
-  gf:
-    server: true
diff --git a/stack-ghc8.6.5.yaml b/stack-ghc8.6.5.yaml
new file mode 100644
index 000000000..0f98f8dfc
--- /dev/null
+++ b/stack-ghc8.6.5.yaml
@@ -0,0 +1,5 @@
+resolver: lts-14.3 # ghc 8.6.5
+
+extra-deps:
+- network-2.6.3.6
+- httpd-shed-0.4.0.3
diff --git a/stack.yaml b/stack.yaml
index 5b8546ae4..59e36c4fa 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,14 +1,9 @@
+# This default stack file is a copy of stack-ghc8.2.2.yaml
+# But committing a symlink is probably a bad idea, so it's a real copy
+
 resolver: lts-11.22 # ghc 8.2.2
 
-packages:
-- . # GF, PGF
-- src/runtime/haskell-bind # PGF2 (requires C runtime to be installed)
-
 extra-deps:
-- cgi-3001.3.0.2
+- cgi-3001.3.0.3
 - httpd-shed-0.4.0.3
-- time-1.6.0.1 # cgi-3001.3.0.2: time-1.8.0.2 from stack configuration does not match >=1.5 && <1.7
-
-flags:
-  gf:
-    server: true
+- exceptions-0.10.2