diff --git a/README.md b/README.md
index a99bee3..ac83489 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Elasticsearch is the distributed, RESTful search and analytics engine at the hea
 To learn more about Elasticsearch’s features and capabilities, see the [product page](https://www.elastic.co/products/elasticsearch).
 
 
-**Shipped version:** 8.6.1~ynh1
+**Shipped version:** 8.6.1~ynh2
 
 **Demo:** https://www.elastic.co/demos
 ## Disclaimers / important information
diff --git a/README_fr.md b/README_fr.md
index 89eeba8..93cf413 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -19,7 +19,7 @@ Elasticsearch is the distributed, RESTful search and analytics engine at the hea
 To learn more about Elasticsearch’s features and capabilities, see the [product page](https://www.elastic.co/products/elasticsearch).
 
 
-**Version incluse :** 8.6.1~ynh1
+**Version incluse :** 8.6.1~ynh2
 
 **Démo :** https://www.elastic.co/demos
 ## Avertissements / informations importantes
diff --git a/conf/systemd.service b/conf/systemd.service
index d579d7d..b2fc349 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -7,6 +7,7 @@ After=network.target
 Type=simple
 User=__APP__
 Group=__APP__
+RuntimeDirectory=__APP__
 Environment="ES_JAVA_HOME=__FINALPATH__/jdk"
 Environment="ES_PATH_CONF=__FINALPATH__/config"
 Environment="PID_DIR=/run/__APP__"
diff --git a/manifest.json b/manifest.json
index f8ab9ff..0cd45ec 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Distributed and RESTful search engine.",
         "fr": "Moteur de recherche RESTful."
     },
-    "version": "8.6.1~ynh1",
+    "version": "8.6.1~ynh2",
     "url": "https://github.com/elastic/elasticsearch",
     "upstream": {
         "license": "SSPL-1.0",
diff --git a/scripts/install b/scripts/install
index be490c4..1e9f7d5 100755
--- a/scripts/install
+++ b/scripts/install
@@ -87,15 +87,6 @@ chmod -R o-rwx "$datadir"
 chown -R $app:www-data "$datadir"
 
 
-#=================================================
-# CREATE PID DIRECTORY
-#=================================================
-
-mkdir -p "/run/$app"
-
-chmod 700 "/run/$app"
-chown $app:$app "/run/$app"
-
 #=================================================
 # ADD CONFIGURATIONS
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 18b9aeb..1f06e84 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -68,13 +68,6 @@ then
 	ynh_secure_remove --file="$datadir"
 fi
 
-#=================================================
-# REMOVE PID DIR
-#=================================================
-
-ynh_script_progression --message="Removing pid directory..." --weight=1
-ynh_secure_remove --file="/run/$app"
-
 #=================================================
 # CLOSE A PORT
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 28e18d5..6183965 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -74,15 +74,6 @@ chmod 750 "$datadir"
 chmod -R o-rwx "$datadir"
 chown -R $app:www-data "$datadir"
 
-#=================================================
-# CREATE PID DIRECTORY
-#=================================================
-
-mkdir -p "/run/$app"
-
-chmod 700 "/run/$app"
-chown $app:$app "/run/$app"
-
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================