diff --git a/.gitignore b/.gitignore
index 14a36c38..4dcdfd83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ bazel-*
 coverage.txt
 test/data/
 *.orig
+.idea/
diff --git a/Dockerfile b/Dockerfile.build
similarity index 100%
rename from Dockerfile
rename to Dockerfile.build
diff --git a/Makefile b/Makefile
index 242b1291..0494eda3 100644
--- a/Makefile
+++ b/Makefile
@@ -43,9 +43,9 @@ run: binary test
 
 .PHONY: binary-container
 binary-container:
-	${CONTAINER_RUNTIME} build ${BUILD_ARGS} -f Dockerfile -t zot:latest .
+	${CONTAINER_RUNTIME} build ${BUILD_ARGS} -f Dockerfile.build -t zot-build:latest .
 	${CONTAINER_RUNTIME} run --rm --security-opt label=disable -v $$(pwd):/go/src/github.com/anuvu/zot \
-		zot:latest make
+		zot-build:latest make
 
 .PHONY: binary-stacker
 binary-stacker: