diff --git a/.gitignore b/.gitignore
index f2a7b12afa..da631ff741 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,5 @@ config.yml
 config.yaml
 *.db
 Run
-vikunja
 dist/
 cover.*
\ No newline at end of file
diff --git a/docker/etc/s6/vikunja/finish b/docker/etc/s6/vikunja/finish
new file mode 100755
index 0000000000..06bd986563
--- /dev/null
+++ b/docker/etc/s6/vikunja/finish
@@ -0,0 +1,2 @@
+#!/bin/bash
+exit 0
diff --git a/docker/etc/s6/vikunja/run b/docker/etc/s6/vikunja/run
new file mode 100755
index 0000000000..6af156128c
--- /dev/null
+++ b/docker/etc/s6/vikunja/run
@@ -0,0 +1,6 @@
+#!/bin/bash
+[[ -f ./setup ]] && source ./setup
+
+pushd /app/vikunja > /dev/null
+    exec su-exec $USER /app/vikunja/vikunja
+popd