diff --git a/README.md b/README.md
index 07423a1..bc18497 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Dendrite is a second-generation Matrix homeserver written in Go. It intends to p
 - Scalable: can run on multiple machines and eventually scale to massive homeserver deployments.
 
 
-**Shipped version:** 0.10.8~ynh1
+**Shipped version:** 0.10.8~ynh2
 ## Disclaimers / important information
 
 :warning: The upstream app is still in beta. Tread carefully.
diff --git a/README_fr.md b/README_fr.md
index 7551bf4..45cad86 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -24,7 +24,7 @@ Dendrite is a second-generation Matrix homeserver written in Go. It intends to p
 - Scalable: can run on multiple machines and eventually scale to massive homeserver deployments.
 
 
-**Version incluse :** 0.10.8~ynh1
+**Version incluse :** 0.10.8~ynh2
 ## Avertissements / informations importantes
 
 :warning: The upstream app is still in beta. Tread carefully.
diff --git a/conf/systemd.service b/conf/systemd.service
index 15da083..c9ab58e 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Dentrite Matrix homeserver
-After=network.target
+After=network.target postgresql@__PSQL_VERSION__-main.service
 
 [Service]
 Type=simple
diff --git a/manifest.json b/manifest.json
index 5672886..cd609b6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Matrix homeserver of second generation",
         "fr": "Serveur Matrix de seconde génération"
     },
-    "version": "0.10.8~ynh1",
+    "version": "0.10.8~ynh2",
     "url": "https://matrix.org/",
     "upstream": {
         "license": "Apache-2.0",
diff --git a/scripts/change_url b/scripts/change_url
index 334bd88..ffd08b0 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -127,6 +127,8 @@ fi
 #=================================================
 ynh_script_progression --message="Updating systemd configuration..." --weight=1
 
+psql_version=$PSQL_VERSION
+
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
diff --git a/scripts/install b/scripts/install
index c5e3d25..ace39c9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -182,6 +182,8 @@ chown $app:$app "$final_path/dendrite.yaml"
 #=================================================
 ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
+psql_version=$PSQL_VERSION
+
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 4715f07..928a84b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -194,6 +194,8 @@ chown $app:$app "$final_path/dendrite.yaml"
 #=================================================
 ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
 
+psql_version=$PSQL_VERSION
+
 # Create a dedicated systemd config
 ynh_add_systemd_config