diff --git a/Dockerfile b/Dockerfile
index fab7901d..2e1e7403 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ RUN make build
 RUN echo "hauler:x:1001:1001::/home:" > /etc/passwd \
 && echo "hauler:x:1001:hauler" > /etc/group \
 && mkdir /store \
-&& mkdir /store-files \
+&& mkdir /fileserver \
 && mkdir /registry
 
 FROM scratch
@@ -19,7 +19,7 @@ COPY --from=builder --chown=hauler:hauler /home/. /home
 COPY --from=builder --chown=hauler:hauler /tmp/. /tmp
 COPY --from=builder --chown=hauler:hauler /store/. /store
 COPY --from=builder --chown=hauler:hauler /registry/. /registry
-COPY --from=builder --chown=hauler:hauler /store-files/. /store-files
+COPY --from=builder --chown=hauler:hauler /fileserver/. /fileserver
 COPY --from=builder --chown=hauler:hauler /build/bin/hauler /
 USER hauler
 ENTRYPOINT [ "/hauler" ]
diff --git a/cmd/hauler/cli/store/serve.go b/cmd/hauler/cli/store/serve.go
index 50463932..fcf7d490 100644
--- a/cmd/hauler/cli/store/serve.go
+++ b/cmd/hauler/cli/store/serve.go
@@ -68,7 +68,7 @@ func ServeRegistryCmd(ctx context.Context, o *ServeRegistryOpts, s *store.Layout
 	if err != nil {
 		return err
 	}
-	
+
 	if err = r.ListenAndServe(); err != nil {
 		return err
 	}
@@ -79,8 +79,8 @@ func ServeRegistryCmd(ctx context.Context, o *ServeRegistryOpts, s *store.Layout
 type ServeFilesOpts struct {
 	*RootOpts
 
-	Port       int
-	RootDir    string
+	Port    int
+	RootDir string
 
 	storedir string
 }
@@ -89,7 +89,7 @@ func (o *ServeFilesOpts) AddFlags(cmd *cobra.Command) {
 	f := cmd.Flags()
 
 	f.IntVarP(&o.Port, "port", "p", 8080, "Port to listen on.")
-	f.StringVar(&o.RootDir, "directory", "store-files", "Directory to use for backend.  Defaults to $PWD/store-files")
+	f.StringVar(&o.RootDir, "directory", "fileserver", "Directory to use for backend.  Defaults to $PWD/fileserver")
 }
 
 func ServeFilesCmd(ctx context.Context, o *ServeFilesOpts, s *store.Layout) error {
@@ -100,7 +100,7 @@ func ServeFilesCmd(ctx context.Context, o *ServeFilesOpts, s *store.Layout) erro
 	if err := CopyCmd(ctx, opts, s, "dir://"+o.RootDir); err != nil {
 		return err
 	}
-	
+
 	cfg := server.FileConfig{
 		Root: o.RootDir,
 		Port: o.Port,
@@ -110,7 +110,7 @@ func ServeFilesCmd(ctx context.Context, o *ServeFilesOpts, s *store.Layout) erro
 	if err != nil {
 		return err
 	}
-	
+
 	l.Infof("starting file server on port [%d]", o.Port)
 	if err := f.ListenAndServe(); err != nil {
 		return err