diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0c855dcc5e..23d7adf753 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -154,6 +154,9 @@ jobs:
               - "*.tar.gz"
               - "*.sha256"
 
+      - store_artifacts:
+          path: dist/
+
   lint:
     parallelism: 1
     environment:
diff --git a/Makefile b/Makefile
index 86fb639367..116e6b1d07 100644
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,14 @@ define BUILD_FLAGS
 -X github.com/filecoin-project/bacalhau/pkg/version.GOARCH=$(GOARCH)
 endef
 
+define STATIC_BUILD_FLAGS
+-linkmode=external -extldflags '-static'
+endef
+
+ifeq (${GOOS},linux)
+BUILD_FLAGS += ${STATIC_BUILD_FLAGS}
+endif
+
 # If we are cross-compiling, bring in the appropriate compilers
 ifneq ($(GOOS)_$(GOARCH),$(OS)_$(ARCH))
 compile/${OS}/$(GOOS)_$(GOARCH).env: