diff --git a/Dockerfile b/Dockerfile
index 0c72bbe..507365a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,10 +8,9 @@ RUN if [ -n ${HTTP_PROXY} ] ; then sed -i -e s'/https/http/' /etc/apk/repositori
 
 RUN apk add --no-cache rspamd
 
-ADD rspamd.conf.local.override /etc/rspamd/
-EXPOSE 11332 11333 11334
-
+COPY override.d /etc/rspamd/override.d
 COPY init /sbin/
 
 # Starting
+EXPOSE 11332 11333 11334
 ENTRYPOINT [ "/sbin/init" ]
diff --git a/init b/init
index e442590..52905ad 100755
--- a/init
+++ b/init
@@ -28,9 +28,6 @@ if [ -z "$@" ]; then
 		[ -n "${NOTON}" ] && echo "No [${CLAMAV}]?" && exit 1
 	fi
 
-	# Set password
-	[ -n "${RSPAMD_PASSWD}" ] && sed -i -e 's/^#\s*password/    password/' -e "s/@PASSWORD@/${RSPAMD_PASSWD}/" /etc/rspamd/rspamd.conf.local.override
-
 	mkdir -p /run/rspamd
 	[ -x /usr/bin/rspamd ] && exec /usr/bin/rspamd -u rspamd -g rspamd -c /etc/rspamd/rspamd.conf -f -p /run/rspamd/rspamd.pid &
 
diff --git a/override.d/worker-controller.inc b/override.d/worker-controller.inc
new file mode 100644
index 0000000..2b6378a
--- /dev/null
+++ b/override.d/worker-controller.inc
@@ -0,0 +1 @@
+bind_socket = "*:11334";
diff --git a/override.d/worker-normal.inc b/override.d/worker-normal.inc
new file mode 100644
index 0000000..aac8fc1
--- /dev/null
+++ b/override.d/worker-normal.inc
@@ -0,0 +1 @@
+bind_socket = "*:11333";
diff --git a/override.d/worker-proxy.inc b/override.d/worker-proxy.inc
new file mode 100644
index 0000000..199cd5e
--- /dev/null
+++ b/override.d/worker-proxy.inc
@@ -0,0 +1,4 @@
+bind_socket = "*:11332";
+upstream "local" {
+  self_scan = yes; # Enable self-scan
+}
diff --git a/rspamd.conf.local.override b/rspamd.conf.local.override
deleted file mode 100644
index 5633aca..0000000
--- a/rspamd.conf.local.override
+++ /dev/null
@@ -1,21 +0,0 @@
-worker "normal" {
-    bind_socket = "*:11333";
-    .include "$CONFDIR/worker-normal.inc"
-    .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-normal.inc"
-    .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-normal.inc"
-}
-
-worker "controller" {
-    bind_socket = "*:11334";
-#    password = "@PASSWORD@";
-    .include "$CONFDIR/worker-controller.inc"
-    .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-controller.inc"
-    .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc"
-}
-
-worker "rspamd_proxy" {
-    bind_socket = "*:11332";
-    .include "$CONFDIR/worker-proxy.inc"
-    .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-proxy.inc"
-    .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-proxy.inc"
-}