diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile
index a7df8c2d..ac01a17e 100644
--- a/core/nginx/Dockerfile
+++ b/core/nginx/Dockerfile
@@ -22,7 +22,7 @@ RUN set -euxo pipefail \
 COPY conf/ /conf/
 COPY --from=static /static/ /static/
 COPY *.py /
-COPY proxy.conf login.lua /
+COPY dovecot/proxy.conf dovecot/login.lua /dovecot_conf/
 
 RUN echo $VERSION >/version
 
diff --git a/core/nginx/config.py b/core/nginx/config.py
index b5ff8590..e8790bcd 100755
--- a/core/nginx/config.py
+++ b/core/nginx/config.py
@@ -55,7 +55,7 @@ conf.jinja("/conf/proxy.conf", args, "/etc/nginx/proxy.conf")
 conf.jinja("/conf/nginx.conf", args, "/etc/nginx/nginx.conf")
 if os.path.exists("/var/run/nginx.pid"):
     os.system("nginx -s reload")
-conf.jinja("/login.lua", args, "/etc/dovecot/login.lua")
-conf.jinja("/proxy.conf", args, "/etc/dovecot/proxy.conf")
+conf.jinja("/dovecot_conf/login.lua", args, "/etc/dovecot/login.lua")
+conf.jinja("/dovecot_conf/proxy.conf", args, "/etc/dovecot/proxy.conf")
 if os.path.exists("/run/dovecot/master.pid"):
     os.system("doveadm reload")
diff --git a/core/nginx/login.lua b/core/nginx/dovecot/login.lua
similarity index 100%
rename from core/nginx/login.lua
rename to core/nginx/dovecot/login.lua
diff --git a/core/nginx/proxy.conf b/core/nginx/dovecot/proxy.conf
similarity index 100%
rename from core/nginx/proxy.conf
rename to core/nginx/dovecot/proxy.conf