diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapClamd.py b/data/Dockerfiles/bootstrap/modules/BootstrapClamd.py
index 2c10aff02..deaf0166e 100644
--- a/data/Dockerfiles/bootstrap/modules/BootstrapClamd.py
+++ b/data/Dockerfiles/bootstrap/modules/BootstrapClamd.py
@@ -40,7 +40,7 @@ class BootstrapClamd(BootstrapBase):
     )
     extra_vars = {
     }
-    self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars)
+    self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
 
     print("Set Timezone")
     self.set_timezone()
diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapDovecot.py b/data/Dockerfiles/bootstrap/modules/BootstrapDovecot.py
index c48720498..6e3f5aba1 100644
--- a/data/Dockerfiles/bootstrap/modules/BootstrapDovecot.py
+++ b/data/Dockerfiles/bootstrap/modules/BootstrapDovecot.py
@@ -44,7 +44,7 @@ class BootstrapDovecot(BootstrapBase):
       "RAND_PASS2": self.rand_pass(),
       "ENV_VARS": dict(os.environ)
     }
-    self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars)
+    self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
     # Escape DBPASS
     self.env_vars['DBPASS'] = self.env_vars['DBPASS'].replace('"', r'\"')
     # Set custom filters
diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapMysql.py b/data/Dockerfiles/bootstrap/modules/BootstrapMysql.py
index c22690248..437c2f1f1 100644
--- a/data/Dockerfiles/bootstrap/modules/BootstrapMysql.py
+++ b/data/Dockerfiles/bootstrap/modules/BootstrapMysql.py
@@ -37,7 +37,7 @@ class BootstrapMysql(BootstrapBase):
     )
     extra_vars = {
     }
-    self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars)
+    self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
 
     print("Set Timezone")
     self.set_timezone()
diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapNginx.py b/data/Dockerfiles/bootstrap/modules/BootstrapNginx.py
index 90f25b83d..2727efb37 100644
--- a/data/Dockerfiles/bootstrap/modules/BootstrapNginx.py
+++ b/data/Dockerfiles/bootstrap/modules/BootstrapNginx.py
@@ -32,7 +32,7 @@ class BootstrapNginx(BootstrapBase):
       'TRUSTED_PROXIES': [item.strip() for item in os.getenv("TRUSTED_PROXIES", "").split(",") if item.strip()],
       'ADDITIONAL_SERVER_NAMES': [item.strip() for item in os.getenv("ADDITIONAL_SERVER_NAMES", "").split(",") if item.strip()],
     }
-    self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars)
+    self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
 
     print("Set Timezone")
     self.set_timezone()
diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapPhpfpm.py b/data/Dockerfiles/bootstrap/modules/BootstrapPhpfpm.py
index be0000017..b895d7176 100644
--- a/data/Dockerfiles/bootstrap/modules/BootstrapPhpfpm.py
+++ b/data/Dockerfiles/bootstrap/modules/BootstrapPhpfpm.py
@@ -20,7 +20,7 @@ class BootstrapPhpfpm(BootstrapBase):
     )
     extra_vars = {
     }
-    self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars)
+    self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
 
     print("Set Timezone")
     self.set_timezone()
diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapPostfix.py b/data/Dockerfiles/bootstrap/modules/BootstrapPostfix.py
index 17d18c60c..4ce81eabe 100644
--- a/data/Dockerfiles/bootstrap/modules/BootstrapPostfix.py
+++ b/data/Dockerfiles/bootstrap/modules/BootstrapPostfix.py
@@ -28,7 +28,7 @@ class BootstrapPostfix(BootstrapBase):
       "VALID_CERT_DIRS": self.get_valid_cert_dirs(),
       "EXTRA_CF": extra_config
     }
-    self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars)
+    self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
 
     print("Set Timezone")
     self.set_timezone()
@@ -39,6 +39,9 @@ class BootstrapPostfix(BootstrapBase):
     print("Render config")
     self.render_config("/service_config")
 
+    # Create aliases DB
+    self.run_command(["newaliases"])
+
     # Create SNI Config
     self.run_command(["postmap", "-F", "hash:/opt/postfix/conf/sni.map"])
 
diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapRspamd.py b/data/Dockerfiles/bootstrap/modules/BootstrapRspamd.py
index a3043ae81..76e22fb4b 100644
--- a/data/Dockerfiles/bootstrap/modules/BootstrapRspamd.py
+++ b/data/Dockerfiles/bootstrap/modules/BootstrapRspamd.py
@@ -72,7 +72,7 @@ class BootstrapRspamd(BootstrapBase):
       "RSPAMD_V4": rspamd_v4[0],
       "RSPAMD_V6": rspamd_v6[0],
     }
-    self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars)
+    self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
 
     print("Set Timezone")
     self.set_timezone()
diff --git a/data/Dockerfiles/bootstrap/modules/BootstrapSogo.py b/data/Dockerfiles/bootstrap/modules/BootstrapSogo.py
index b56b9ecd2..6d24e48b7 100644
--- a/data/Dockerfiles/bootstrap/modules/BootstrapSogo.py
+++ b/data/Dockerfiles/bootstrap/modules/BootstrapSogo.py
@@ -39,7 +39,7 @@ class BootstrapSogo(BootstrapBase):
       "SQL_DOMAINS": self.get_domains(),
       "IAM_SETTINGS": self.get_identity_provider_settings()
     }
-    self.env_vars = self.prepare_template_vars('/overwrites.json', extra_vars)
+    self.env_vars = self.prepare_template_vars('/service_config/overwrites.json', extra_vars)
 
     print("Set Timezone")
     self.set_timezone()