diff --git a/pastebin/.gitignore b/pastebin/.gitignore
new file mode 100644
index 0000000..65eef93
--- /dev/null
+++ b/pastebin/.gitignore
@@ -0,0 +1 @@
+db
diff --git a/pastebin/Dockerfile b/pastebin/Dockerfile
index 013a350..5e522ea 100644
--- a/pastebin/Dockerfile
+++ b/pastebin/Dockerfile
@@ -15,13 +15,11 @@ RUN git clone https://github.com/mkaczanowski/pastebin.git . && \
 FROM debian:buster-slim
 RUN apt-get update --quiet && \
     apt-get install --quiet --yes --no-install-recommends \
-    gosu \
-    tini && \
+    gosu && \
     rm -rf /var/lib/apt/lists/* && \
     mkdir -p /rs/db
 COPY --from=builder /rs/target/release/pastebin /rs/pastebin
 COPY entrypoint.sh /rs/entrypoint.sh
 WORKDIR /rs
 
-ENTRYPOINT ["tini", "--"]
 CMD ["/bin/sh", "/rs/entrypoint.sh"]
diff --git a/pastebin/docker-compose.caddy.yml b/pastebin/docker-compose.caddy.yml
index 9f88a0b..18e2316 100644
--- a/pastebin/docker-compose.caddy.yml
+++ b/pastebin/docker-compose.caddy.yml
@@ -1,7 +1,7 @@
 version: "3"
 
 services:
-  laverna:
+  pastebin:
     networks:
       - proxy
     labels:
diff --git a/pastebin/docker-compose.yml b/pastebin/docker-compose.yml
index 0b6978a..393537d 100644
--- a/pastebin/docker-compose.yml
+++ b/pastebin/docker-compose.yml
@@ -5,5 +5,6 @@ services:
     image: atareao/pastebin:v1.0
     container_name: pastebin
     restart: unless-stopped
+    init: true
     volumes:
       - ./db:/rs/db
diff --git a/pastebin/entrypoint.sh b/pastebin/entrypoint.sh
index c05ba67..3358ae2 100644
--- a/pastebin/entrypoint.sh
+++ b/pastebin/entrypoint.sh
@@ -24,10 +24,12 @@
 USER_ID=${LOCAL_UID:-1000}
 GROUP_ID=${LOCAL_GID:-1000}
 
-echo "Starting with UID: $USER_ID, GID: $GROUP_ID"
-useradd -u "$USER_ID" -o -m dockerus
-groupmod -g "$GROUP_ID" dockerus
-export HOME=/home/dockerus
+if ! id dockerus &>/dev/null; then
+    echo "Starting with UID: $USER_ID, GID: $GROUP_ID"
+    useradd --uid "$USER_ID" --non-unique dockerus
+    groupmod --gid "$GROUP_ID" dockerus
+    echo "User created"
+fi
 
 chown -R dockerus:dockerus /rs