diff --git a/Dockerfile b/Dockerfile
index 2d4b5d2..5c4f3d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,11 +5,16 @@ RUN chmod +x /usr/local/bin/*.sh
 
 RUN mkdir -p ${BACKUP_PATH:-/var/data/backup}
 
-ARG OFELIA_CONFIG_PATH=/etc/ofelia/config.ini
-ARG DEBUG
 ARG BACKUP_DATABASES
+ENV BACKUP_DATABASES=${BACKUP_DATABASES}
+
+ARG OFELIA_CONFIG_PATH=/etc/ofelia/config.ini
+ENV OFELIA_CONFIG_PATH=${OFELIA_CONFIG_PATH}
+
+ARG DEBUG
+ENV DEBUG=${DEBUG}
 
 ARG BACKUP_DATABASES_PATH=/var/data/backup-databases
 ENV BACKUP_DATABASES_PATH=${BACKUP_DATABASES_PATH}
 
-RUN ofelia-config.sh --save
\ No newline at end of file
+ENTRYPOINT docker-entrypoint.sh
\ No newline at end of file
diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
new file mode 100644
index 0000000..7c3d7ac
--- /dev/null
+++ b/scripts/docker-entrypoint.sh
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+#
+# Setup and trigger ofelia
+#
+
+# config and run ofelia
+ofelia-config.sh --save || exit 1;
+
+# run ofelia
+/usr/bin/ofelia daemon --config="${OFELIA_CONFIG_PATH}";
\ No newline at end of file