diff --git a/.circleci/config.yml b/.circleci/config.yml
index e0e9db2..d4628c7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
     steps:
     - checkout
     - setup_remote_docker:
-        version: 18.06.0-ce
+        # version: 18.06.0-ce
     - run:
         name: Build monorepo
         shell: /bin/bash
diff --git a/services/samplesvc/Makefile b/services/samplesvc/Makefile
index 850f19b..37fbbb1 100644
--- a/services/samplesvc/Makefile
+++ b/services/samplesvc/Makefile
@@ -14,7 +14,7 @@ $(BASE):
 
 .PHONY: custom docker deploy
 
-# The rule that is called by our root Makefile during CI builds.
+## The rule that is called by our root Makefile during CI builds.
 custom: docker deploy
 
 docker:
diff --git a/services/samplesvc/dockerfile.samplesvc b/services/samplesvc/dockerfile.samplesvc
index 5e399db..1459654 100644
--- a/services/samplesvc/dockerfile.samplesvc
+++ b/services/samplesvc/dockerfile.samplesvc
@@ -5,6 +5,7 @@ COPY pkg/ /go/src/github.com/flowerinthenight/golang-monorepo/pkg/
 COPY vendor/ /go/src/github.com/flowerinthenight/golang-monorepo/vendor/
 COPY services/samplesvc/ /go/src/github.com/flowerinthenight/golang-monorepo/services/samplesvc/
 WORKDIR /go/src/github.com/flowerinthenight/golang-monorepo/services/samplesvc/
+RUN echo "HOME=$HOME"
 RUN GO111MODULE=on GOFLAGS=-mod=vendor CGO_ENABLED=0 GOOS=linux go build -v -ldflags "-X github.com/flowerinthenight/golang-monorepo/services/samplesvc/main.version=$version" -a -installsuffix cgo -o samplesvc .
 
 FROM debian:stable-slim