diff --git a/Dockerfile b/Dockerfile
index d390ffc21..93ab0c25d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,4 +16,4 @@ VOLUME /bazarr/data
 
 EXPOSE 6767
 
-CMD ["python", "/bazarr/bazarr.py"]
+COPY root/ /
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 3cd06c31e..20e2e67f3 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -18,4 +18,4 @@ VOLUME /bazarr/data
 
 EXPOSE 6767
 
-CMD ["python", "/bazarr/bazarr.py"]
+COPY root/ /
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 652450af0..7eb81c35d 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -18,4 +18,4 @@ VOLUME /bazarr/data
 
 EXPOSE 6767
 
-CMD ["python", "/bazarr/bazarr.py"]
+COPY root/ /
diff --git a/root/etc/cont-init.d/20-config b/root/etc/cont-init.d/20-config
new file mode 100644
index 000000000..2669fbb24
--- /dev/null
+++ b/root/etc/cont-init.d/20-config
@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+# permissions
+chown -R abc:abc /bazarr/data
diff --git a/root/etc/services.d/bazarr/run b/root/etc/services.d/bazarr/run
new file mode 100644
index 000000000..45954db3a
--- /dev/null
+++ b/root/etc/services.d/bazarr/run
@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+exec s6-setuidgid abc python /bazarr/bazarr.py
+	
\ No newline at end of file