diff --git a/community/loki/APKBUILD b/community/loki/APKBUILD
index 3e9b8a9e9e6..38425257ad4 100644
--- a/community/loki/APKBUILD
+++ b/community/loki/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Michael Pirogov <vbnet.ru@gmail.com>
 # Maintainer: Guy Godfroy <guy.godfroy@gugod.fr>
 pkgname=loki
-pkgver=3.6.7
-pkgrel=1
+pkgver=3.7.1
+pkgrel=0
 pkgdesc="Like Prometheus, but for logs"
 options="net !check" # disable check because it times out on some archs like loongarch64 and is too unpredictible
 url="https://github.com/grafana/loki"
@@ -13,13 +13,11 @@ license="AGPL-3.0-or-later"
 arch="x86_64 aarch64 ppc64le loongarch64"
 makedepends="go bash"
 checkdepends="tzdata"
-subpackages="$pkgname-logcli $pkgname-canary $pkgname-promtail-openrc:promtail_openrc $pkgname-promtail $pkgname-openrc"
+subpackages="$pkgname-logcli $pkgname-canary $pkgname-openrc $pkgname-lokitool"
 install="$pkgname.pre-install"
 source="$pkgname-$pkgver.tar.gz::https://github.com/grafana/loki/archive/refs/tags/v$pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.confd
-	$pkgname-promtail.confd
-	$pkgname-promtail.initd
 	"
 
 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}"
@@ -37,10 +35,10 @@ build() {
 		 -X github.com/grafana/loki/v3/pkg/util/build.BuildDate=$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
 
 	go build -v \
-		-ldflags "-s -w $ldflags" \
+		-ldflags "-extldflags \"-static\" -s -w $ldflags" \
 		-tags netgo \
-		-o clients/cmd/promtail/promtail \
-		./clients/cmd/promtail
+		-o cmd/lokitool \
+		./cmd/lokitool
 	go build -v \
 		-ldflags "-extldflags \"-static\" -s -w $ldflags" \
 		-tags netgo \
@@ -55,7 +53,6 @@ build() {
 		-ldflags "-extldflags \"-static\" -s -w $ldflags" \
 		-tags netgo -o cmd/loki-canary/loki-canary \
 		./cmd/loki-canary
-
 }
 
 
@@ -70,18 +67,13 @@ check() {
 package() {
 	mkdir -p "$pkgdir"/etc/$pkgname
 	install -Dm644 cmd/loki/loki-local-config.yaml "$pkgdir"/etc/$pkgname
+	install -Dm0755 cmd/lokitool/lokitool -t "$pkgdir"/usr/bin
 	install -Dm0755 cmd/loki/loki -t "$pkgdir"/usr/bin
 	install -Dm0755 cmd/loki-canary/loki-canary -t "$pkgdir"/usr/bin
 	install -Dm0755 cmd/logcli/logcli -t "$pkgdir"/usr/bin
 
 	install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-
-	install -Dm755 "$srcdir"/$pkgname-promtail.initd "$pkgdir"/etc/init.d/$pkgname-promtail
-	install -Dm644 "$srcdir"/$pkgname-promtail.confd "$pkgdir"/etc/conf.d/$pkgname-promtail
-
-	install -D clients/cmd/promtail/promtail-local-config.yaml -t "$pkgdir"/etc/$pkgname/
-	install -Dm0755 clients/cmd/promtail/promtail -t "$pkgdir"/usr/bin/
 }
 
 canary() {
@@ -96,25 +88,14 @@ logcli() {
 	amove usr/bin/logcli
 }
 
-promtail() {
-	pkgdesc="Promtail client"
+lokitool() {
+	pkgdesc="Tool for interracting with Loki rules"
 
-	amove etc/$pkgname/promtail-local-config.yaml
-	amove usr/bin/promtail
-}
-
-promtail_openrc() {
-	pkgdesc="Promtail client (Open RC init scripts)"
-	install_if="openrc loki-promtail=$pkgver-r$pkgrel"
-
-	amove etc/init.d/$pkgname-promtail
-	amove etc/conf.d/$pkgname-promtail
+	amove usr/bin/lokitool
 }
 
 sha512sums="
-a0ea9987c0ac6e5010cd19f98207bc8703d288f4c15fe53405c30cb8e8fd6aae391a1ec66f188ba5169041d3dc8de40d582326c73fda046318c83d019fbd8001  loki-3.6.7.tar.gz
+51e6028047e62041641b870c3eee65f694189e2705534fb2fe523f6e5c5147dd9bfb98b49b05ac10f7c25fbc55c0bda942bba37830c64633d63a217f280dd71e  loki-3.7.1.tar.gz
 469920d90daebf142db5dc5d3f2e972f59f5f5dc86684c4dcd5924a33ac7db305561006050ad42393296977ea27f1ce1cd78f78c71de351335167b41e4631a85  loki.initd
 b4c281e191e7620ffe19d3fcc0b5669f54051a8108f0abc5b1aec2f2026452e02e3c26c3885e1e857cb6007bbc41c1f964e6d25d73bdfe170b67b63ecd9f14fd  loki.confd
-f7d33f03d51c3cc5cda082e72f56ec821c60f70f42923a215652517835b66a68d7db3b246cd1a53ce0b2c003fe31f7e6cca06965ba792e92117d7e91abce829f  loki-promtail.confd
-ff72431ba978880cc58914302b2ec1e48ef3d16b2a667dc82deaa3d2d890331170757dcac48ba0b145c988e70e85c240c94da335894d2c9d114fa811007f1111  loki-promtail.initd
 "
diff --git a/community/loki/loki-promtail.confd b/community/loki/loki-promtail.confd
deleted file mode 100644
index ebf62ab463b..00000000000
--- a/community/loki/loki-promtail.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# The promtail config file
-PROMTAIL_CONF="/etc/loki/promtail-local-config.yaml"
-
-# Add any extra options to pass to promtail to this setting.
-#PROMTAIL_OPTS=""
diff --git a/community/loki/loki-promtail.initd b/community/loki/loki-promtail.initd
deleted file mode 100644
index 778fbd96602..00000000000
--- a/community/loki/loki-promtail.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-
-output_log="${output_log:-/dev/null}"
-error_log="${error_log:-/var/log/promtail/error.log}"
-configfile="${PROMTAIL_CONF:-/etc/loki/promtail-local-config.yaml}"
-
-name="${name:-Promtail}"
-command="/usr/bin/promtail"
-command_args="-config.file=${configfile}
-	${PROMTAIL_OPTS}"
-command_user="${command_user:-root:root}"
-command_background=yes
-make_pidfile=yes
-pidfile="/run/${RC_SVCNAME}.pid"
-start_stop_daemon_args="${SSD_OPTS}
-	-1 ${output_log} -2 ${error_log}"
-
-depend() {
-	need net
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o "${command_user}" "/var/log/promtail"
-}
-