diff --git a/packaging/deb/control/postinst b/packaging/deb/control/postinst
index abd8b64cf83..8e25a0e4124 100755
--- a/packaging/deb/control/postinst
+++ b/packaging/deb/control/postinst
@@ -42,12 +42,6 @@ case "$1" in
     IS_UPGRADE=true
   fi
 
-  # make sure there is a /var/run/grafana dir on systemd systems
-  if [ -x /bin/systemctl ] ; then
-    mkdir -p $PID_FILE_DIR
-    chown -R $GRAFANA_USER:$GRAFANA_GROUP $PID_FILE_DIR
-  fi
-
   if [ "x$IS_UPGRADE" != "xtrue" ]; then
     if command -v systemctl >/dev/null; then
       echo "### NOT starting on installation, please execute the following statements to configure grafana to start automatically using systemd"
diff --git a/packaging/deb/systemd/grafana-server.service b/packaging/deb/systemd/grafana-server.service
index b24d3996a52..cb7b87932d1 100644
--- a/packaging/deb/systemd/grafana-server.service
+++ b/packaging/deb/systemd/grafana-server.service
@@ -12,6 +12,8 @@ Group=grafana
 Type=simple
 Restart=on-failure
 WorkingDirectory=/usr/share/grafana
+RuntimeDirectory=grafana
+RuntimeDirectoryMode=0750
 ExecStart=/usr/sbin/grafana-server                                        \
                             --config=${CONF_FILE}                         \
                             --pidfile=${PID_FILE_DIR}/grafana-server.pid  \
diff --git a/packaging/rpm/control/postinst b/packaging/rpm/control/postinst
index 56acefaa88c..0bfca949e7f 100755
--- a/packaging/rpm/control/postinst
+++ b/packaging/rpm/control/postinst
@@ -56,12 +56,6 @@ if [ $1 -eq 1 ] ; then
 	find /etc/grafana -type f -exec chmod 640 {} ';'
 	find /etc/grafana -type d -exec chmod 755 {} ';'
 
-  # make sure there is a /var/run/grafana dir on systemd systems
-  if [ -x /bin/systemctl ] ; then
-    mkdir -p $PID_FILE_DIR
-    chown -R $GRAFANA_USER:$GRAFANA_GROUP $PID_FILE_DIR
-  fi
-
   if [ -x /bin/systemctl ] ; then
     echo "### NOT starting on installation, please execute the following statements to configure grafana to start automatically using systemd"
     echo " sudo /bin/systemctl daemon-reload"
@@ -75,12 +69,6 @@ if [ $1 -eq 1 ] ; then
     echo " sudo service grafana-server start"
   fi
 elif [ $1 -ge 2 ] ; then
-  # make sure there is a /var/run/grafana dir on systemd systems
-  if [ -x /bin/systemctl ] ; then
-    mkdir -p $PID_FILE_DIR
-    chown -R $GRAFANA_USER:$GRAFANA_GROUP $PID_FILE_DIR
-  fi
-
   if [ "$RESTART_ON_UPGRADE" == "true" ]; then
     stopGrafana
     startGrafana
diff --git a/packaging/rpm/systemd/grafana-server.service b/packaging/rpm/systemd/grafana-server.service
index 0161d101383..3e018e8b176 100644
--- a/packaging/rpm/systemd/grafana-server.service
+++ b/packaging/rpm/systemd/grafana-server.service
@@ -12,6 +12,8 @@ Group=grafana
 Type=simple
 Restart=on-failure
 WorkingDirectory=/usr/share/grafana
+RuntimeDirectory=grafana
+RuntimeDirectoryMode=0750
 ExecStart=/usr/sbin/grafana-server                                        \
                             --config=${CONF_FILE}                         \
                             --pidfile=${PID_FILE_DIR}/grafana-server.pid  \