diff --git a/conf/coturn-synapse.service b/conf/coturn-synapse.service
index 94884a7..13c0687 100644
--- a/conf/coturn-synapse.service
+++ b/conf/coturn-synapse.service
@@ -8,11 +8,11 @@ User=turnserver
 Group=turnserver
 Type=forking
 EnvironmentFile=/etc/default/coturn-__APP__
-PIDFile=/var/run/coturn-__APP__/turnserver.pid
+PIDFile=/run/coturn-__APP__/turnserver.pid
 RuntimeDirectory=coturn-__APP__
 RuntimeDirectoryMode=0755
 ExecStart=/usr/bin/turnserver -o -c /etc/matrix-__APP__/coturn.conf $EXTRA_OPTIONS
-ExecStopPost=/bin/rm -f /var/run/coturn-__APP__/turnserver.pid
+ExecStopPost=/bin/rm -f /run/coturn-__APP__/turnserver.pid
 Restart=on-abort
 
 LimitCORE=infinity
@@ -24,4 +24,4 @@ CPUSchedulingPolicy=other
 UMask=0007
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/conf/homeserver.yaml b/conf/homeserver.yaml
index 0084bf7..8d69522 100644
--- a/conf/homeserver.yaml
+++ b/conf/homeserver.yaml
@@ -11,7 +11,7 @@ server_name: "__SERVER_NAME__"
 
 # When running as a daemon, the file to store the pid in
 #
-pid_file: /var/run/matrix-__APP__/homeserver.pid
+pid_file: /run/matrix-__APP__/homeserver.pid
 
 # The path to the web client which will be served at /_matrix/client/
 # if 'webclient' is configured under the 'listeners' configuration.
diff --git a/conf/nginx.conf b/conf/nginx.conf
index a366c1f..3c1e9f5 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -8,7 +8,7 @@ location __PATH__ {
         location __PATH__/cas_server.php {
             alias /var/www/__APP__/;
             fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-            fastcgi_pass unix:/var/run/php7.0-fpm-__NAME__.sock;
+            fastcgi_pass unix:/run/php7.0-fpm-__NAME__.sock;
             include fastcgi_params;
             fastcgi_param REMOTE_USER $remote_user;
             fastcgi_param PATH_INFO $fastcgi_path_info;
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 217ad3a..8f737b9 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -30,7 +30,7 @@ group = matrix-__USER__
 ;                            specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /var/run/php7.0-fpm-__NAMETOCHANGE__.sock
+listen = /run/php7.0-fpm-__NAMETOCHANGE__.sock
 
 ; Set listen(2) backlog. A value of '-1' means unlimited.
 ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
diff --git a/conf/turnserver.conf b/conf/turnserver.conf
index c3149da..7483e7d 100644
--- a/conf/turnserver.conf
+++ b/conf/turnserver.conf
@@ -24,5 +24,5 @@ no-multicast-peers
 no-cli
 
 log-file=/var/log/matrix-__APP__/turnserver.log
-pidfile=/var/run/coturn-__APP__/turnserver.pid
+pidfile=/run/coturn-__APP__/turnserver.pid
 simple-log