diff --git a/docker/service.Dockerfile b/docker/service.Dockerfile
index 9cea8c12..cac64040 100644
--- a/docker/service.Dockerfile
+++ b/docker/service.Dockerfile
@@ -69,12 +69,15 @@ RUN mkdir /app/data
 RUN mkdir /app/psql
 RUN mkdir /app/config
 
+RUN chown -R retrom:retrom /app
 RUN chmod -R 775 /app
 RUN chmod +x /app/start.sh
 
 VOLUME /app/config
 VOLUME /app/data
 
+USER retrom
+
 RUN umask ${UMASK}
 
 ENV EMBEDDED_DB_OPTS="?data_dir=/app/data&password_file=/app/.passwd&installation_dir=/app/psql"
diff --git a/packages/service/src/lib.rs b/packages/service/src/lib.rs
index 7c3c18bb..0589084a 100644
--- a/packages/service/src/lib.rs
+++ b/packages/service/src/lib.rs
@@ -17,14 +17,14 @@ use tokio::task::JoinHandle;
 use tower::Service;
 use tracing::Instrument;
 
+#[cfg(feature = "embedded_db")]
+use retrom_db::embedded::DB_NAME;
+
 pub mod config;
 mod grpc;
 mod providers;
 mod rest;
 
-#[cfg(feature = "embedded_db")]
-use retrom_db::embedded::DB_NAME;
-
 pub const DEFAULT_PORT: i32 = 5101;
 pub const DEFAULT_DB_URL: &str = "postgres://postgres:postgres@localhost/retrom";
 const CARGO_VERSION: &str = env!("CARGO_PKG_VERSION");