diff --git a/package/grafana/grafana-server.env b/package/grafana/grafana-server.env
new file mode 100644
index 0000000..9dbd758
--- /dev/null
+++ b/package/grafana/grafana-server.env
@@ -0,0 +1,8 @@
+GRAFANA_HOME=/usr/share/grafana
+LOG_DIR=/var/log/grafana
+DATA_DIR=/var/lib/grafana
+CONF_DIR=/etc/grafana
+CONF_FILE=/etc/grafana/grafana.ini
+PLUGINS_DIR=/var/lib/grafana/plugins
+PROVISIONING_CFG_DIR=/etc/grafana/provisioning
+PID_FILE_DIR=/run/grafana
diff --git a/package/grafana/grafana.hash b/package/grafana/grafana.hash
index f06f897..a20cfc0 100644
--- a/package/grafana/grafana.hash
+++ b/package/grafana/grafana.hash
@@ -1 +1,2 @@
 sha256 2046f8e9c0b659d0e67f57d8a311ba714214e9616a41ffaba71c256d42914977 grafana-9.0.1.linux-arm64.tar.gz
+sha256 c5ecaa30662d75593a4906de30938f8da06946a17f98810d6e5ddec221a26714 grafana-server.service
diff --git a/package/grafana/grafana.mk b/package/grafana/grafana.mk
index 2f5b5e4..97f2e92 100644
--- a/package/grafana/grafana.mk
+++ b/package/grafana/grafana.mk
@@ -9,6 +9,7 @@
 GRAFANA_VERSION = 9.0.1
 GRAFANA_SOURCE = grafana-$(GRAFANA_VERSION).linux-$(KERNEL_ARCH).tar.gz
 GRAFANA_SITE = https://dl.grafana.com/oss/release
+GRAFANA_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/grafana/grafana/v$(GRAFANA_VERSION)/packaging/rpm/systemd/grafana-server.service
 GRAFANA_LICENSE = Apache-2.0
 GRAFANA_LICENSE_FILES = LICENSE
 
@@ -30,8 +31,20 @@ define GRAFANA_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/share/grafana/
 endef
 
+define GRAFANA_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m u=rw,go=r \
+		$(BR2_EXTERNAL_metricspi_PATH)/package/grafana/grafana-server.env \
+		$(TARGET_DIR)/etc/sysconfig/grafana-server
+	$(INSTALL) -D -m u=rw,go=r $(GRAFANA_DL_DIR)/grafana-server.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/grafana-server.service
+endef
+
 define GRAFANA_USERS
 	grafana -1 grafana -1 * /usr/share/grafana /sbin/nologin - grafana user account
 endef
 
+define GRAFANA_PERMISSIONS
+	/var/lib/grafana d 750 grafana grafana - - - - -
+endef
+
 $(eval $(generic-package))