diff --git a/README.md b/README.md
index 4d1e9a1..6069c5b 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ OpenSearch makes it easy to ingest, search, visualize, and analyze your data.
 OpenSearch is a scalable, flexible, and extensible open-source software suite for search, analytics, and observability applications licensed under Apache 2.0. Powered by Apache Lucene and driven by the OpenSearch Project community, OpenSearch offers a vendor-agnostic toolset you can use to build secure, high-performance, cost-efficient applications. Use OpenSearch as an end-to-end solution or connect it with your preferred open-source tools or partner projects.
 
 
-**Shipped version:** 2.5.0~ynh1
+**Shipped version:** 2.5.0~ynh2
 
 **Demo:** https://playground.opensearch.org/app/home
 ## Disclaimers / important information
diff --git a/README_fr.md b/README_fr.md
index ec8a149..dcd24ef 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -23,7 +23,7 @@ OpenSearch makes it easy to ingest, search, visualize, and analyze your data.
 OpenSearch is a scalable, flexible, and extensible open-source software suite for search, analytics, and observability applications licensed under Apache 2.0. Powered by Apache Lucene and driven by the OpenSearch Project community, OpenSearch offers a vendor-agnostic toolset you can use to build secure, high-performance, cost-efficient applications. Use OpenSearch as an end-to-end solution or connect it with your preferred open-source tools or partner projects.
 
 
-**Version incluse :** 2.5.0~ynh1
+**Version incluse :** 2.5.0~ynh2
 
 **Démo :** https://playground.opensearch.org/app/home
 ## Avertissements / informations importantes
diff --git a/conf/systemd.service b/conf/systemd.service
index fc83b27..14719aa 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="OPENSEARCH_JAVA_HOME=__FINALPATH__/jdk"
 Environment="OPENSEARCH_PATH_CONF=__FINALPATH__/config"
 Environment="PID_DIR=/run/__APP__"
diff --git a/manifest.json b/manifest.json
index 9d6b648..d53348f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Open source distributed and RESTful search engine",
         "fr": "Moteur de recherche RESTful et open-source"
     },
-    "version": "2.5.0~ynh1",
+    "version": "2.5.0~ynh2",
     "url": "https://github.com/opensearch-project/OpenSearch",
     "upstream": {
         "license": "Apache-2.0",
diff --git a/scripts/install b/scripts/install
index 6392efd..a69e5de 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 c12069e..3cdd40c 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 a661ae1..1f2fcc0 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
 #=================================================