diff --git a/emqx/config.yaml b/emqx/config.yaml
index a792699..6019e13 100644
--- a/emqx/config.yaml
+++ b/emqx/config.yaml
@@ -17,6 +17,7 @@ arch:
   - amd64
 map:
   - ssl
+  - addon_config:rw
 options:
   env_vars: []
 host_network: true
diff --git a/emqx/rootfs/etc/s6-overlay/s6-rc.d/emqx/run b/emqx/rootfs/etc/s6-overlay/s6-rc.d/emqx/run
index 274a17b..78909a0 100755
--- a/emqx/rootfs/etc/s6-overlay/s6-rc.d/emqx/run
+++ b/emqx/rootfs/etc/s6-overlay/s6-rc.d/emqx/run
@@ -14,6 +14,7 @@ export EMQX_NODE__ETC_DIR="/data/emqx/etc"
 export EMQX_NODE__NAME="${EMQX_NAME}@${EMQX_HOST}.local"
 export EMQX_PLUGINS__INSTALL_DIR="/data/emqx/plugins"
 export EMQX_RPC__PORT_DISCOVERY="manual"
+export EMQX_LOG_DIR="/config/log"
 
 # Load custom environment variables
 for var in $(bashio::config 'env_vars|keys'); do
diff --git a/emqx/rootfs/etc/s6-overlay/s6-rc.d/init-emqx/run b/emqx/rootfs/etc/s6-overlay/s6-rc.d/init-emqx/run
index 2ae24c1..7d3d7d8 100755
--- a/emqx/rootfs/etc/s6-overlay/s6-rc.d/init-emqx/run
+++ b/emqx/rootfs/etc/s6-overlay/s6-rc.d/init-emqx/run
@@ -7,7 +7,4 @@
 mkdir -p \
   /data/emqx/data \
   /data/emqx/etc \
-  /data/emqx/log \
   /data/emqx/plugins
-
-ln -s /data/emqx/log /opt/emqx/log