diff --git a/docker/.env b/docker/.env
new file mode 100644
index 0000000..c00aca0
--- /dev/null
+++ b/docker/.env
@@ -0,0 +1 @@
+PODMAN_USERNS=keep-id
\ No newline at end of file
diff --git a/docker/.gitignore b/docker/.gitignore
deleted file mode 100644
index e22ec51..0000000
--- a/docker/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/chorus.toml
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 05e9c33..8c51a39 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,11 +13,9 @@ FROM alpine:latest
 # RUN apk add --no-cache curl gcc musl-dev openssl-dev pkgconfig git make cmake
 
 # Setup chorus user and directories
-RUN adduser --system --home /opt/chorus --shell /bin/sh chorus && \
-    mkdir -p /opt/chorus/etc /opt/chorus/src/chorus /opt/chorus/var /opt/chorus/sbin /opt/chorus/lib && \
+RUN mkdir -p /opt/chorus/etc /opt/chorus/src/chorus /opt/chorus/var /opt/chorus/sbin /opt/chorus/lib && \
     mkdir -p /opt/chorus/var/chorus /opt/chorus/var/www && \
-    mkdir -p /opt/chorus/lib/systemd/system && \
-    chown -R chorus /opt/chorus
+    mkdir -p /opt/chorus/lib/systemd/system
 
 COPY --from=builder /root/chorus/target/release/chorus /opt/chorus/sbin/chorus
 COPY --from=builder /root/chorus/target/release/chorus_cmd /opt/chorus/sbin/chorus_cmd
@@ -26,16 +24,12 @@ COPY --from=builder /root/chorus/target/release/chorus_dump /opt/chorus/sbin/cho
 COPY --from=builder /root/chorus/target/release/chorus_dump_approvals /opt/chorus/sbin/chorus_dump_approvals
 COPY --from=builder /root/chorus/target/release/chorus_moderate /opt/chorus/sbin/chorus_moderate
 
-RUN chown -R chorus /opt/chorus/sbin && chmod 0700 /opt/chorus/sbin/*
-
-COPY chorus.toml /opt/chorus/etc/chorus.toml
-RUN chown chorus /opt/chorus/etc/chorus.toml
+RUN chmod 0700 /opt/chorus/sbin/*
 
 VOLUME /opt/chorus/etc
 VOLUME /opt/chorus/var
 
 WORKDIR /opt/chorus
-USER chorus
 ENV RUST_BACKTRACE=1
 ENV RUST_LOG=info
 ENTRYPOINT ["/opt/chorus/sbin/chorus", "/opt/chorus/etc/chorus.toml"]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 0000000..51c6753
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,12 @@
+services:
+  chorus:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: chorus
+    restart: unless-stopped
+    volumes:
+      - ./etc:/opt/chorus/etc
+      - ./var:/opt/chorus/var
+    ports:
+      - 443:1444
diff --git a/docker/etc/.gitignore b/docker/etc/.gitignore
new file mode 100644
index 0000000..46d7460
--- /dev/null
+++ b/docker/etc/.gitignore
@@ -0,0 +1 @@
+/chorus.toml
\ No newline at end of file
diff --git a/docker/chorus.toml.in b/docker/etc/chorus.toml.in
similarity index 100%
rename from docker/chorus.toml.in
rename to docker/etc/chorus.toml.in
diff --git a/docker/var/.gitignore b/docker/var/.gitignore
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/docker/var/.gitignore
@@ -0,0 +1 @@
+