diff --git a/Dockerfile b/Dockerfile
index 6c5c46bb..db4d273a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,14 @@
 FROM ubuntu:xenial
 
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y postgresql-client golang-go ca-certificates
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y postgresql-client golang-1.13-go ca-certificates git
+
+ENV GOPATH=/go
 ADD . /go/src/github.com/CanonicalLtd/serial-vault
 
 WORKDIR /go/src/github.com/CanonicalLtd/serial-vault
 # get dependencies
-RUN go get ./...
+RUN /usr/lib/go-1.13/bin/go get ./...
 
 COPY ./docker-compose/settings.yaml /go/src/github.com/CanonicalLtd/serial-vault
 COPY ./docker-compose/docker-entrypoint.sh /
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 1bb12f9f..7664215a 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   db:
-    image: postgres
+    image: postgres:9
     env_file:
       - ./env
   web:
diff --git a/docker-compose/docker-entrypoint.sh b/docker-compose/docker-entrypoint.sh
index be457f42..ca8aca0f 100755
--- a/docker-compose/docker-entrypoint.sh
+++ b/docker-compose/docker-entrypoint.sh
@@ -28,5 +28,5 @@ sed -i  \
   -e "s/KEYSTORE_SECRET/$KEYSTORE_SECRET/g" \
   settings.yaml
 
-go run cmd/serial-vault/main.go -mode=admin &
-go run cmd/serial-vault/main.go -mode=signing
+/usr/lib/go-1.13/bin/go run cmd/serial-vault/main.go -mode=admin &
+/usr/lib/go-1.13/bin/go run cmd/serial-vault/main.go -mode=signing