diff --git a/Dockerfile b/Dockerfile
index 7e3eae95aa5e9523f3a79ca59e9716e616fdae22..205987e65feab0a54121c6388eff342dfd11e19c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,12 +3,11 @@
 FROM golang:1.12-alpine AS builder
 
 # Install build dependencies
-RUN apk add --no-cache git musl-dev
-
-COPY . /opt
+RUN apk add --no-cache git musl-dev dos2unix
 
 WORKDIR /opt
-
+COPY . /opt
+RUN dos2unix ./build.sh ./docker/run.sh
 RUN ./build.sh
 
 # ---- Stage 1 ----
@@ -19,11 +18,13 @@ COPY --from=builder /opt/bin/media_repo /opt/bin/import_synapse /usr/local/bin/
 
 RUN apk add --no-cache \
         su-exec \
-        ca-certificates
+        ca-certificates \
+        dos2unix
 
 COPY ./config.sample.yaml /etc/media-repo.yaml.sample
 COPY ./migrations /var/lib/media-repo-migrations
 COPY ./docker/run.sh /usr/local/bin/
+RUN dos2unix /usr/local/bin/run.sh
 
 ENV REPO_CONFIG=/data/media-repo.yaml