diff --git a/Dockerfile b/Dockerfile
index f987e91..fb80684 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,5 +28,4 @@ RUN ln -s /opt/conda/bin/python3 /usr/local/bin/python3
 RUN ln -s /opt/conda/bin/python3 /usr/local/bin/python
 
 # 3. Source code
-RUN git clone --recurse-submodules https://github.com/solokeys/solo /solo
-
+RUN git clone --recurse-submodules https://github.com/solokeys/solo /solo --config core.autocrlf=input
diff --git a/Makefile b/Makefile
index db5ca71..1e6b38b 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,9 @@ DOCKER_IMAGE := "solokeys/solo-firmware:local"
 SOLO_VERSIONISH := "master"
 docker-build:
 	docker build -t $(DOCKER_IMAGE) .
-	docker run --rm -v$(PWD)/builds:/builds -v$(PWD)/in-docker-build.sh:/in-docker-build.sh $(DOCKER_IMAGE) /in-docker-build.sh $(SOLO_VERSIONISH)
+	docker run --rm -v "$(CURDIR)/builds:/builds" \
+				    -v "$(CURDIR)/in-docker-build.sh:/in-docker-build.sh" \
+				    $(DOCKER_IMAGE) /in-docker-build.sh $(SOLO_VERSIONISH)
 
 CPPCHECK_FLAGS=--quiet --error-exitcode=2