diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6e3955d45..d8f9de422 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,10 +1,9 @@
-FROM golang:alpine3.6
+FROM docker.io/golang:1.12.5-alpine3.9
 
 RUN mkdir /build
 
 WORKDIR /build
 
-RUN apk --update --no-cache add openssl bash git && \
-    go get github.com/constabulary/gb/...
+RUN apk --update --no-cache add openssl bash git
 
 CMD ["bash", "docker/build.sh"]
diff --git a/docker/build.sh b/docker/build.sh
index a478c867c..a3e3ca24d 100644
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-gb build
+./build.sh
 
 # Generate the keys if they don't already exist.
 if [ ! -f server.key ] || [ ! -f server.crt ] || [ ! -f matrix_key.pem ]; then
@@ -12,7 +12,7 @@ if [ ! -f server.key ] || [ ! -f server.crt ] || [ ! -f matrix_key.pem ]; then
                         -keyout server.key \
                         -out server.crt \
                         -days 3650 -nodes \
-                        -subj /CN=localhost 
+                        -subj /CN=localhost
 
     test -f matrix_key.pem || /build/bin/generate-keys -private-key matrix_key.pem
 fi
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index bde2f3336..763e5b0f0 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -7,7 +7,6 @@ services:
     build: ./
     volumes:
       - ..:/build
-      - ./build/pkg:/build/pkg
       - ./build/bin:/build/bin
     networks:
       - internal