diff --git a/src/templates/etc-default b/src/templates/etc-default
index d3823dee9..76733122a 100644
--- a/src/templates/etc-default
+++ b/src/templates/etc-default
@@ -20,8 +20,8 @@
 
 # Setting JAVA_OPTS
 # -----------------
-JAVA_OPTS="-Dpidfile.path=/var/run/${{app_name}}.pid -Dconfig.file=/etc/${{app_name}}/application.conf -Dlogger.file=/etc/${{app_name}}/logger.xml $JAVA_OPTS"
+JAVA_OPTS="-Dpidfile.path=/var/run/${{app_name}}/running.pid -Dconfig.file=/etc/${{app_name}}/application.conf -Dlogger.file=/etc/${{app_name}}/logger.xml $JAVA_OPTS"
 
 # Setting PIDFILE
 # ---------------
-PIDFILE="/var/run/${{app_name}}.pid"
+PIDFILE="/var/run/${{app_name}}/running.pid"