diff --git a/Dockerfile b/Dockerfile
index 3d2e9ec..6fe694d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,7 @@ RUN cd /app/server/ui && yarn && yarn build
 
 FROM rust:1.33 as rust
 COPY server/service /app/server/service
+WORKDIR /app/server/service
 RUN cd /app/server/service && cargo build --release
 
 FROM debian:jessie-slim as volume
@@ -26,9 +27,5 @@ COPY --from=volume /db/torrent_files.json /app/
 COPY scripts /app/scripts
 WORKDIR /app/scripts/
 RUN ["/bin/bash", "-c", "/app/scripts/build_sqlite.sh"]
-
 EXPOSE 8080
 WORKDIR /app/
-ARG TORRENTS_CSV_DB_FILE
-RUN sqlite3 ${TORRENTS_CSV_DB_FILE} 'select * from torrents limit 10'
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 30f538e..50876bd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,7 @@ services:
     build: 
       context: .
     command: /bin/sh -c /app/torrents-csv-service
+    restart: always
     ports:
     - "8080:8080"
     environment: