diff --git a/.circleci/config.yml b/.circleci/config.yml
index f0ec335ba..ef6b7ce80 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -147,6 +147,14 @@ jobs:
           at: .
       - run: sudo pip install awscli
       - run: make prerelease-upload
+  docker-build:
+    executor:
+      name: golang
+    steps:
+      - checkout-plus
+      - setup_remote_docker
+      - run: make docker
+      - run: docker run pilosa:$(git describe --tags) help
   dockerhub-upload-unstable:
     executor:
       name: golang
@@ -154,6 +162,7 @@ jobs:
       - checkout-plus
       - setup_remote_docker
       - run: make docker
+      - run: docker run pilosa:$(git describe --tags) help
       - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
       - run: make docker-tag-push DOCKER_TARGET=moleculacorp/pilosa:<< pipeline.git.branch >>
   dockerhub-upload-stable:
@@ -163,6 +172,7 @@ jobs:
       - checkout-plus
       - setup_remote_docker
       - run: make docker
+      - run: docker run pilosa:$(git describe --tags) help
       - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
       - run: make docker-tag-push DOCKER_TARGET=moleculacorp/pilosa:<< pipeline.git.tag >>
       - run: make docker-tag-push DOCKER_TARGET=moleculacorp/pilosa:latest
@@ -218,6 +228,10 @@ workflows:
       - cluster-tests:
           requires:
             - setup
+      - docker-build:
+          context: molecula
+          requires:
+            - setup
       - prerelease:
           requires:
             - linter
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..d5de893f3
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+lattice
diff --git a/Dockerfile b/Dockerfile
index effa5008c..955f499ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG MAKE_FLAGS
 
 COPY . pilosa
 
-RUN cd pilosa && CGO_ENABLED=0 make install FLAGS="-a -mod=vendor ${BUILD_FLAGS}" ${MAKE_FLAGS}
+RUN cd pilosa && make install FLAGS="-a -mod=vendor ${BUILD_FLAGS}" ${MAKE_FLAGS}
 
 FROM alpine:3.12.1
 
diff --git a/Makefile b/Makefile
index dad5fec72..173c2381e 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,7 @@ endif
 
 export GO111MODULE=on
 export GOPRIVATE=github.com/molecula
+export CGO_ENABLED=0
 
 # Run tests and compile Pilosa
 default: test build