diff --git a/roles/rt/tasks/rt.yml b/roles/rt/tasks/rt.yml
index b7f34f4..d526e3c 100644
--- a/roles/rt/tasks/rt.yml
+++ b/roles/rt/tasks/rt.yml
@@ -24,6 +24,13 @@
     owner: root
     group: root
     mode: 0644
+- name: copy entry script
+  template:
+    src: etc/rt/entryscript.sh.j2
+    dest: /etc/rt/entryscript.sh
+    owner: root
+    group: root
+    mode: 0644
 - name: copy postgresql config
   template:
     src: etc/rt/postgresql.conf.j2
diff --git a/roles/rt/templates/etc/rt/docker-compose.yml.j2 b/roles/rt/templates/etc/rt/docker-compose.yml.j2
index b0cc44f..efc99f8 100644
--- a/roles/rt/templates/etc/rt/docker-compose.yml.j2
+++ b/roles/rt/templates/etc/rt/docker-compose.yml.j2
@@ -26,12 +26,12 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - /etc/rt/setup.sh:/usr/local/bin/setup.sh
       - /etc/rt/wait-for.sh:/usr/local/bin/wait-for.sh
+      - /etc/rt/entryscript.sh:/usr/local/bin/entryscript.sh
     restart: always
     entrypoint:
-      - /usr/local/bin/wait-for.sh
-      - database:5432
+      - /sbin/tini
       - --
-      - /usr/local/bin/setup.sh
+      - /usr/local/bin/entryscript.sh
     networks:
       - db_conn
     environment:
diff --git a/roles/rt/templates/etc/rt/entryscript.sh.j2 b/roles/rt/templates/etc/rt/entryscript.sh.j2
new file mode 100644
index 0000000..63306f7
--- /dev/null
+++ b/roles/rt/templates/etc/rt/entryscript.sh.j2
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/local/bin/wait-for.sh database:5432 -- /usr/local/bin/setup.sh