diff --git a/docker-compose.yml b/docker-compose.yml
index eef244f..25d4abc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,7 +37,7 @@ services:
       - slidge.env
 
   whatsapp:
-    image: codeberg.org/slidge/slidge-whatsapp:latest-amd64
+    build: ./images/slidge-whatsapp
     restart: always
     environment:
       - SLIDGE_JID=whatsapp
diff --git a/images/slidge-whatsapp/Dockerfile b/images/slidge-whatsapp/Dockerfile
new file mode 100644
index 0000000..e072100
--- /dev/null
+++ b/images/slidge-whatsapp/Dockerfile
@@ -0,0 +1,7 @@
+FROM codeberg.org/slidge/slidge-whatsapp:latest-amd64
+USER root
+
+COPY --chmod=555 entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT "/entrypoint.sh"
+
diff --git a/images/slidge-whatsapp/entrypoint.sh b/images/slidge-whatsapp/entrypoint.sh
new file mode 100644
index 0000000..2d45d59
--- /dev/null
+++ b/images/slidge-whatsapp/entrypoint.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+chown -fR slidge:slidge /var/lib/slidge
+
+runuser -u slidge slidge-whatsapp $@ 2>&1