diff --git a/Dockerfile b/Dockerfile
index 4774dc04..3e99543e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,10 +17,11 @@ FROM python:3-alpine
 
 WORKDIR /app
 
-RUN adduser radicale --home /var/lib/radicale --system --uid 1000 --disabled-password \
+RUN addgroup radicale \
+    && adduser radicale --home /var/lib/radicale --system --uid 1000 --disabled-password -G radicale \
     && apk add --no-cache ca-certificates openssl
 
-COPY --chown=radicale:nogroup --from=builder /app/venv /app
+COPY --chown=radicale:radicale --from=builder /app/venv /app
 
 # Persistent storage for data
 VOLUME /var/lib/radicale
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 892f40a4..0d9abe05 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -15,10 +15,11 @@ FROM python:3-alpine
 
 WORKDIR /app
 
-RUN adduser radicale --home /var/lib/radicale --system --uid 1000 --disabled-password \
+RUN addgroup radicale \
+    && adduser radicale --home /var/lib/radicale --system --uid 1000 --disabled-password -G radicale \
     && apk add --no-cache ca-certificates openssl
 
-COPY --chown=radicale:nogroup --from=builder /app/venv /app
+COPY --chown=radicale:radicale --from=builder /app/venv /app
 
 # Persistent storage for data
 VOLUME /var/lib/radicale