diff --git a/.dockerignore b/.dockerignore
index 77bff3639..b450d3dbd 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -68,4 +68,3 @@ private/plugin/redwood/.gitignore
 
 # Docker
 .dockerignore
-Dockerfile*
diff --git a/Makefile b/Makefile
index b94ab3c9d..508d7f995 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ ifneq ($(wildcard ./version.env),)
 endif
 
 VERSION_BASE?=platform
-VERSION_SHORT_COMMIT?=$(shell git rev-parse --short HEAD || echo "dev")
-VERSION_FULL_COMMIT?=$(shell git rev-parse HEAD || echo "dev")
+VERSION_SHORT_COMMIT?=$(shell git rev-parse --short HEAD 2> /dev/null || echo "dev")
+VERSION_FULL_COMMIT?=$(shell git rev-parse HEAD 2> /dev/null || echo "dev")
 VERSION_PACKAGE?=$(REPOSITORY_PACKAGE)/application
 
 GOIMPORTS_LOCAL:=github.com/tidepool-org/platform