diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..674541b
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+.git
+.stack-work
diff --git a/.gitmodules b/.gitmodules
index 33ec757..c9b1d0c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,3 +6,6 @@
 	path = test/fake-git-repos/with-gonito-yaml
 	url = git://gonito.net/gonito-fake-repo-for-tests
 	branch = with-gonito-yaml
+[submodule "geval"]
+	path = geval
+	url = git://gonito.net/geval
diff --git a/Dockerfile b/Dockerfile
index 279258a..bb2597c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,13 +6,25 @@ WORKDIR /root/
 
 RUN apt-get -y update && apt-get -y install libfcgi-dev && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN git clone git://gonito.net/geval && cd geval && git reset --hard a49abb560bd5e5f11f291f50176934fef5352c6c
-RUN git clone git://gonito.net/gonito && cd gonito && git reset --hard 0bad9b3e582c4807cf9bf1c70eae53489a1302a4
+COPY stack.yaml gonito.cabal /root/pre-build/
 
+COPY geval /root/pre-build/geval
 
-WORKDIR gonito
+WORKDIR /root/pre-build
 
-RUN stack install && rm -rf /root/.stack
+RUN ls /root
+
+RUN stack upgrade
+
+RUN stack --version
+
+RUN stack build --system-ghc --only-dependencies
+
+COPY . /root/gonito/
+
+WORKDIR /root/gonito
+
+RUN stack install --system-ghc && rm -rf /root/.stack
 
 FROM ubuntu:16.04 AS gonito-run
 
diff --git a/geval b/geval
new file mode 160000
index 0000000..54547fe
--- /dev/null
+++ b/geval
@@ -0,0 +1 @@
+Subproject commit 54547fe0f8edc2a7ce0f9c5b85edd9bff98b2cf2
diff --git a/stack.yaml b/stack.yaml
index 21071ec..d1c4ffc 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -5,7 +5,7 @@ flags:
 packages:
 - '.'
 extra-deps:
-  - ../geval
+  - ./geval
   - wai-handler-fastcgi-3.0.0.2
   - murmur3-1.0.3
   - random-strings-0.1.1.0