diff --git a/Dockerfile b/Dockerfile
index cb7328a..43aad18 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,4 +30,4 @@ RUN \
     rm -rf /flexget /flexget.tar.gz
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["su", "-p", "-s", "/bin/sh", "flexget", "-c", "/usr/local/bin/flexget -c /config/config.yml --loglevel verbose execute"]
+CMD ["su", "-p", "-s", "/bin/sh", "flexget", "-c", "/usr/local/bin/flexget -c /config/config.yml --loglevel verbose daemon start --autoreload-config"]
diff --git a/overlay/docker-entrypoint.sh b/overlay/docker-entrypoint.sh
index b300ccc..e4f71c6 100755
--- a/overlay/docker-entrypoint.sh
+++ b/overlay/docker-entrypoint.sh
@@ -18,6 +18,9 @@ if [ ! -f "/config/config.yml" ]; then
     cp /defaults/config.yml /config/config.yml
 fi
 
+# Clear "config lock", if it exists
+rm -f /config/.config-lock
+
 # Set UID/GID of user
 sed -i "s/^flexget\:x\:100\:101/flexget\:x\:$PUID\:$PGID/" /etc/passwd
 sed -i "s/^flexget\:x\:101/flexget\:x\:$PGID/" /etc/group