diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3ae079fd2f411240faddd735cfa9336eb38cbb5b..ba534ce01c40a905b05fa558fbd662ddd7750ca4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
 Unreleased
 ----------
 
+Changed
+~~~~~~~
+
+* Configuration files are now deep merged by default
+
 `2.5`_ – 2022-01-02
 -------------------
 
diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index 4b49ed50c9c1b8217b36871fce005fff661de4c4..6b3e65246a07a50fff531a33acde44a4f54591e4 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -14,6 +14,7 @@ IN_PYTEST = "PYTEST_CURRENT_TEST" in os.environ or "TOX_ENV_DIR" in os.environ
 
 ENVVAR_PREFIX_FOR_DYNACONF = "ALEKSIS"
 DIRS_FOR_DYNACONF = ["/etc/aleksis"]
+MERGE_ENABLED_FOR_DYNACONF = True
 
 SETTINGS_FILE_FOR_DYNACONF = []
 for directory in DIRS_FOR_DYNACONF:
@@ -29,6 +30,7 @@ for directory in DIRS_FOR_DYNACONF:
 _settings = LazySettings(
     ENVVAR_PREFIX_FOR_DYNACONF=ENVVAR_PREFIX_FOR_DYNACONF,
     SETTINGS_FILE_FOR_DYNACONF=SETTINGS_FILE_FOR_DYNACONF,
+    MERGE_ENABLED_FOR_DYNACONF=MERGE_ENABLED_FOR_DYNACONF,
 )
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)