diff --git a/Dockerfile b/Dockerfile
index 5b059dd..f7db7ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,17 @@
 FROM golang:1.17.0-alpine3.14 as builder
 ENV CGO_ENABLED=0 GOOS=linux GOARCH=amd64
+
 RUN apk update && apk add --no-cache ca-certificates && update-ca-certificates
+
 WORKDIR /opt
 COPY . /opt/
-RUN ls /opt/
 RUN go build .
 
+#-----------#
 FROM scratch 
+WORKDIR /
 COPY --from=builder /opt/bagage /
+COPY --chown=1000:1000 --from=builder /mnt /s3_cache
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 USER 1000:1000
 ENTRYPOINT ["/bagage"]
diff --git a/main.go b/main.go
index a76690e..5895b12 100644
--- a/main.go
+++ b/main.go
@@ -22,14 +22,17 @@ func main() {
 	log.Println(config)
 
 	// Some init
-	os.MkdirAll(config.S3Cache, 0755)
+	err := os.MkdirAll(config.S3Cache, 0755)
+	if err != nil {
+		log.Fatalf("init failed: mkdir s3 cache failed: ", err)
+	}
 
 	// Launch our submodules
 	done := make(chan error)
 	go httpServer(config, done)
 	go sshServer(config, done)
 
-	err := <-done
+	err = <-done
 	if err != nil {
 		log.Fatalf("A component failed: %v", err)
 	}