diff --git a/Dockerfile b/Dockerfile
index 57d96d9..0988c03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,17 +3,15 @@ FROM git.zontreck.com/packages/flutter:latest as BUILDER
 WORKDIR /app
 COPY . .
 
-
 RUN dart pub get
-RUN dart fix --apply
 RUN dart compile exe -o bugvaultd cli/server.dart
 
 FROM git.zontreck.com/packages/debian:base
 
-LABEL author Tara Piccari
-LABEL email tarapiccari@gmail.com
+LABEL author="Tara Piccari"
+LABEL email="tarapiccari@gmail.com"
 
-ENV BUGVAULT_DATA_DIRECTORY /data
+ENV BUGVAULT_DATA_DIRECTORY=/data
 
 COPY --from=BUILDER /app/bugvaultd /sbin/bugvaultd
 
@@ -23,8 +21,13 @@ COPY ./docker-entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
 WORKDIR /data
+
+# Create user without home directory, default group is created
 RUN useradd -s /bin/bash -d /data -M bugvault
 
+# Ensure bugvault has correct permissions
+RUN chown -R bugvault:bugvault /data
+
 USER bugvault:bugvault
 
-ENTRYPOINT [ "/entrypoint.sh" ]
\ No newline at end of file
+ENTRYPOINT ["/entrypoint.sh"]